[arch-commits] Commit in grub2/trunk (4 files)
Ronald van Haren
ronald at archlinux.org
Mon Dec 26 12:53:49 UTC 2011
Date: Monday, December 26, 2011 @ 07:53:49
Author: ronald
Revision: 145666
update svn snapshot, add fixes
Added:
grub2/trunk/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
grub2/trunk/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
Modified:
grub2/trunk/PKGBUILD
grub2/trunk/archlinux_grub2_mkconfig_fixes.patch
--------------------------------------------------------+
PKGBUILD | 59 +++---
archlinux_grub2_mkconfig_fixes.patch | 97 +++++++---
grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch | 15 +
grub2_automake_1.11.2_pkglib_to_pkgdata.patch | 138 +++++++++++++++
4 files changed, 258 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-26 12:35:54 UTC (rev 145665)
+++ PKGBUILD 2011-12-26 12:53:49 UTC (rev 145666)
@@ -3,32 +3,45 @@
# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly.
-# _grub2_rev=3238
+# _grub2_rev=3731
_grub2_lua_ver=20
_grub2_gpxe_ver=12
-_grub2_ntldr_ver=17
+_grub2_ntldr_ver=20
_grub2_915_ver=7
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase="grub2"
-pkgver='1.99'
+pkgver='1.99.3731'
pkgrel=5
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
epoch=1
-makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
+makedepends=('bdf-unifont' 'python' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
options=(strip purge docs zipman !emptydirs)
+sha1sums=('f26ffd213c538e3a56e30d2def8dfd3853bd45eb'
+ '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
+ 'b04994c005910b4bf123f034b30109d5c8d6fd86'
+ 'd2d6bf4af2a372aa1a3edeb5d5193084322b77a9'
+ '8bcaed545956bb33581e1b97ac96a2c3717ec793'
+ '5959f8e7efe5cd020616ff59c6a73c63e8fbea9c'
+ '16af6a7f65cdb10b7d0d0f86d5431609bc495559'
+ 'eaa7665e9cdcd330071437ca3eec1fead5f6d7b8'
+ 'e1477db3700b27b5e5ad3d8fa43028555204759b'
+ '8948d89537c12a4202df7c001e65a77030bbe5a3'
+ '82a27eca5277218cf57c6c5767e0b17a72f62229'
+ 'beb31419045db70fee7401aa6448c220a491e2a3')
# "http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz"
+source=("ftp://ftp.archlinux.org/other/grub2/${pkgbase}-${pkgver}.tar.xz"
"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'
+ 'grub2_automake_1.11.2_pkglib_to_pkgdata.patch'
+ 'grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch'
+ 'archlinux_grub2_mkconfig_fixes.patch' 'grub.default'
'grub.cfg'
'20_memtest86+'
'grub2_bzr_export.sh')
@@ -38,16 +51,6 @@
"grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz")
-sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
- '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
- 'b04994c005910b4bf123f034b30109d5c8d6fd86'
- 'e0c1a97770cc23226cf4535c029ef50b17f67974'
- '8bcaed545956bb33581e1b97ac96a2c3717ec793'
- '10d915c90203a33610b19da438ae02ac4376fb74'
- 'e1477db3700b27b5e5ad3d8fa43028555204759b'
- '8948d89537c12a4202df7c001e65a77030bbe5a3'
- '82a27eca5277218cf57c6c5767e0b17a72f62229'
- 'beb31419045db70fee7401aa6448c220a491e2a3')
build() {
# set architecture dependent variables
@@ -70,6 +73,13 @@
cd ${srcdir}/grub2_bios-${pkgver}
patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch
+ ## Fix automake 1.11.2 autogen.sh pkglib_DATA and pkglib_SCRIPTS error
+ patch -Np1 -i "${srcdir}/grub2_automake_1.11.2_pkglib_to_pkgdata.patch"
+
+ ## Use outside GRUB_PREFIX if defined, patch submitted upstream to grub-devel ML
+ ## solves https://bugs.archlinux.org/task/26430 and https://bugs.archlinux.org/task/26463
+ patch -Np1 -i "${srcdir}/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch"
+
# add the grub-extra sources
export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/
install -d ${srcdir}/grub2_bios-${pkgver}/grub2-extras
@@ -82,9 +92,6 @@
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 's|python|python2|' ${srcdir}/grub2_bios-${pkgver}/autogen.sh
-
# start the actual build process
cd ${srcdir}/grub2_bios-${pkgver}
./autogen.sh
@@ -92,9 +99,6 @@
## fix unifont.bdf location so grub-mkfont can create *.pf2 files
sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' ${srcdir}/grub2_bios-${pkgver}/configure
-# mkdir ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
-# cd ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
-
CFLAGS="" ./configure \
--with-platform=pc --enable-mm-debug \
${_EFIEMU} --host=${CARCH}-unknown-linux-gnu \
@@ -129,10 +133,11 @@
--with-platform=efi --target=i386 \
--enable-mm-debug --disable-efiemu \
--host=${CARCH}-unknown-linux-gnu \
- --prefix=/usr --bindir=/bin \
- --sbindir=/sbin --mandir=/usr/share/man \
- --infodir=/usr/share/info --sysconfdir=/etc \
- --enable-nls --program-transform-name=s,grub,grub,
+ --prefix="/usr" --bindir="/usr/bin" --sbindir="/usr/sbin" \
+ --mandir="/usr/share/man" --infodir="/usr/share/info" \
+ --datadir="/usr/lib" --datarootdir="/usr/share" \
+ --sysconfdir="/etc" --program-prefix="" \
+ --enable-nls
CFLAGS="" make
}
Modified: archlinux_grub2_mkconfig_fixes.patch
===================================================================
--- archlinux_grub2_mkconfig_fixes.patch 2011-12-26 12:35:54 UTC (rev 145665)
+++ archlinux_grub2_mkconfig_fixes.patch 2011-12-26 12:53:49 UTC (rev 145666)
@@ -1,8 +1,31 @@
-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.000000000 +0200
-+++ b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200
-@@ -100,6 +100,14 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index c408ccc..95424e9 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -36,7 +36,7 @@ grub_mkconfig_dir=${sysconfdir}/grub.d
+ self=`basename $0`
+
+-grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
++grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
+ grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
+
+ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
+@@ -241,6 +241,8 @@ export GRUB_DEFAULT \
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT \
+ GRUB_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 54012f8..d7e982b 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -100,6 +100,14 @@ cat <<EOF
+
EOF
+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
@@ -16,10 +39,11 @@
serial=0;
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-05-14 22:36:49.000000000 +0200
-+++ b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200
-@@ -31,8 +31,8 @@
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index fe4f0e7..46bd092 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -32,8 +32,8 @@ CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
@@ -30,7 +54,16 @@
fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but
-@@ -65,7 +65,9 @@
+@@ -49,7 +49,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue"
+ || 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
+@@ -66,7 +66,9 @@ linux_entry ()
version="$2"
recovery="$3"
args="$4"
@@ -41,7 +74,17 @@
title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
else
title="$(gettext_quoted "%s, with Linux %s")"
-@@ -132,7 +134,7 @@
+@@ -114,7 +116,9 @@ EOF
+ fi
+ printf '%s\n' "${prepare_boot_cache}"
+ fi
++
+ message="$(gettext_printf "Loading Linux %s ..." ${version})"
++
+ cat << EOF
+ echo '$message'
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+@@ -133,11 +137,11 @@ EOF
case x`uname -m` in
xi?86 | xx86_64)
@@ -50,7 +93,24 @@
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;;
*)
-@@ -160,7 +162,8 @@
+- 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
+@@ -152,16 +156,19 @@ while [ "x$list" != "x" ] ; do
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+ version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+- alt_version=`echo $version | sed -e "s,\.old$,,g"`
++ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
++ alt_version="${base_init}-fallback"
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+ initrd=
++
+ for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+ "initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \
@@ -60,7 +120,7 @@
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
-@@ -190,6 +193,15 @@
+@@ -191,6 +198,16 @@ while [ "x$list" != "x" ] ; do
linux_entry "${OS}" "${version}" false \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
@@ -73,18 +133,7 @@
+ break
+ fi
+ done
++
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" true \
"single ${GRUB_CMDLINE_LINUX}"
-diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
---- a/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200
-+++ b/util/grub-mkconfig.in 2011-08-01 15:20:49.256867648 +0200
-@@ -252,6 +252,8 @@
- GRUB_THEME \
- GRUB_GFXPAYLOAD_LINUX \
- GRUB_DISABLE_OS_PROBER \
-+ GRUB_COLOR_NORMAL \
-+ GRUB_COLOR_HIGHLIGHT \
- GRUB_INIT_TUNE \
- GRUB_SAVEDEFAULT \
- GRUB_BADRAM
Added: grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
===================================================================
--- grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch (rev 0)
+++ grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch 2011-12-26 12:53:49 UTC (rev 145666)
@@ -0,0 +1,15 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index c408ccc..5be8f78 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -39,7 +39,9 @@ self=`basename $0`
+ grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
+ grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
+
+-GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
++if test -z "${GRUB_PREFIX}"; then
++ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
++fi
+
+ # Usage: usage
+ # Print the usage.
Added: grub2_automake_1.11.2_pkglib_to_pkgdata.patch
===================================================================
--- grub2_automake_1.11.2_pkglib_to_pkgdata.patch (rev 0)
+++ grub2_automake_1.11.2_pkglib_to_pkgdata.patch 2011-12-26 12:53:49 UTC (rev 145666)
@@ -0,0 +1,138 @@
+diff --git a/ChangeLog b/ChangeLog
+index 016056a..cf5d822 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,17 @@
++2011-12-24 Keshav P R <the.ridikulus.rat at gmail.com>
++
++ Fixes for automake 1.11.2
++
++ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS.
++ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA.
++ * Makefile.am: Likewise.
++ * gentpl.py: Likewise.
++ * util/grub-mkstandalone.in: Likewise.
++ * util/grub-mknetdir.in: Likewise.
++ * util/grub-mkrescue.in: Likewise.
++ * util/grub-mkstandalone.in: Likewise.
++
++
+ 2011-12-24 Vladimir Serbinenko <phcoder at gmail.com>
+
+ Integrate hints into autogeneration scripts.
+diff --git a/Makefile.am b/Makefile.am
+index c5f486e..395b0dd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
+ # Install config.h into platformdir
+ platform_HEADERS = config.h
+
+-pkglib_DATA += grub-mkconfig_lib
+-pkglib_DATA += update-grub_lib
++pkgdata_DATA += grub-mkconfig_lib
++pkgdata_DATA += update-grub_lib
+
+
+ if COND_i386_coreboot
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 751188b..bbd59cc 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
+
+ man_MANS =
+ noinst_DATA =
+-pkglib_DATA =
++pkgdata_DATA =
+ bin_SCRIPTS =
+ sbin_SCRIPTS =
+ bin_PROGRAMS =
+@@ -147,7 +147,7 @@ check_SCRIPTS =
+ grubconf_DATA =
+ check_PROGRAMS =
+ noinst_SCRIPTS =
+-pkglib_SCRIPTS =
++pkgdata_SCRIPTS =
+ noinst_PROGRAMS =
+ grubconf_SCRIPTS =
+ noinst_LIBRARIES =
+diff --git a/gentpl.py b/gentpl.py
+index 3008b80..a935f4d 100644
+--- a/gentpl.py
++++ b/gentpl.py
+@@ -512,7 +512,7 @@ def script(platform):
+ r += "[+ ENDIF +]"
+
+ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
+-$(top_builddir)/config.status --file=-:$< | sed -e 's, at pkglib_DATA@,$(pkglib_DATA),g' > $@
++$(top_builddir)/config.status --file=-:$< | sed -e 's, at pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+ """)
+
+diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
+index e5a2172..7f6a36d 100644
+--- a/util/grub-mknetdir.in
++++ b/util/grub-mknetdir.in
+@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
+ host_os=@host_os@
+ localedir=@datadir@/locale
+ datarootdir=@datarootdir@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -183,7 +183,7 @@ process_input_dir ()
+ cp -f "$file" "$grubdir/"
+ fi
+ done
+- for file in ${pkglib_DATA}; do
++ for file in ${pkgdata_DATA}; do
+ if test -f "${input_dir}/${file}"; then
+ cp -f "${input_dir}/${file}" "$grubdir/"
+ fi
+diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
+index eff7708..f6b96d4 100644
+--- a/util/grub-mkrescue.in
++++ b/util/grub-mkrescue.in
+@@ -27,7 +27,7 @@ libdir=@libdir@
+ PACKAGE_NAME=@PACKAGE_NAME@
+ PACKAGE_TARNAME=@PACKAGE_TARNAME@
+ PACKAGE_VERSION=@PACKAGE_VERSION@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -163,7 +163,7 @@ process_input_dir ()
+ cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
+ fi
+ done
+- for file in ${pkglib_DATA}; do
++ for file in ${pkgdata_DATA}; do
+ if test -f "${input_dir}/${file}"; then
+ cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
+ fi
+diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
+index b0dbf9b..92b7306 100644
+--- a/util/grub-mkstandalone.in
++++ b/util/grub-mkstandalone.in
+@@ -27,7 +27,7 @@ libdir=@libdir@
+ PACKAGE_NAME=@PACKAGE_NAME@
+ PACKAGE_TARNAME=@PACKAGE_TARNAME@
+ PACKAGE_VERSION=@PACKAGE_VERSION@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
+ fi
+ done
+
+-for file in ${pkglib_DATA}; do
++for file in ${pkgdata_DATA}; do
+ if test -f "${source_directory}/${file}"; then
+ cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
+ fi
More information about the arch-commits
mailing list