aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-06-25 07:05:17 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-06-25 07:05:17 +0000
commit0e31b3e95fee62832477258200d7ed7122a74c49 (patch)
treea1d954d0adfa368c2b099c12d7340fb7c882a555
parentb7d3caad2cc760d74965aa7d4366cb4a7d0d5909 (diff)
downloadaports-0e31b3e95fee62832477258200d7ed7122a74c49.tar.bz2
aports-0e31b3e95fee62832477258200d7ed7122a74c49.tar.xz
main/syslinux: fix update-extlinux to handle vanilla kernel
the vanilla kernel does not have any -* suffix so it needs special handling.
-rw-r--r--main/syslinux/APKBUILD8
-rwxr-xr-xmain/syslinux/update-extlinux8
2 files changed, 10 insertions, 6 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index 6d8aab34ad..b89fd03fab 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=syslinux
pkgver=6.02
-pkgrel=1
+pkgrel=2
_ver=${pkgver/_/-}
pkgdesc="Boot loader for the Linux operating system"
url="http://syslinux.org"
@@ -56,10 +56,10 @@ package() {
md5sums="6f275813a1b08cf852e55c0a3f8fbc78 syslinux-6.02.tar.xz
38d206b75b1096ba5df6cfabf455ab06 update-extlinux.conf
-320f3d2b57293ecf7d578fa53c087dde update-extlinux"
+fcd6961bc95dd90f66cb2a80429b75a0 update-extlinux"
sha256sums="afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 syslinux-6.02.tar.xz
d0b7b869489d0ac1529dd742d8d88844ea4e0a5d893de5218b250b97f68e55f2 update-extlinux.conf
-031563308b02b148a2db2c66922feb1b0e5ec8dd92fcf79de93d0e581df8da0f update-extlinux"
+8d1551b84aab6389ab1916524255396b334e0718d4816a4bb987bfce24f67d12 update-extlinux"
sha512sums="919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f syslinux-6.02.tar.xz
f304068ee174e531890fed20b05d962e6c076160c470ed9cf0d822ff56917793ecabec8c0495b045a740f1f63412a55fbb1fa4b4231b18f76c8584b55f51306d update-extlinux.conf
-64c664e61deea6e128e6ffd55d6c92e5a7c73ecc7058ba2f8201b38a79a388d74833653ce4da87e8a977659257f7b17830f490a0800f205d9525ae1a0771b3c4 update-extlinux"
+7b1e685a6d5c05e30915ea7b7950cc141b8450c456301898928aebd90c062c4fcba0ef4ce545a3de75e16917d2f08128595c44064235cc2e200ea8cc76732f77 update-extlinux"
diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
index b3c387baee..b272ffd721 100755
--- a/main/syslinux/update-extlinux
+++ b/main/syslinux/update-extlinux
@@ -115,8 +115,12 @@ if [ -f "/boot/xen.gz" ]; then
done
fi
-for kernel in $(find /boot -name "vmlinuz-*" -type f); do
- tag=$(basename $kernel | cut -b9-)
+for kernel in $(find /boot -name "vmlinuz*" -type f); do
+ case $kernel in
+ *vmlinuz) tag=vanilla;;
+ *vmlinuz-*) tag=$(basename $kernel | cut -b9-);;
+ *) continue;;
+ esac
everbose "Found kernel: $kernel"
label=$(grep -w -l $tag /usr/share/kernel/*/kernel.release | cut -d/ -f5)
if [ -z "$label" ]; then