libre: uboot4extlinux-sunxi: fix images path

All packages built fine.

This was also tested on a Lime2-EMMC:
- Booting worked fine with a extliux.conf tailored for the
  configuration of the device being tested.
- An external display was connected to it and it worked
  in u-boot, during boot and showed a console at the end.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

2 files changed, 45 insertions, 24 deletions

diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index a7467fb20..e3eef2a84 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -26,7 +26,7 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
 pkgver=2019.01
-pkgrel=4
+pkgrel=5
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -81,7 +81,8 @@ package_uboot4extlinux-a10-olinuxino-lime() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -94,7 +95,8 @@ package_uboot4extlinux-a10s-olinuxino-m() {
   replaces=('uboot4extlinux-a10s-olinuxino-micro')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -106,7 +108,8 @@ package_uboot4extlinux-a13-olinuxino() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A13-OLinuXino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A13-OLinuXino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -119,7 +122,8 @@ package_uboot4extlinux-a13-olinuxinom() {
   replaces=('uboot4extlinux-a13-olinuxino-micro')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -131,7 +135,8 @@ package_uboot4extlinux-a20-olinuxino-lime() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -143,7 +148,8 @@ package_uboot4extlinux-a20-olinuxino-lime2() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -155,7 +161,8 @@ package_uboot4extlinux-a20-olinuxino-lime2-emmc() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -168,7 +175,8 @@ package_uboot4extlinux-a20-olinuxino_micro() {
   replaces=('uboot-a20-olinuxino-micro')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -180,7 +188,8 @@ package_uboot4extlinux-bananapi() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -192,7 +201,8 @@ package_uboot4extlinux-bananapro() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -204,7 +214,8 @@ package_uboot4extlinux-chip() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -216,7 +227,8 @@ package_uboot4extlinux-cubieboard() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -228,7 +240,8 @@ package_uboot4extlinux-cubieboard2() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -240,7 +253,8 @@ package_uboot4extlinux-cubietruck() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -253,7 +267,8 @@ package_uboot4extlinux-linksprite_pcduino() {
   replaces=('uboot4extlinux-pcduino')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -266,7 +281,8 @@ package_uboot4extlinux-linksprite_pcduino3() {
   replaces=('uboot4extlinux-pcduino3')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -279,7 +295,8 @@ package_uboot4extlinux-linksprite_pcduino3_nano() {
   replaces=('uboot4extlinux-pcduino3-nano')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -291,7 +308,8 @@ package_uboot4extlinux-orangepi_2() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_orangepi_2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_orangepi_2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -303,7 +321,8 @@ package_uboot4extlinux-orangepi_one() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_orangepi_one/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_orangepi_one/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -315,7 +334,8 @@ package_uboot4extlinux-orangepi_pc() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_orangepi_pc/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_orangepi_pc/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -327,7 +347,8 @@ package_uboot4extlinux-orangepi_plus() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
+  install -d "${pkgdir}"/boot/u-boot/images/
+  install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
diff --git a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
index 4419c21af..46f8304cd 100644
--- a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
+++ b/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
@@ -1,5 +1,5 @@
 flash_instructions() {
-  echo "# dd if=/boot/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8"
+  echo "# dd if=/boot/u-boot/images/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8"
 }
 
 extlinux_warning() {
@@ -14,7 +14,7 @@ flash_uboot() {
     echo "Do you want to do this now? [y|N]"
     read -r shouldwe
     if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-      dd if=/boot/u-boot-sunxi-with-spl.bin of=$root bs=1024 seek=8
+      dd if=/boot/u-boot/images/u-boot-sunxi-with-spl.bin of=$root bs=1024 seek=8
     else
       echo "You can do this later by running:"
       flash_instructions