libre: uboot4extlinux-sunxi: improve build and package in /boot/u-boot/images

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

1 files changed, 25 insertions, 25 deletions

diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index 86abb97f2..a7467fb20 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=3
+pkgrel=4
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -65,12 +65,12 @@ build() {
   unset CFLAGS CXXFLAGS LDFLAGS
 
   for i in ${boards[@]}; do
-    mkdir ../bin_${i}
+    mkdir -p ../bin_${i}
     make distclean
-    make ${i}_config
+    make ${i}_defconfig
     echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
     make EXTRAVERSION=-${pkgrel}
-    mv u-boot-sunxi-with-spl.bin ../bin_${i}
+    mv -f u-boot-sunxi-with-spl.bin ../bin_${i}
   done
 }
 
@@ -81,7 +81,7 @@ 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
+  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 +94,7 @@ 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
+  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 +106,7 @@ 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
+  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 +119,7 @@ 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
+  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 +131,7 @@ 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
+  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 +143,7 @@ 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}"/boot
+  install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -155,7 +155,7 @@ 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
+  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 +168,7 @@ 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
+  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 +180,7 @@ 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
+  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -192,7 +192,7 @@ 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
+  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -204,7 +204,7 @@ 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
+  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -216,7 +216,7 @@ 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
+  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -228,7 +228,7 @@ 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
+  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -240,7 +240,7 @@ 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
+  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
@@ -253,7 +253,7 @@ 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
+  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 +266,7 @@ 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
+  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 +279,7 @@ 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
+  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 +291,7 @@ 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
+  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 +303,7 @@ 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
+  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 +315,7 @@ 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
+  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 +327,7 @@ 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
+  install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }