Merge pull request #18 from glneo/misc-fixes

Package updates and miscellaneous fixes
TexasInstruments · Feb 10, 2024 · 9979c0e · 9979c0e
2 parents 63213f6 + 0bcc40e
commit 9979c0e
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 163 deletions.
diff --git a/cryptodev-linux/suite/bookworm/debian/changelog b/cryptodev-linux/suite/bookworm/debian/changelog
@@ -1,6 +1,11 @@
+cryptodev-linux (1.13+git20231212+5e7121e-1) unstable; urgency=low
+
+  * Update to latest master.
+
+ -- Andrew Davis <[email protected]>  Fri, 02 Feb 2024 15:50:12 -0600
+
 cryptodev-linux (1.13+git20240109+795f5fd-0) unstable; urgency=low
 
   * Initial release.
 
  -- Sai Sree Kartheek Adivi <[email protected]>  Tue, 09 Jan 2024 18:06:53 +0530
-
diff --git a/cryptodev-linux/version.sh b/cryptodev-linux/version.sh
@@ -3,8 +3,6 @@
 export git_repo="https://github.com/cryptodev-linux/cryptodev-linux.git"
 export custom_build=false
 export require_root=false
-export last_tested_commit="bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f"
-export depends="dkms dh-dkms"
 
 function run_prep() {
     if ! command -v dkms &>/dev/null ; then

diff --git a/k3conf/suite/bookworm/debian/changelog b/k3conf/suite/bookworm/debian/changelog
@@ -1,3 +1,9 @@
+k3conf (0.3+git20240202+f4dd78a-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrew Davis <[email protected]>  Fri, 02 Feb 2024 15:50:12 +0000
+
 k3conf (0.2+git20230830+859e1cc-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/k3conf/suite/bookworm/debian/copyright b/k3conf/suite/bookworm/debian/copyright
@@ -3,142 +3,9 @@ Upstream-Name: k3conf
 Upstream-Contact: Texas Instruments
 Source: https://git.ti.com/cgit/k3conf/k3conf
 
-Files:     common/autoadjust_table.c
-           common/cmd_disable.c
-           common/cmd_dump.c
-           common/cmd_enable.c
-           common/cmd_rw.c
-           common/cmd_set.c
-           common/cmd_show.c
-           common/help.c
-           common/k3conf.c
-           common/mmio.c
-           common/sec_proxy.c
-           common/socinfo.c
-           common/tisci/tisci_clock.c
-           common/tisci/tisci_core.c
-           common/tisci/tisci_device.c
-           include/autoadjust_table.h
-           include/help.h
-           include/k3conf.h
-           include/mmio.h
-           include/sec_proxy.h
-           include/socinfo.h
-           include/tisci.h
-           include/tisci_protocol.h
-           include/version.h
-           soc/am62ax/am62ax_clocks_info.c
-           soc/am62ax/am62ax_clocks_info.h
-           soc/am62ax/am62ax_devices_info.c
-           soc/am62ax/am62ax_devices_info.h
-           soc/am62ax/am62ax_host_info.c
-           soc/am62ax/am62ax_host_info.h
-           soc/am62ax/am62ax_processors_info.c
-           soc/am62ax/am62ax_processors_info.h
-           soc/am62ax/am62ax_rm_info.c
-           soc/am62ax/am62ax_rm_info.h
-           soc/am62ax/am62ax_sec_proxy_info.c
-           soc/am62ax/am62ax_sec_proxy_info.h
-           soc/am62x/am62x_clocks_info.c
-           soc/am62x/am62x_clocks_info.h
-           soc/am62x/am62x_devices_info.c
-           soc/am62x/am62x_devices_info.h
-           soc/am62x/am62x_host_info.c
-           soc/am62x/am62x_host_info.h
-           soc/am62x/am62x_processors_info.c
-           soc/am62x/am62x_processors_info.h
-           soc/am62x/am62x_rm_info.c
-           soc/am62x/am62x_rm_info.h
-           soc/am62x/am62x_sec_proxy_info.c
-           soc/am62x/am62x_sec_proxy_info.h
-           soc/am64x/am64x_clocks_info.c
-           soc/am64x/am64x_clocks_info.h
-           soc/am64x/am64x_devices_info.c
-           soc/am64x/am64x_devices_info.h
-           soc/am64x/am64x_host_info.c
-           soc/am64x/am64x_host_info.h
-           soc/am64x/am64x_processors_info.c
-           soc/am64x/am64x_processors_info.h
-           soc/am64x/am64x_rm_info.c
-           soc/am64x/am64x_rm_info.h
-           soc/am64x/am64x_sec_proxy_info.c
-           soc/am64x/am64x_sec_proxy_info.h
-           soc/am65x/am65x_clocks_info.c
-           soc/am65x/am65x_clocks_info.h
-           soc/am65x/am65x_devices_info.c
-           soc/am65x/am65x_devices_info.h
-           soc/am65x/am65x_host_info.c
-           soc/am65x/am65x_host_info.h
-           soc/am65x/am65x_processors_info.c
-           soc/am65x/am65x_processors_info.h
-           soc/am65x/am65x_rm_info.c
-           soc/am65x/am65x_rm_info.h
-           soc/am65x/am65x_sec_proxy_info.c
-           soc/am65x/am65x_sec_proxy_info.h
-           soc/am65x_sr2/am65x_sr2_clocks_info.c
-           soc/am65x_sr2/am65x_sr2_clocks_info.h
-           soc/am65x_sr2/am65x_sr2_devices_info.c
-           soc/am65x_sr2/am65x_sr2_devices_info.h
-           soc/am65x_sr2/am65x_sr2_host_info.c
-           soc/am65x_sr2/am65x_sr2_host_info.h
-           soc/am65x_sr2/am65x_sr2_processors_info.c
-           soc/am65x_sr2/am65x_sr2_processors_info.h
-           soc/am65x_sr2/am65x_sr2_rm_info.c
-           soc/am65x_sr2/am65x_sr2_rm_info.h
-           soc/am65x_sr2/am65x_sr2_sec_proxy_info.c
-           soc/am65x_sr2/am65x_sr2_sec_proxy_info.h
-           soc/j7200/j7200_clocks_info.c
-           soc/j7200/j7200_clocks_info.h
-           soc/j7200/j7200_devices_info.c
-           soc/j7200/j7200_devices_info.h
-           soc/j7200/j7200_host_info.c
-           soc/j7200/j7200_host_info.h
-           soc/j7200/j7200_processors_info.c
-           soc/j7200/j7200_processors_info.h
-           soc/j7200/j7200_rm_info.c
-           soc/j7200/j7200_rm_info.h
-           soc/j7200/j7200_sec_proxy_info.c
-           soc/j7200/j7200_sec_proxy_info.h
-           soc/j721e/j721e_clocks_info.c
-           soc/j721e/j721e_clocks_info.h
-           soc/j721e/j721e_devices_info.c
-           soc/j721e/j721e_devices_info.h
-           soc/j721e/j721e_host_info.c
-           soc/j721e/j721e_host_info.h
-           soc/j721e/j721e_processors_info.c
-           soc/j721e/j721e_processors_info.h
-           soc/j721e/j721e_rm_info.c
-           soc/j721e/j721e_rm_info.h
-           soc/j721e/j721e_sec_proxy_info.c
-           soc/j721e/j721e_sec_proxy_info.h
-           soc/j721s2/j721s2_clocks_info.c
-           soc/j721s2/j721s2_clocks_info.h
-           soc/j721s2/j721s2_devices_info.c
-           soc/j721s2/j721s2_devices_info.h
-           soc/j721s2/j721s2_host_info.c
-           soc/j721s2/j721s2_host_info.h
-           soc/j721s2/j721s2_processors_info.c
-           soc/j721s2/j721s2_processors_info.h
-           soc/j721s2/j721s2_rm_info.c
-           soc/j721s2/j721s2_rm_info.h
-           soc/j721s2/j721s2_sec_proxy_info.c
-           soc/j721s2/j721s2_sec_proxy_info.h
-           soc/j784s4/j784s4_clocks_info.c
-           soc/j784s4/j784s4_clocks_info.h
-           soc/j784s4/j784s4_devices_info.c
-           soc/j784s4/j784s4_devices_info.h
-           soc/j784s4/j784s4_host_info.c
-           soc/j784s4/j784s4_host_info.h
-           soc/j784s4/j784s4_processors_info.c
-           soc/j784s4/j784s4_processors_info.h
-           soc/j784s4/j784s4_rm_info.c
-           soc/j784s4/j784s4_rm_info.h
-           soc/j784s4/j784s4_sec_proxy_info.c
-           soc/j784s4/j784s4_sec_proxy_info.h
+Files:     *
 Copyright: 2010-2023 Texas Instruments Incorporated - https://www.ti.com/
-           2019 Texas Instruments Incorporated - https://www.ti.com/ Lokesh Vutla <[email protected]>
-           2019 Texas Instruments Incorporated - https://www.ti.com/ Lokesh Vutla <[email protected]> Nishanth Menon <[email protected]>
-License:   __UNKNOWN__
+License:   BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -166,13 +33,3 @@ License:   __UNKNOWN__
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files:     .gitignore
-           Makefile
-           README.md
-Copyright: __NO_COPYRIGHT_NOR_LICENSE__
-License:   __NO_COPYRIGHT_NOR_LICENSE__
-
-#----------------------------------------------------------------------------
-# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
-# license/copyright files.
diff --git a/k3conf/version.sh b/k3conf/version.sh
@@ -3,5 +3,3 @@
 export git_repo="https://git.ti.com/git/k3conf/k3conf.git"
 export custom_build=false
 export require_root=false
-
-export depends="cmake"
diff --git a/mesa/version.sh b/mesa/version.sh
@@ -3,4 +3,3 @@
 export git_repo="https://gitlab.freedesktop.org/StaticRocket/mesa.git"
 export custom_build=false
 export require_root=false
-export depends="directx-headers-dev glslang-tools meson quilt libdrm-dev libx11-dev libxxf86vm-dev libexpat1-dev libsensors-dev libxfixes-dev libxext-dev libva-dev libvdpau-dev libvulkan-dev x11proto-dev libx11-xcb-dev libxcb-dri2-0-dev libxcb-glx0-dev libxcb-xfixes0-dev libxcb-dri3-dev libxcb-present-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-sync-dev libxrandr-dev libxshmfence-dev libzstd-dev python3-mako python3-ply python3-setuptools flex bison libelf-dev libwayland-dev libwayland-egl-backend-dev llvm-15-dev libclang-15-dev libclang-cpp15-dev libclc-15-dev wayland-protocols zlib1g-dev libglvnd-core-dev valgrind rustc bindgen llvm-spirv-15 libclc-15 libllvmspirvlib-15-dev"
diff --git a/run.sh b/run.sh
@@ -26,16 +26,14 @@ source ${projdir}/version.sh
 
 mkdir -p ${builddir}
 
-sudo apt install -y ${depends}
-
 if $custom_build ; then
     run_custom_build
     exit 0
 fi
 
 package_name=$(cd ${debcontroldir} && dpkg-parsechangelog --show-field Source)
 deb_version=$(cd ${debcontroldir} && dpkg-parsechangelog --show-field Version)
-package_version=$(echo $deb_version | cut -d'-' -f1)
+package_version=$(echo $deb_version | sed 's/\(.*\)-.*/\1/')
 last_tested_commit=$(echo $package_version | sed 's/.*+//')
 package_full="${package_name}-${package_version}"
 package_full_ll="${package_name}_${package_version}"
@@ -54,8 +52,9 @@ if [ ! -f "${builddir}/${package_full_ll}.orig.tar.gz" ]; then
     if [ ! -d "${sourcedir}/${package_name}" ]; then
         git clone "${git_repo}" "${sourcedir}/${package_name}"
     fi
+    git -C "${sourcedir}/${package_name}" remote update
     git -C "${sourcedir}/${package_name}" checkout "${last_tested_commit}"
-    tar -cvzf "${builddir}/${package_full_ll}.orig.tar.gz" \
+    tar -czf "${builddir}/${package_full_ll}.orig.tar.gz" \
       --exclude-vcs \
       --absolute-names "${sourcedir}/${package_name}" \
       --transform "s,${sourcedir}/${package_name},${package_full},"

diff --git a/ti-img-rogue-driver/suite/bookworm/debian/control b/ti-img-rogue-driver/suite/bookworm/debian/control
@@ -14,6 +14,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libc-dev | libc,
+ ti-img-rogue-firmware-am62
 Description: Imagination Rogue Kernel Mode Driver for Texas Instruments AM62
  This set of modules provides the kernel mode graphical driver for IMG Rogue GPU on TI AM62.
 
@@ -23,6 +24,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libc-dev | libc,
+ ti-img-rogue-firmware-am62p
 Description: Imagination Rogue Kernel Mode Driver for Texas Instruments AM62P
  This set of modules provides the kernel mode graphical driver for IMG Rogue GPU on TI AM62P.
 
@@ -32,6 +34,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libc-dev | libc,
+ ti-img-rogue-firmware-j721e
 Description: Imagination Rogue Kernel Mode Driver for Texas Instruments J721e
  This set of modules provides the kernel mode graphical driver for IMG Rogue GPU on TI J721e.
 
@@ -41,6 +44,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libc-dev | libc,
+ ti-img-rogue-firmware-j721s2
 Description: Imagination Rogue Kernel Mode Driver for Texas Instruments J721s2
  This set of modules provides the kernel mode graphical driver for IMG Rogue GPU on TI J721s2.
 
@@ -50,5 +54,6 @@ Architecture: all
 Depends:
  ${misc:Depends},
  libc-dev | libc,
+ ti-img-rogue-firmware-j784s4
 Description: Imagination Rogue Kernel Mode Driver for Texas Instruments J784s4
  This set of modules provides the kernel mode graphical driver for IMG Rogue GPU on TI J784s4.
diff --git a/ti-img-rogue-driver/version.sh b/ti-img-rogue-driver/version.sh
@@ -3,4 +3,3 @@
 export git_repo="https://git.ti.com/git/graphics/ti-img-rogue-driver.git"
 export custom_build=false
 export require_root=false
-export depends="dkms dh-sequence-dkms dh-dkms"
diff --git a/ti-img-rogue-umlibs/version.sh b/ti-img-rogue-umlibs/version.sh
@@ -3,4 +3,3 @@
 export git_repo="https://git.ti.com/cgit/graphics/ti-img-rogue-umlibs"
 export custom_build=false
 export require_root=false
-export depends="libdrm-dev libx11-xcb-dev"
diff --git a/ti-linux-kernel-rt/version.sh b/ti-linux-kernel-rt/version.sh
@@ -6,8 +6,6 @@ export require_root=false
 export release_tag="09.02.00.001-rt"
 export package_name="linux-upstream"
 
-export depends="flex bison bc libssl-dev:native kmod cpio"
-
 export DEBFULLNAME="Sai Sree Kartheek Adivi"
 export DEBEMAIL="[email protected]"
 export KDEB_CHANGELOG_DIST=bookworm

diff --git a/ti-linux-kernel/version.sh b/ti-linux-kernel/version.sh
@@ -6,8 +6,6 @@ export require_root=false
 export release_tag="09.02.00.001"
 export package_name="linux-upstream"
 
-export depends="flex bison bc libssl-dev:native kmod cpio"
-
 export DEBFULLNAME="Sai Sree Kartheek Adivi"
 export DEBEMAIL="[email protected]"
 export KDEB_CHANGELOG_DIST=bookworm

diff --git a/ti-rpmsg-char/suite/bookworm/debian/changelog b/ti-rpmsg-char/suite/bookworm/debian/changelog
@@ -1,4 +1,4 @@
-ti-rpmsg-char (0.6.3+git20231210+369ed24-1) unstable; urgency=low
+ti-rpmsg-char (0.0.0+git20231210+369ed24-1) unstable; urgency=low
 
   * Initial release.
 

diff --git a/wl18xx-ti-utils/version.sh b/wl18xx-ti-utils/version.sh
@@ -3,4 +3,3 @@
 export git_repo="https://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git"
 export custom_build=false
 export require_root=false
-export depends="libnl-3-dev libnl-genl-3-dev"