aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2019-05-18 21:31:21 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-27 17:56:46 +0000
commit936d3259be28015c2951e98a3c3fed6b150c2614 (patch)
treefcdd587db5e80d68e87e3e322091eb7faa5afb2a
parent1b0306aa999154480ac0b361985487f6e5bb5463 (diff)
downloadaports-936d3259be28015c2951e98a3c3fed6b150c2614.tar.gz
aports-936d3259be28015c2951e98a3c3fed6b150c2614.tar.bz2
aports-936d3259be28015c2951e98a3c3fed6b150c2614.tar.xz
main/grub: fix initramfs detection for xen
/etc/grub.d/20_linux_xen fails to find the initramfs image on Alpine Linux, this patch fixes that.
-rw-r--r--main/grub/APKBUILD4
-rw-r--r--main/grub/alpine-xen-initramfs.patch10
2 files changed, 13 insertions, 1 deletions
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index d8ef6afa22..b222f27b8a 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.02
-pkgrel=16
+pkgrel=17
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -43,6 +43,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
alpine-use-uuid.patch
f2fs-support.patch
alpine-intel-ucode.patch
+ alpine-xen-initramfs.patch
0001-xen-Add-some-Xen-headers.patch
0002-loader-linux-Support-passing-RSDP-address-via-boot-p.patch
@@ -241,6 +242,7 @@ e11f62b5012ecc8abf9d4912db12a263470887671b05ccb4de54981fb3b32a52d4557439a160e69e
ce788fa909bb89a3ccabbc144bb46226373cf846ffe1f315b0bf8b02403220d95c8fe67baf3c37c4e12cb36f22d70f62bbd2d0c5ff6b7230f05e5964b5c548ac alpine-use-uuid.patch
e4e7716cef9f183810eade57751617595c5d5fac740223a5ac3ed13e2215bbb38781328a3f8da3d4c71dd39ffec55d27d3e55b55c189dce55748e9a8512d4b41 f2fs-support.patch
ef30930acf817cb2d3721c78f89976a706b502419843ecbf938983a2076ee6a812fb914eb8d74014054b356325c0a72ae3f4416c4b22e5e86ebd8200304446d5 alpine-intel-ucode.patch
+e683a647757956349c25e3c4e0be8d2e4f78287ba588c497f21942677b207f33a33fa4293cbe71665760dd31b752af02e1353896858cdb2f8d4368116878d5b1 alpine-xen-initramfs.patch
9daf00b36108852a7443ce4b5b1114d2e87cbfc72148b7847508965ff0dfab14b3f56980a0110c82170f5c2b75ef7a337a15398f59a4cb7e6404227499bffd9a 0001-xen-Add-some-Xen-headers.patch
33505273a8525aa4b44acba69f1b7f0dbee144809fb86626879895d44ce7eed889abf442644fc96536b4ebf86ab7c84a982749fc1181976e89e59a5cf7f7944e 0002-loader-linux-Support-passing-RSDP-address-via-boot-p.patch
1e446051930a96078e2b22831f53e939affdcee371e35e45d87efb8bdf02e2eea03247b7636525daf7d9306ec47cd4351e4d74abe357d19658b0b3fc884f9343 0003-xen-Carve-out-grant-tab-initialization-into-dedicate.patch
diff --git a/main/grub/alpine-xen-initramfs.patch b/main/grub/alpine-xen-initramfs.patch
new file mode 100644
index 0000000000..1e1c7a02ac
--- /dev/null
+++ b/main/grub/alpine-xen-initramfs.patch
@@ -0,0 +1,10 @@
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -221,6 +221,7 @@
+ "initrd-${version}" "initramfs-${version}.img" \
+ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ "initrd-${alt_version}" "initramfs-${alt_version}.img" \
++ "initramfs-${version}" \
+ "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${alt_version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \