From 660a17cf89d1f6c41b5c57009d733af62ae57232 Mon Sep 17 00:00:00 2001 From: Isaac David Date: Mon, 30 Oct 2017 00:54:11 -0600 Subject: uboot4extlinux-*: get in sync with current kernels --- libre/uboot4extlinux-sunxi/PKGBUILD | 2 +- libre/uboot4extlinux-sunxi/extlinux.conf | 21 +++------------------ 2 files changed, 4 insertions(+), 19 deletions(-) (limited to 'libre') diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD index f08ec6f70..19b4a85ca 100644 --- a/libre/uboot4extlinux-sunxi/PKGBUILD +++ b/libre/uboot4extlinux-sunxi/PKGBUILD @@ -25,7 +25,7 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime' 'uboot4extlinux-orangepi_pc' 'uboot4extlinux-orangepi_plus') pkgver=2017.01 -pkgrel=1 +pkgrel=1.1 arch=('armv7h') url="http://git.denx.de/u-boot.git/" license=('GPL') diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre/uboot4extlinux-sunxi/extlinux.conf index 34b2ebc97..02b942df6 100644 --- a/libre/uboot4extlinux-sunxi/extlinux.conf +++ b/libre/uboot4extlinux-sunxi/extlinux.conf @@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel append root=/dev/mmcblk0p1 rw console=ttyS0,115200 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=ttyS0,115200 - 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=ttyS0,115200 @@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel append root=/dev/mmcblk0p1 rw console=ttyS0,115200 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=ttyS0,115200 - 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=ttyS0,115200 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=ttyS0,115200 - 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=ttyS0,115200 @@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel append root=/dev/mmcblk0p1 rw console=ttyS0,115200 fdtdir /boot/dtbs/linux-libre-rt -label Parabola GNU/Linux-libre, linux-libre-xen kernel - kernel /boot/vmlinuz-linux-libre-xen +label Parabola GNU/Linux-libre, linux-libre-xtreme kernel + kernel /boot/vmlinuz-linux-libre-xtreme append root=/dev/mmcblk0p1 rw console=ttyS0,115200 - fdtdir /boot/dtbs/linux-libre-xen + fdtdir /boot/dtbs/linux-libre-xtreme -- cgit v1.2.3