update u-boot install path

Joshua-Riek · Oct 21, 2023 · 09a5cb1 · 09a5cb1
1 parent e37bb18
commit 09a5cb1
Show file tree

Hide file tree

Showing 24 changed files with 196 additions and 95 deletions.
diff --git a/packages/u-boot-9tripod-rk3588/debian/changelog b/packages/u-boot-9tripod-rk3588/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-9tripod-rk3588 (2017.09+20230321.git2f6e967d-4) UNRELEASED; urgency=medium
+
+  * Update u-boot install path
+
+ -- Joshua Riek <jjriek@verizon.net>  Fri, 20 Oct 2023 21:47:35 -0400
+
 u-boot-9tripod-rk3588 (2017.09+20230321.git2f6e967d-3) jammy; urgency=medium
 
   * Updated the ddr blob to rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin

diff --git a/packages/u-boot-9tripod-rk3588/debian/control b/packages/u-boot-9tripod-rk3588/debian/control
@@ -11,9 +11,9 @@ Vcs-Git: https://github.com/stvhay/u-boot.git
 Package: u-boot-indiedroid-nova
 Architecture: arm64
 Priority: optional
-Provides: u-boot-9tripod-rk3588
-Replaces: u-boot-9tripod-rk3588
-Conflicts: u-boot-9tripod-rk3588
+Provides: u-boot-9tripod-rk3588, u-boot
+Replaces: u-boot-9tripod-rk3588, u-boot
+Conflicts: u-boot-9tripod-rk3588, u-boot
 Description: A boot loader for the Indiedroid Nova.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is

diff --git a/packages/u-boot-9tripod-rk3588/debian/preinst b/packages/u-boot-9tripod-rk3588/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove the old u-boot path so we can replace it with a symlink
+path="/usr/lib/u-boot-9tripod-rk3588/"
+if [ -d ${path} ] && [ ! -L ${path} ]; then
+    rm -rf ${path}
+fi
+
+exit 0
diff --git a/packages/u-boot-9tripod-rk3588/debian/rules b/packages/u-boot-9tripod-rk3588/debian/rules
@@ -28,7 +28,7 @@ ${BOARDS}:
 	  $@_defconfig
 
 	@touch .scmversion
-	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=1/g' debian/build/$@/.config
+	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=2/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_DISABLE_CONSOLE=y/CONFIG_DISABLE_CONSOLE=n/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-9tripod-rk3588"/g' debian/build/$@/.config
 
@@ -68,16 +68,18 @@ binary-arch: $(addprefix package-,$(BOARDS))
 binary: binary-arch
 
 package-%:
-	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot-9tripod-rk3588
-	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot-9tripod-rk3588/u-boot.itb
-	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot-9tripod-rk3588/idbloader.img
-	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot-9tripod-rk3588/rkspi_loader.img
+	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot
+	@sh -c "cd 'debian/tmp/u-boot/usr/lib/'; ln -sfn /usr/lib/u-boot u-boot-9tripod-rk3588"
+	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot/u-boot.itb
+	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot/idbloader.img
+	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot/rkspi_loader.img
 
 	@mkdir -m 755 -p "debian/tmp/u-boot/DEBIAN"
-	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot-9tripod-rk3588"
-	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot-9tripod-rk3588"
-	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot-9tripod-rk3588/changelog.Debian"
-	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot-9tripod-rk3588/changelog.Debian"
+	@cp debian/preinst debian/tmp/u-boot/DEBIAN/preinst
+	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
+	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
 	@sh -c "cd 'debian/tmp/u-boot'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums"
 	@chown -R root:root "debian/tmp/u-boot" && chmod -R go-w "debian/tmp/u-boot" && chmod -R a+rX "debian/tmp/u-boot"
 	@dpkg-gencontrol -pu-boot-$(subst package-,,$@)-nova -P"debian/tmp/u-boot"

diff --git a/packages/u-boot-friendlyelec-rk3588/debian/changelog b/packages/u-boot-friendlyelec-rk3588/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-friendlyelec-rk3588 (2017.09+20230711.gitddc91cd0-3) UNRELEASED; urgency=medium
+
+  * Update u-boot install path 
+
+ -- Joshua Riek <jjriek@verizon.net>  Fri, 20 Oct 2023 21:44:48 -0400
+
 u-boot-friendlyelec-rk3588 (2017.09+20230711.gitddc91cd0-2) jammy; urgency=medium
 
   * Updated the ddr blob to rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin

diff --git a/packages/u-boot-friendlyelec-rk3588/debian/control b/packages/u-boot-friendlyelec-rk3588/debian/control
@@ -9,9 +9,9 @@ Vcs-Git: https://github.com/radxa/u-boot.git
 Package: u-boot-nanopi-r6s
 Architecture: arm64
 Priority: optional
-Provides: u-boot-friendlyelec-rk3588
-Replaces: u-boot-friendlyelec-rk3588
-Conflicts: u-boot-friendlyelec-rk3588
+Provides: u-boot-friendlyelec-rk3588, u-boot
+Replaces: u-boot-friendlyelec-rk3588, u-boot
+Conflicts: u-boot-friendlyelec-rk3588, u-boot
 Description: A boot loader for the FriendlyELEC NanoPi R6S.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
@@ -22,9 +22,9 @@ Description: A boot loader for the FriendlyELEC NanoPi R6S.
 Package: u-boot-nanopi-r6c
 Architecture: arm64
 Priority: optional
-Provides: u-boot-friendlyelec-rk3588
-Replaces: u-boot-friendlyelec-rk3588
-Conflicts: u-boot-friendlyelec-rk3588
+Provides: u-boot-friendlyelec-rk3588, u-boot
+Replaces: u-boot-friendlyelec-rk3588, u-boot
+Conflicts: u-boot-friendlyelec-rk3588, u-boot
 Description: A boot loader for the FriendlyELEC NanoPi R6C.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
@@ -35,12 +35,12 @@ Description: A boot loader for the FriendlyELEC NanoPi R6C.
 Package: u-boot-nanopc-t6
 Architecture: arm64
 Priority: optional
-Provides: u-boot-friendlyelec-rk3588
-Replaces: u-boot-friendlyelec-rk3588
-Conflicts: u-boot-friendlyelec-rk3588
+Provides: u-boot-friendlyelec-rk3588, u-boot
+Replaces: u-boot-friendlyelec-rk3588, u-boot
+Conflicts: u-boot-friendlyelec-rk3588, u-boot
 Description: A boot loader for the FriendlyELEC NanoPC T6.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
  intended to be easy to port and to debug, and runs on many
  supported architectures, including PPC, ARM, MIPS, x86, m68k,
- NIOS, and Microblaze.
+ NIOS, and Microblaze.
diff --git a/packages/u-boot-friendlyelec-rk3588/debian/preinst b/packages/u-boot-friendlyelec-rk3588/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove the old u-boot path so we can replace it with a symlink
+path="/usr/lib/u-boot-friendlyelec-rk3588/"
+if [ -d ${path} ] && [ ! -L ${path} ]; then
+    rm -rf ${path}
+fi
+
+exit 0
diff --git a/packages/u-boot-friendlyelec-rk3588/debian/rules b/packages/u-boot-friendlyelec-rk3588/debian/rules
@@ -29,7 +29,7 @@ ${BOARDS}:
 	  $@_defconfig
 
 	@touch .scmversion
-	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=1/g' debian/build/$@/.config
+	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=2/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_DISABLE_CONSOLE=y/CONFIG_DISABLE_CONSOLE=n/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-friendlyelec-rk3588"/g' debian/build/$@/.config
 
@@ -70,18 +70,20 @@ binary-arch: $(addprefix package-,$(BOARDS))
 binary: binary-arch
 
 package-%:
-	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot-friendlyelec-rk3588
-	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot-friendlyelec-rk3588/u-boot.itb
-	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot-friendlyelec-rk3588/idbloader.img
+	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot
+	@sh -c "cd 'debian/tmp/u-boot/usr/lib/'; ln -sfn /usr/lib/u-boot u-boot-friendlyelec-rk3588"
+	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot/u-boot.itb
+	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot/idbloader.img
 	@if [ "nanopc_t6" = "$(subst package-,,$@)" ]; then \
-		cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot-friendlyelec-rk3588/rkspi_loader.img; \
+		cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot/rkspi_loader.img; \
 	fi
 
 	@mkdir -m 755 -p "debian/tmp/u-boot/DEBIAN"
-	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot-friendlyelec-rk3588"
-	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot-friendlyelec-rk3588"
-	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot-friendlyelec-rk3588/changelog.Debian"
-	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot-friendlyelec-rk3588/changelog.Debian"
+	@cp debian/preinst debian/tmp/u-boot/DEBIAN/preinst
+	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
+	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
 	@sh -c "cd 'debian/tmp/u-boot'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums"
 	@chown -R root:root "debian/tmp/u-boot" && chmod -R go-w "debian/tmp/u-boot" && chmod -R a+rX "debian/tmp/u-boot"
 	@dpkg-gencontrol -pu-boot-$(subst -rk3588,,$(subst -rk3588s,,$(subst _,-,$(subst package-,,$@)))) -P"debian/tmp/u-boot"

diff --git a/packages/u-boot-lubancat-rk3588/debian/changelog b/packages/u-boot-lubancat-rk3588/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-lubancat-rk3588 (2017.09+20230711.gitddc91cd0-2) UNRELEASED; urgency=medium
+
+  * Update u-boot install path 
+
+ -- Joshua Riek <jjriek@verizon.net>  Fri, 20 Oct 2023 21:55:20 -0400
+
 u-boot-lubancat-rk3588 (2017.09+20230711.gitddc91cd0-1) jammy; urgency=medium
 
   * renamed package to u-boot-lubancat-rk3588

diff --git a/packages/u-boot-lubancat-rk3588/debian/control b/packages/u-boot-lubancat-rk3588/debian/control
@@ -9,12 +9,12 @@ Vcs-Git: https://github.com/radxa/u-boot.git
 Package: u-boot-lubancat-4
 Architecture: arm64
 Priority: optional
-Provides: u-boot-lubancat-rk3588
-Replaces: u-boot-lubancat-rk3588
-Conflicts: u-boot-lubancat-rk3588
+Provides: u-boot-lubancat-rk3588, u-boot
+Replaces: u-boot-lubancat-rk3588, u-boot
+Conflicts: u-boot-lubancat-rk3588, u-boot
 Description: A boot loader for the lubancat 4
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
  intended to be easy to port and to debug, and runs on many
  supported architectures, including PPC, ARM, MIPS, x86, m68k,
- NIOS, and Microblaze.
+ NIOS, and Microblaze.
diff --git a/packages/u-boot-lubancat-rk3588/debian/preinst b/packages/u-boot-lubancat-rk3588/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove the old u-boot path so we can replace it with a symlink
+path="/usr/lib/u-boot-lubancat-rk3588/"
+if [ -d ${path} ] && [ ! -L ${path} ]; then
+    rm -rf ${path}
+fi
+
+exit 0
diff --git a/packages/u-boot-lubancat-rk3588/debian/rules b/packages/u-boot-lubancat-rk3588/debian/rules
@@ -70,16 +70,18 @@ binary-arch: $(addprefix package-,$(BOARDS))
 binary: binary-arch
 
 package-%:
-	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot-lubancat-rk3588
-	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot-lubancat-rk3588/u-boot.itb
-	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot-lubancat-rk3588/idbloader.img
-	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot-lubancat-rk3588/rkspi_loader.img
+	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot
+	@sh -c "cd 'debian/tmp/u-boot/usr/lib/'; ln -sfn /usr/lib/u-boot u-boot-lubancat-rk3588"
+	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot/u-boot.itb
+	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot/idbloader.img
+	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot/rkspi_loader.img
 
 	@mkdir -m 755 -p "debian/tmp/u-boot/DEBIAN"
-	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot-lubancat-rk3588"
-	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot-lubancat-rk3588"
-	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot-lubancat-rk3588/changelog.Debian"
-	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot-lubancat-rk3588/changelog.Debian"
+	@cp debian/preinst debian/tmp/u-boot/DEBIAN/preinst
+	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
+	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
 	@sh -c "cd 'debian/tmp/u-boot'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums"
 	@chown -R root:root "debian/tmp/u-boot" && chmod -R go-w "debian/tmp/u-boot" && chmod -R a+rX "debian/tmp/u-boot"
 	@dpkg-gencontrol -pu-boot-$(subst -rk3588,,$(subst -rk3588s,,$(subst _,-,$(subst package-,,$@)))) -P"debian/tmp/u-boot"

diff --git a/packages/u-boot-mixtile-rk3588/debian/changelog b/packages/u-boot-mixtile-rk3588/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-mixtile-rk3588 (2017.09+20230920.git609a77ef-3) UNRELEASED; urgency=medium
+
+  * Update u-boot install path 
+
+ -- Joshua Riek <jjriek@verizon.net>  Fri, 20 Oct 2023 21:18:44 -0400
+
 u-boot-mixtile-rk3588 (2017.09+20230920.git609a77ef-2) jammy; urgency=medium
 
   * enable pcie3x4 node for the Mixtile Blade 3

diff --git a/packages/u-boot-mixtile-rk3588/debian/control b/packages/u-boot-mixtile-rk3588/debian/control
@@ -9,9 +9,9 @@ Vcs-Git: https://github.com/radxa/u-boot.git
 Package: u-boot-mixtile-blade3
 Architecture: arm64
 Priority: optional
-Provides: u-boot-mixtile-rk3588
-Replaces: u-boot-mixtile-rk3588
-Conflicts: u-boot-mixtile-rk3588
+Provides: u-boot-mixtile-rk3588, u-boot
+Replaces: u-boot-mixtile-rk3588, u-boot
+Conflicts: u-boot-mixtile-rk3588, u-boot
 Description: A boot loader for the Mixtile Blade 3.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is

diff --git a/packages/u-boot-mixtile-rk3588/debian/preinst b/packages/u-boot-mixtile-rk3588/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove the old u-boot path so we can replace it with a symlink
+path="/usr/lib/u-boot-mixtile-rk3588/"
+if [ -d ${path} ] && [ ! -L ${path} ]; then
+    rm -rf ${path}
+fi
+
+exit 0
diff --git a/packages/u-boot-mixtile-rk3588/debian/rules b/packages/u-boot-mixtile-rk3588/debian/rules
@@ -28,7 +28,7 @@ ${BOARDS}:
 	  $@_defconfig
 
 	@touch .scmversion
-	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=1/g' debian/build/$@/.config
+	@sed -i 's/CONFIG_BOOTDELAY=.*/CONFIG_BOOTDELAY=2/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_DISABLE_CONSOLE=y/CONFIG_DISABLE_CONSOLE=n/g' debian/build/$@/.config
 	@sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-mixtile-rk3588"/g' debian/build/$@/.config
 
@@ -68,21 +68,22 @@ binary-arch: $(addprefix package-,$(filter-out blade3_sata,$(BOARDS)))
 binary: binary-arch
 
 package-%:
-	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/
-	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/u-boot.itb
-	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/idbloader.img
-	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/rkspi_loader.img
+	@rm -rf debian/tmp && mkdir -m 755 -p debian/tmp/u-boot/usr/lib/u-boot/
+	@sh -c "cd 'debian/tmp/u-boot/usr/lib/'; ln -sfn /usr/lib/u-boot u-boot-mixtile-rk3588"
+	@cp debian/build/$(subst package-,,$@)/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot/u-boot.itb
+	@cp debian/build/$(subst package-,,$@)/idbloader.img debian/tmp/u-boot/usr/lib/u-boot/idbloader.img
+	@cp debian/build/$(subst package-,,$@)/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot/rkspi_loader.img
 
-	@cp debian/build/$(subst package-,,$@)_sata/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/u-boot-sata.itb
-	@cp debian/build/$(subst package-,,$@)_sata/idbloader.img debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/idbloader_sata.img
-	@cp debian/build/$(subst package-,,$@)_sata/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot-mixtile-rk3588/rkspi_loader_sata.img
+	@cp debian/build/$(subst package-,,$@)_sata/u-boot.itb debian/tmp/u-boot/usr/lib/u-boot/u-boot-sata.itb
+	@cp debian/build/$(subst package-,,$@)_sata/idbloader.img debian/tmp/u-boot/usr/lib/u-boot/idbloader_sata.img
+	@cp debian/build/$(subst package-,,$@)_sata/rkspi_loader.img debian/tmp/u-boot/usr/lib/u-boot/rkspi_loader_sata.img
 
 	@mkdir -m 755 -p "debian/tmp/u-boot/DEBIAN"
-	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot-mixtile-rk3588"
-	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot-mixtile-rk3588"
-	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot-mixtile-rk3588/changelog.Debian"
-	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot-mixtile-rk3588/changelog.Debian"
-#	@sh -c "cd debian/tmp/u-boot/usr/lib && ln -s /usr/lib/u-boot u-boot-mixtile-rk3588"
+	@cp debian/preinst debian/tmp/u-boot/DEBIAN/preinst
+	@mkdir -p "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/copyright "debian/tmp/u-boot/usr/share/doc/u-boot"
+	@cp debian/changelog "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
+	@gzip -9 "debian/tmp/u-boot/usr/share/doc/u-boot/changelog.Debian"
 	@sh -c "cd 'debian/tmp/u-boot'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums"
 	@chown -R root:root "debian/tmp/u-boot" && chmod -R go-w "debian/tmp/u-boot" && chmod -R a+rX "debian/tmp/u-boot"
 	@dpkg-gencontrol -pu-boot-mixtile-$(subst package-,,$@) -P"debian/tmp/u-boot"

diff --git a/packages/u-boot-orangepi-rk3588/debian/changelog b/packages/u-boot-orangepi-rk3588/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-4) UNRELEASED; urgency=medium
+
+  * Update u-boot install path
+
+ -- Joshua Riek <jjriek@verizon.net>  Fri, 20 Oct 2023 21:14:04 -0400
+
 u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-3) jammy; urgency=medium
 
   * Updated the ddr blob to rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin

diff --git a/packages/u-boot-orangepi-rk3588/debian/control b/packages/u-boot-orangepi-rk3588/debian/control
@@ -9,9 +9,9 @@ Vcs-Git: https://github.com/orangepi-xunlong/u-boot-orangepi.git
 Package: u-boot-orangepi-5
 Architecture: arm64
 Priority: optional
-Provides: u-boot-orangepi-rk3588
-Replaces: u-boot-orangepi-rk3588
-Conflicts: u-boot-orangepi-rk3588
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
 Description: A boot loader for the Orange Pi 5.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
@@ -22,9 +22,9 @@ Description: A boot loader for the Orange Pi 5.
 Package: u-boot-orangepi-5b
 Architecture: arm64
 Priority: optional
-Provides: u-boot-orangepi-rk3588
-Replaces: u-boot-orangepi-rk3588
-Conflicts: u-boot-orangepi-rk3588
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
 Description: A boot loader for the Orange Pi 5B.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is
@@ -35,9 +35,9 @@ Description: A boot loader for the Orange Pi 5B.
 Package: u-boot-orangepi-5-plus
 Architecture: arm64
 Priority: optional
-Provides: u-boot-orangepi-rk3588
-Replaces: u-boot-orangepi-rk3588
-Conflicts: u-boot-orangepi-rk3588
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
 Description: A boot loader for the Orange Pi 5 Plus.
  Das U-Boot is a cross-platform bootloader for embedded systems,
  used as the default boot loader by several board vendors.  It is

diff --git a/packages/u-boot-orangepi-rk3588/debian/preinst b/packages/u-boot-orangepi-rk3588/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove the old u-boot path so we can replace it with a symlink
+path="/usr/lib/u-boot-orangepi-rk3588/"
+if [ -d ${path} ] && [ ! -L ${path} ]; then
+    rm -rf ${path}
+fi
+
+exit 0