libre-testing/uboot4extlinux-*: new versions and configs

also patch old u-boot tarballs to build with gcc7

1 files changed, 22 insertions, 41 deletions

diff --git a/libre-testing/uboot4extlinux-udoo/PKGBUILD b/libre-testing/uboot4extlinux-udoo/PKGBUILD
index 97d250fb0..95b71e4b6 100644
--- a/libre-testing/uboot4extlinux-udoo/PKGBUILD
+++ b/libre-testing/uboot4extlinux-udoo/PKGBUILD
@@ -1,65 +1,46 @@
 # U-Boot: UDOO
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
-buildarch=4
-
-pkgbase=uboot4extlinux-udoo
-pkgname=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
-pkgver=2015.01
-pkgrel=4
+pkgname=uboot4extlinux-udoo
+pkgver=2016.11
+pkgrel=1
+pkgdesc="U-Boot with Extlinux support for UDOO Dual and Quad"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
+conflicts=('uboot-udoo' 'uboot4grub-udoo')
+replaces=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
 license=('GPL')
-makedepends=('bc')
+makedepends=('bc' 'swig')
 backup=(boot/extlinux/extlinux.conf)
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+install=${pkgname}.install
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
-        '0002-kernel-add-support-for-gcc-5.patch'
         'extlinux.conf')
-sha256sums=('383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde'
-            '9590ac46bd68e214da7741bef184ce9588a9f856b025a0d745e95ce7e73caf69'
-            '257269c4573712d3454b7c6d53d04b45af1166cb65dd9df73bd397a087f85e1e'
+sha256sums=('45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8'
+            '5a93f489208f0f2e9415779770827024e24ca717438c0998499b59b59cd6189d'
             '1bb0cb3eac527182dcec2cecc128056610cce443eea8e57b0da3eb37e69623ea')
 
 prepare() {
-  cd u-boot-${pkgver}
+  cd u-boot-${pkgver/rc/-rc}
 
   patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
 }
 
 build() {
-  cd u-boot-${pkgver}
-  
-  unset CFLAGS CXXFLAGS LDFLAGS
-  
-  mkdir bins
-  for i in dl quad; do
-    make distclean
-    make udoo_${i}_config
-    make
-    mv u-boot.imx bins/u-boot-${i}.imx
-  done
-}
+  cd u-boot-${pkgver/rc/-rc}
 
-package_uboot4extlinux-udoo_dl() {
-  pkgdesc="U-Boot with Extlinux support for UDOO Dual"
-  conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo')
-  provides=('uboot4extlinux-udoo')
-  install=${pkgbase}.install
+  unset CFLAGS CXXFLAGS LDFLAGS
 
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
+  make distclean
+  make udoo_defconfig
+  make EXTRAVERSION=-${pkgrel}
 }
 
-package_uboot4extlinux-udoo_quad() {
-  pkgdesc="U-Boot with Extlinux support for UDOO Quad"
-  conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo')
-  provides=('uboot4extlinux-udoo')
-  install=${pkgbase}.install
+package_uboot4extlinux-udoo() {
+  cd u-boot-${pkgver/rc/-rc}
 
   mkdir -p "${pkgdir}"/boot/extlinux
-  cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
   cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
+  cp SPL u-boot.img "${pkgdir}"/boot
 }