diff --git a/trunk/0003-10_linux-detect-archlinux-initramfs.patch b/trunk/0003-10_linux-detect-archlinux-initramfs.patch index 5cbd19f..5e33ebb 100644 --- a/trunk/0003-10_linux-detect-archlinux-initramfs.patch +++ b/trunk/0003-10_linux-detect-archlinux-initramfs.patch @@ -1,5 +1,5 @@ diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index f5d3e78..ef59c8c 100644 +index faedf74e1..ba3d00ebf 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -83,6 +83,8 @@ linux_entry () @@ -11,7 +11,7 @@ index f5d3e78..ef59c8c 100644 *) title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; esac -@@ -186,7 +188,7 @@ while [ "x$list" != "x" ] ; do +@@ -188,7 +190,7 @@ while [ "x$list" != "x" ] ; do basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -20,17 +20,21 @@ index f5d3e78..ef59c8c 100644 alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -@@ -248,6 +250,18 @@ while [ "x$list" != "x" ] ; do +@@ -261,6 +263,22 @@ while [ "x$list" != "x" ] ; do linux_entry "${OS}" "${version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + + if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="initramfs-${version}-fallback.img" ++ initrd_real="initramfs-${version}-fallback.img" ++ initrd="${initrd_early} ${initrd_real}" + -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 -+ fi ++ initrd_display= ++ for i in ${initrd}; do ++ initrd_display="${initrd_display} ${dirname}/${i}" ++ done ++ ++ gettext_printf "Found fallback initrd image: %s\n" "$(echo $initrd_display)" >&2 + + linux_entry "${OS}" "${version}" fallback \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" @@ -39,6 +43,3 @@ index f5d3e78..ef59c8c 100644 if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ "single ${GRUB_CMDLINE_LINUX}" --- -2.9.2 - diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 1bd8b48..709fb43 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -22,7 +22,7 @@ _UNIFONT_VER="11.0.02" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' pkgver=2.02 -pkgrel=8 +pkgrel=9 epoch=2 url='https://www.gnu.org/software/grub/' arch=('x86_64') @@ -74,7 +74,7 @@ sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f' '2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646' 'a7ea9ca4f6dcb59377d978194835ede669457069256184f86d46ab5b863c56e6' 'SKIP' - 'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3' + 'd7c77d4657b336c3fe8059b9f2dbb37594aa985042ec71cfce3937da9e74005b' 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' '535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46' 'c38f2b2caae33008b35a37d8293d8bf13bf6fd779a4504925da1837fd007aeb5' @@ -110,9 +110,6 @@ _configure_options=( prepare() { cd "${srcdir}/grub-${pkgver}/" - echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." - patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch" - echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch" @@ -126,6 +123,9 @@ prepare() { echo "Patch to Support multiple early initrd images..." patch -Np1 -i "${srcdir}/0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch" + echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." + patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch" + echo "Patch to fix packed-not-aligned error on GCC 8..." patch -Np1 -i "${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"