diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2017-02-23 20:07:31 +0100 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-02-26 21:04:46 +0000 |
| commit | 5664574ba343e5c45bb21bdd882791b30ef51474 (patch) | |
| tree | a1e1a9b328d2dd6666088f4d6d05e45880047d57 /testing | |
| parent | dcb73aa3e9feea9ec8616fd0d19ab15cd313e2ff (diff) | |
| download | aports-5664574ba343e5c45bb21bdd882791b30ef51474.tar.bz2 aports-5664574ba343e5c45bb21bdd882791b30ef51474.tar.xz | |
testing/grub: fixup grub-mkconfig
Minor fixup of grub-mkconfig so the generated config works with alpine.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/grub/2.02_beta3-mkconfig-alpine.patch | 30 | ||||
| -rw-r--r-- | testing/grub/APKBUILD | 16 |
2 files changed, 34 insertions, 12 deletions
diff --git a/testing/grub/2.02_beta3-mkconfig-alpine.patch b/testing/grub/2.02_beta3-mkconfig-alpine.patch new file mode 100644 index 0000000000..606540fff3 --- /dev/null +++ b/testing/grub/2.02_beta3-mkconfig-alpine.patch @@ -0,0 +1,30 @@ +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -21,8 +21,11 @@ + exec_prefix="@exec_prefix@" + datarootdir="@datarootdir@" + ++. /etc/update-extlinux.conf + . "$pkgdatadir/grub-mkconfig_lib" + ++GRUB_CMDLINE_LINUX_DEFAULT="modules=${modules} ${default_kernel_opts} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ + export TEXTDOMAIN=@PACKAGE@ + export TEXTDOMAINDIR="@localedir@" + +@@ -75,6 +78,7 @@ + version="$2" + type="$3" + args="$4" ++ tag="$(basename ${rel_dirname}/${basename} | cut -b9-)" + + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" +@@ -133,6 +137,7 @@ + echo '$(echo "$message" | grub_quote)' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + EOF ++ [ -f "/boot/initramfs-${tag}" ] && initrd="initramfs-${tag}" + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + message="$(gettext_printf "Loading initial ramdisk ...")" diff --git a/testing/grub/APKBUILD b/testing/grub/APKBUILD index 1f224284d0..002674738b 100644 --- a/testing/grub/APKBUILD +++ b/testing/grub/APKBUILD @@ -3,7 +3,7 @@ pkgname=grub _ver=2.02~beta3 pkgver=2.02_beta3 -pkgrel=4 +pkgrel=5 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !armhf" @@ -24,6 +24,7 @@ source="ftp://alpha.gnu.org/gnu/grub/grub-$_ver.tar.xz fix-gcc-no-pie-specs.patch grub2-accept-empty-module.patch grub-xen-host_grub.cfg + 2.02_beta3-mkconfig-alpine.patch " builddir="$srcdir/grub-$_ver" @@ -176,18 +177,9 @@ xenhost() { mv $pkgdir/*-xen.bin $subpkgdir/usr/lib/grub-xen/ } -md5sums="ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.tar.xz -7a09f166141e2a57f1829dd6cf1424fa 2.02_beta3-gcc6-ld-no-pie.patch -632f1e9dee0f8a4a52e592cb29cdf8cc fix-gcc-no-pie-specs.patch -5065825ac12ee3162534b8733df84227 grub2-accept-empty-module.patch -429182bb65be24887b377304e43ecbef grub-xen-host_grub.cfg" -sha256sums="30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 grub-2.02~beta3.tar.xz -14912f087e047259e803be020c0506d9865c1507ae34683c6668b8d4a140c93b 2.02_beta3-gcc6-ld-no-pie.patch -eaa876af6b6253c2ca98a03201b98b0e0a27b9acc120b7937c9292882f2f0e0b fix-gcc-no-pie-specs.patch -ddc84d56d61043314b5c03af3c9628dca3e3d14dc01b29c4b586f47ce962bdbe grub2-accept-empty-module.patch -bc658b2a0c0e014e38590c50d5241e33cbc73cf8fbfd31688445be3ceb7da373 grub-xen-host_grub.cfg" sha512sums="4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 grub-2.02~beta3.tar.xz fc15c95bf26b28eee3b5a0d8e5fac538445179cea19a8657cd360e37dd5a95010ea2b899d1e4f3692b778a71f79526539ad1c741f028186f0daf135ee1678da0 2.02_beta3-gcc6-ld-no-pie.patch b9eab870006ab7842e0af27171d3b66fea10835d3fd4e606f241a9898aa28bfc4c1cdf59cece8ad50d2e284a44cba74eb0f390ac29627518f86257a8d586976e fix-gcc-no-pie-specs.patch 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch -4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg" +4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg +5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch" |