[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)
Date: Wednesday, August 3, 2011 @ 16:29:18 Author: ronald Revision: 134432 upgpkg: grub2 1.99-4 update to new kernel naming scheme Modified: grub2/trunk/PKGBUILD grub2/trunk/archlinux_grub2_mkconfig_fixes.patch --+ PKGBUILD |4 +-- archlinux_grub2_mkconfig_fixes.patch | 44 - 2 files changed, 19 insertions(+), 29 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-08-03 20:22:14 UTC (rev 134431) +++ PKGBUILD2011-08-03 20:29:18 UTC (rev 134432) @@ -13,7 +13,7 @@ pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase="grub2" pkgver='1.99' -pkgrel=3 +pkgrel=4 url="http://www.gnu.org/software/grub/"; arch=('i686' 'x86_64') license=('GPL3') @@ -43,7 +43,7 @@ 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'e0c1a97770cc23226cf4535c029ef50b17f67974' '8bcaed545956bb33581e1b97ac96a2c3717ec793' - '2bd3673db5616ff528ede82df62023e79b86c1cc' + 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de' 'e1477db3700b27b5e5ad3d8fa43028555204759b' '8948d89537c12a4202df7c001e65a77030bbe5a3' '82a27eca5277218cf57c6c5767e0b17a72f62229' Modified: archlinux_grub2_mkconfig_fixes.patch === --- archlinux_grub2_mkconfig_fixes.patch2011-08-03 20:22:14 UTC (rev 134431) +++ archlinux_grub2_mkconfig_fixes.patch2011-08-03 20:29:18 UTC (rev 134432) @@ -1,6 +1,6 @@ diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in --- a/util/grub.d/00_header.in 2011-04-06 13:14:27.0 +0200 -+++ b/util/grub.d/00_header.in 2011-04-26 09:23:02.371574484 +0200 b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200 @@ -100,6 +100,14 @@ EOF @@ -17,8 +17,8 @@ gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in a/util/grub.d/10_linux.in 2011-04-18 23:18:49.0 +0200 -+++ b/util/grub.d/10_linux.in 2011-04-26 10:16:54.397538449 +0200 +--- a/util/grub.d/10_linux.in 2011-05-14 22:36:49.0 +0200 b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200 @@ -31,8 +31,8 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux @@ -30,15 +30,6 @@ fi # loop-AES arranges things so that /dev/loop/X can be our root device, but -@@ -48,7 +48,7 @@ - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else -- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" - fi - - if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then @@ -65,7 +65,9 @@ version="$2" recovery="$3" @@ -50,21 +41,16 @@ title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" else title="$(gettext_quoted "%s, with Linux %s")" -@@ -121,11 +123,11 @@ +@@ -132,7 +134,7 @@ case x`uname -m` in xi?86 | xx86_64) - list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz* /vmlinuz* /boot/kernel-* ; do ++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi done` ;; *) -- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi -done` ;; - esac -@@ -148,7 +150,8 @@ +@@ -160,7 +162,8 @@ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ @@ -74,21 +60,25 @@ if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -178,6 +181,11 @@ +@@ -190,6 +193,15 @@ linux_entry "${OS}" "${version}" false \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ if test -e "${dirname}/${basename/vmlinuz/kernel}-fallback.img"; then -+initrd="${basename/vmlinuz/kernel}-fallback.img" -+linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback -+ fi ++ for i in "initramfs-${version}-fallback.img" \ ++ "${basename/vmlinuz/kernel}-fallback.img"; do ++if test -e "${dirname}/${i}"; then ++ initrd="$i" ++ linux_entry "${OS}" "${version}" true \ ++"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback ++ break ++fi ++ done if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" true \ "single ${GRUB_CMDLINE_LINUX}" diff -Nur a/util/grub-m
[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)
Date: Saturday, August 27, 2011 @ 08:51:06 Author: ronald Revision: 136358 upgpkg: grub2 1:1.99-5 fix kernel detection non-official kernels Modified: grub2/trunk/PKGBUILD grub2/trunk/archlinux_grub2_mkconfig_fixes.patch --+ PKGBUILD |4 ++-- archlinux_grub2_mkconfig_fixes.patch |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-08-27 10:47:43 UTC (rev 136357) +++ PKGBUILD2011-08-27 12:51:06 UTC (rev 136358) @@ -13,7 +13,7 @@ pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase="grub2" pkgver='1.99' -pkgrel=4 +pkgrel=5 url="http://www.gnu.org/software/grub/"; arch=('i686' 'x86_64') license=('GPL3') @@ -43,7 +43,7 @@ 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'e0c1a97770cc23226cf4535c029ef50b17f67974' '8bcaed545956bb33581e1b97ac96a2c3717ec793' - 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de' + '10d915c90203a33610b19da438ae02ac4376fb74' 'e1477db3700b27b5e5ad3d8fa43028555204759b' '8948d89537c12a4202df7c001e65a77030bbe5a3' '82a27eca5277218cf57c6c5767e0b17a72f62229' Modified: archlinux_grub2_mkconfig_fixes.patch === --- archlinux_grub2_mkconfig_fixes.patch2011-08-27 10:47:43 UTC (rev 136357) +++ archlinux_grub2_mkconfig_fixes.patch2011-08-27 12:51:06 UTC (rev 136358) @@ -56,7 +56,7 @@ "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}"; do + "initramfs-genkernel-${alt_version}" \ -+ "${basename/vmlinuz/kernel}.img"; do ++ "${basename/vmlinuz/initramfs}.img" "${basename/vmlinuz/kernel}.img"; do if test -e "${dirname}/${i}" ; then initrd="$i" break @@ -65,7 +65,7 @@ linux_entry "${OS}" "${version}" false \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + for i in "initramfs-${version}-fallback.img" \ -+ "${basename/vmlinuz/kernel}-fallback.img"; do ++ "${basename/vmlinuz/initramfs}-fallback.img" "${basename/vmlinuz/kernel}-fallback.img"; do +if test -e "${dirname}/${i}"; then + initrd="$i" + linux_entry "${OS}" "${version}" true \
[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)
Date: Friday, January 28, 2011 @ 13:14:06 Author: ronald Revision: 107989 mostly ready for grub2 1.99 release Added: grub2/trunk/archlinux_grub2_mkconfig_fixes.patch Modified: grub2/trunk/PKGBUILD --+ PKGBUILD | 243 + archlinux_grub2_mkconfig_fixes.patch | 93 2 files changed, 280 insertions(+), 56 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-28 18:09:41 UTC (rev 107988) +++ PKGBUILD2011-01-28 18:14:06 UTC (rev 107989) @@ -1,75 +1,206 @@ -# $Id$ # Maintainer: Ronald van Haren -# Contributor: dongiovanni +# Contributor: Keshav P R -pkgname=grub2 -pkgver=1.98 -pkgrel=5 -pkgdesc="The GNU GRand Unified Bootloader" +# _grub2_rev=3072 + +_grub2_lua_ver=19 +_grub2_gpxe_ver=12 +_grub2_ntldr_ver=13 +_grub2_915_ver=6 + +pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') +pkgbase="grub2" +pkgver='1.99~rc1' +pkgrel=1 url="http://www.gnu.org/software/grub/"; arch=('i686' 'x86_64') license=('GPL3') -depends=('sh' 'lzo2' 'freetype2') -optdepends=('ruby:usr/share/grub/genmk.rb script' 'libusb: /sbin/grub-emu' 'gettext: /sbin/grub-mkconfig') -makedepends=('bdf-unifont' 'ruby') -backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') -conflicts=('grub') -provides=('grub') -source=(ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz - 'archlinux-script-fixes.patch' -'gfxmenu-dependencies.patch' - 'menucolors-in-mkconfig.patch' -'background-image-in-mkconfig.patch' - 'hidden-timeout-fix.patch' -'grub.default' -'grub.cfg' -'20_memtest86+' -'lvm-detection.patch') +optdepends=() +makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') +options=(strip purge docs zipman !emptydirs) +groups=('grub2') +conflicts=() +provides=() +source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz"; + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"; + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"; + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"; + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz"; + 'archlinux_grub2_mkconfig_fixes.patch' + 'grub.default' + 'grub.cfg' + '20_memtest86+' + '05_archtheme') + +noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" + "grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" + "grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" + "grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz") + + build() { - cd $srcdir/grub-${pkgver} + # set architecture dependent variables + if [ "${CARCH}" = "x86_64" ] ; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + _HOST="${CARCH}" - # some random patches to facilitate automatic creation of grub.cfg - patch -Np1 -i ${srcdir}/archlinux-script-fixes.patch - patch -Np1 -i ${srcdir}/gfxmenu-dependencies.patch - patch -Np1 -i ${srcdir}/menucolors-in-mkconfig.patch - patch -Np1 -i ${srcdir}/background-image-in-mkconfig.patch - patch -Np1 -i ${srcdir}/hidden-timeout-fix.patch - # fix lvm symlink detection - patch -Np0 -i ${srcdir}/lvm-detection.patch - # run autogen.sh to create configure files - ./autogen.sh + build_grub2-common_and_bios + build_grub2-efi +} - # fix unifont.bdf location - sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure +build_grub2-common_and_bios() { + # copy the source for building the common/bios package + cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_bios-${pkgver} + + ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs + cd ${srcdir}/grub2_bios-${pkgver} + patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch - CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \ + # add the grub-extra sources + export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ + install -d ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + bsdtar xf ${srcdir}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz \ + -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras + + ## Need to use python2 + sed -i '