uboot4extlinux-*: track current kernel images, pkgrel bump

2 files changed, 58 insertions, 48 deletions

diff --git a/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
index e46b52505..080328cea 100644
--- a/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
+++ b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=4
 
 pkgname=uboot4extlinux-omap3_beagle
 pkgver=2016.01
-pkgrel=3
+pkgrel=4
 pkgdesc="U-Boot with Extlinux support for BeagleBoard and BeagleBoard-xM"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -18,10 +18,10 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
         'extlinux.conf'
         'uEnv.txt')
-md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
-         'da3d52f785bce02602f88fb85f74de2f'
-         '3b3d0e13be08225190c0f733ebf31d9a'
-         'd41d8cd98f00b204e9800998ecf8427e')
+sha256sums=('e5792fba9399d9804aa2ef667f14ff771e2cdece72367d340250265bf095a5d5'
+            'cf6519bab4270bf093eb6ff0d9f3b4d314d00af6c4ecad07c492977ae5c7f510'
+            'e96d167d99967ebefde8d02b27b4564e46409cc0c8738d5de72f431a2e438cf8'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
 
 prepare() {
   cd u-boot-${pkgver}
diff --git a/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
index 77a20223b..42525abe7 100644
--- a/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
+++ b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
@@ -3,46 +3,56 @@ menu title Welcome to U-Boot with Extlinux support!
 timeout 50
 
 label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /dtbs/linux-libre
-
-#label Parabola GNU/Linux-libre, linux-libre-lts kernel
-#	kernel /vmlinuz-linux-libre-lts
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-lts
-
-#label Parabola GNU/Linux-libre, linux-libre-knock kernel
-#	kernel /vmlinuz-linux-libre-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
-#	kernel /vmlinuz-linux-libre-lts-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-audit
-
-#label Parabola GNU/Linux-libre, linux-libre-pck kernel
-#	kernel /vmlinuz-linux-libre-pck
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-pck
-
-#label Parabola GNU/Linux-libre, linux-libre-rt kernel
-#	kernel /vmlinuz-linux-libre-rt
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-rt
+	kernel /boot/vmlinuz-linux-libre
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre
+
+label Parabola GNU/Linux-libre, linux-libre-lts kernel
+	kernel /boot/vmlinuz-linux-libre-lts
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-lts
+
+label Parabola GNU/Linux-libre, linux-libre-knock kernel
+	kernel /boot/vmlinuz-linux-libre-knock
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-knock
+
+label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
+	kernel /boot/vmlinuz-linux-libre-lts-knock
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-lts-knock
+
+label Parabola GNU/Linux-libre, linux-libre-hardened kernel
+	kernel /boot/vmlinuz-linux-libre-hardened
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-hardened
+
+label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
+	kernel /boot/vmlinuz-linux-libre-apparmor
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
+	kernel /boot/vmlinuz-linux-libre-lts-apparmor
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-lts-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-audit kernel
+	kernel /boot/vmlinuz-linux-libre-audit
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-audit
+
+label Parabola GNU/Linux-libre, linux-libre-pck kernel
+	kernel /boot/vmlinuz-linux-libre-pck
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-pck
+
+label Parabola GNU/Linux-libre, linux-libre-rt kernel
+	kernel /boot/vmlinuz-linux-libre-rt
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-rt
+
+label Parabola GNU/Linux-libre, linux-libre-xen kernel
+	kernel /boot/vmlinuz-linux-libre-xen
+	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+	fdtdir /boot/dtbs/linux-libre-xen