[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-06-24 Thread Ronald van Haren 
Date: Sunday, June 24, 2012 @ 16:38:18
  Author: ronald
Revision: 162305

upgpkg: grub2 1:2.00rc1-1

update to 2.00rc1

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-24 20:02:02 UTC (rev 162304)
+++ PKGBUILD2012-06-24 20:38:18 UTC (rev 162305)
@@ -1,17 +1,15 @@
 # Maintainer: Ronald van Haren ronald.archlinux.org
 # Contributor: Keshav P R (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) 
(ccoomm)
 
-_grub_bzr_rev=4232
-_pkgver=2.00~beta6
+_pkgver=2.00~rc1
 
 _grub_lua_ver=24
-_grub_gpxe_ver=12
 _grub_ntldr_ver=21
 _grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta6
+pkgver=2.00rc1
 pkgrel=1
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
@@ -23,7 +21,6 @@
 # source=(ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz;
 source=(http://alpha.gnu.org/gnu/grub/grub-${_pkgver}.tar.xz
 
ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz;
-
ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz;
 
ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz;
 
ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz;
 'archlinux_grub_mkconfig_fixes.patch'
@@ -32,13 +29,11 @@
 '20_memtest86+')
 
 noextract=(grub2_extras_lua_r${_grub_lua_ver}.tar.xz
-   grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz
grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub_915_ver}.tar.xz)
 
-sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb'
+sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
   '89290031b974780c6df76893836d2477d4add895'
-  'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
   'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
   '26e4e946190bea1f03632658cf08ba90e11dec57'
@@ -63,9 +58,6 @@
bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz \
-C ${srcdir}/grub_bios-${_pkgver}/grub-extras
 
-   bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz \
-   -C ${srcdir}/grub_bios-${_pkgver}/grub-extras
-
bsdtar xf ${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz 
\
-C ${srcdir}/grub_bios-${_pkgver}/grub-extras
 
@@ -124,9 +116,6 @@
bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz \
-C ${srcdir}/grub_efi-${_pkgver}/grub-extras
 
-   bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz \
-   -C ${srcdir}/grub_efi-${_pkgver}/grub-extras
-
## Requires python2
# sed 's|python |python2 |g' -i 
${srcdir}/grub_efi-${_pkgver}/autogen.sh

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-06-17 Thread Ronald van Haren 
Date: Sunday, June 17, 2012 @ 12:44:47
  Author: ronald
Revision: 161964

upgpkg: grub2 1:2.00beta6-1

update to 2.00beta6

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-17 15:31:49 UTC (rev 161963)
+++ PKGBUILD2012-06-17 16:44:47 UTC (rev 161964)
@@ -2,7 +2,7 @@
 # Contributor: Keshav P R (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) 
(ccoomm)
 
 _grub_bzr_rev=4232
-_pkgver=2.00~beta4
+_pkgver=2.00~beta6
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
@@ -11,7 +11,7 @@
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta4
+pkgver=2.00beta6
 pkgrel=1
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
@@ -29,15 +29,14 @@
 'archlinux_grub_mkconfig_fixes.patch'
 'grub.default'
 'grub.cfg'
-'20_memtest86+'
-'grub-install.fix')
+'20_memtest86+')
 
 noextract=(grub2_extras_lua_r${_grub_lua_ver}.tar.xz
grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz
grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub_915_ver}.tar.xz)
 
-sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
+sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb'
   '89290031b974780c6df76893836d2477d4add895'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
@@ -45,8 +44,8 @@
   '26e4e946190bea1f03632658cf08ba90e11dec57'
   'a76b251b110c9c2d49d2340e4ae932db13ad75bd'
   'fd422806c87905f9cabe1f0dc13e544e5fc09e53'
-  'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
-  '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
+  'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
+
 _build_grub2-common_and_bios() {
 
## copy the source for building the common/bios package
@@ -57,10 +56,6 @@
patch -Np1 -i ${srcdir}/archlinux_grub_mkconfig_fixes.patch
echo
 
-   ## upstream grub-install fix 
-   ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
-   patch -Np0 -i ${srcdir}/grub-install.fix
-   
## add the grub-extra sources
export GRUB_CONTRIB=${srcdir}/grub_bios-${_pkgver}/grub-extras/
install -d ${srcdir}/grub_bios-${_pkgver}/grub-extras

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-05-12 Thread Eric Bélanger 
Date: Saturday, May 12, 2012 @ 21:55:58
  Author: eric
Revision: 158910

Update bash_completion files locations

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-13 01:01:55 UTC (rev 158909)
+++ PKGBUILD2012-05-13 01:55:58 UTC (rev 158910)
@@ -203,7 +203,7 @@
options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
 
cd ${srcdir}/grub_bios-${_pkgver}
-   make DESTDIR=${pkgdir}/ install
+   make bashcompletiondir=/usr/share/bash-completion/completions 
DESTDIR=${pkgdir}/ install
 
## install extra /etc/grub.d/ files
install -D -m0755 ${srcdir}/20_memtest86+ 
${pkgdir}/etc/grub.d/20_memtest86+

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-04-02 Thread Ronald van Haren 
Date: Monday, April 2, 2012 @ 13:14:04
  Author: ronald
Revision: 155376

upgpkg: grub2 1:2.00beta3-1

upstream update to 2.00beta3

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-02 16:12:53 UTC (rev 155375)
+++ PKGBUILD2012-04-02 17:14:04 UTC (rev 155376)
@@ -2,7 +2,7 @@
 # Contributor: Keshav P R (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) 
(ccoomm)
 
 _grub_bzr_rev=4169
-_pkgver=2.00~beta2
+_pkgver=2.00~beta3
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
@@ -11,8 +11,8 @@
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta2
-pkgrel=3
+pkgver=2.00beta3
+pkgrel=1
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -36,7 +36,7 @@
grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub_915_ver}.tar.xz)
 
-sha1sums=('2ba583f9466fb676b0ae3d7a9a82d1299b153a98'
+sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2'
   '89290031b974780c6df76893836d2477d4add895'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'

[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub_mkconfig_fixes.patch)

2012-03-29 Thread Ronald van Haren 
Date: Thursday, March 29, 2012 @ 14:34:35
  Author: ronald
Revision: 154513

upgpkg: grub2 1:2.00beta2-3

FS#29037

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/archlinux_grub_mkconfig_fixes.patch

-+
 PKGBUILD|4 ++--
 archlinux_grub_mkconfig_fixes.patch |   33 +
 2 files changed, 19 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-29 18:07:25 UTC (rev 154512)
+++ PKGBUILD2012-03-29 18:34:35 UTC (rev 154513)
@@ -12,7 +12,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver=2.00beta2
-pkgrel=2
+pkgrel=3
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -41,7 +41,7 @@
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
   'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
-  '3323e6167878ee123ebc0c63c6880df95c5604cc'
+  'cdace8067562fab04aaacac8d99a4ea612fa0c5b'
   'a76b251b110c9c2d49d2340e4ae932db13ad75bd'
   'fd422806c87905f9cabe1f0dc13e544e5fc09e53'
   'ce35d7ae75cd1b5b677e894e528f96add40e77b9')

Modified: archlinux_grub_mkconfig_fixes.patch
===
--- archlinux_grub_mkconfig_fixes.patch 2012-03-29 18:07:25 UTC (rev 154512)
+++ archlinux_grub_mkconfig_fixes.patch 2012-03-29 18:34:35 UTC (rev 154513)
@@ -31,7 +31,7 @@
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 8c75fab..0e00d19 100644
+index 8c75fab..0d4a137 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -87,6 +87,8 @@ linux_entry ()
@@ -62,24 +62,25 @@
sed s/^/$submenu_indentation/  EOF
echo'$message'
linux   ${rel_dirname}/${basename} 
root=${linux_root_device_thisversion} ro ${args}
-@@ -181,13 +184,28 @@ while [ x$list != x ] ; do
+@@ -181,13 +184,29 @@ while [ x$list != x ] ; do
alt_version=`echo $version | sed -e s,\.old$,,g`
linux_root_device_thisversion=${LINUX_ROOT_DEVICE}
  
-+  if [[ $(grep Arch Linux /etc/os-release) ]]; then
-+if [[ $(echo ${basename} | grep vmlinuz-linux) ]]; then
-+  version=$(echo ${basename} | sed -e s,vmlinuz-linux,,g)
++  if test -e /etc/arch-release ; then
++if echo ${basename} | grep -q 'vmlinuz-linux' ; then
++  version=`echo ${basename} | sed -e 's,vmlinuz-linux,,g'`
 +  
-+  if [[ ${version} ==  ]]; then
++  if [ x${version} = x ] ; then
 +version=core repo kernel
 +  else
-+version=$(echo ${version} | sed -e s,-,,g)
++version=`echo ${version} | sed -e 's,-,,g'`
 +version=${version} kernel
 +  fi
 +fi
 +  fi
 +  
initrd=
++  initrd_arch=`echo ${basename} | sed -e 's,vmlinuz,initramfs,g'`
 +
for i in initrd.img-${version} initrd-${version}.img 
initrd-${version}.gz \
   initrd-${version} initramfs-${version}.img \
@@ -88,22 +89,22 @@
   initramfs-genkernel-${version} \
 - initramfs-genkernel-${alt_version}; do
 + initramfs-genkernel-${alt_version} \
-+ ${basename/vmlinuz/initramfs}.img; do
++ ${initrd_arch}.img ; do
  if test -e ${dirname}/${i} ; then
initrd=$i
break
-@@ -215,6 +233,22 @@ while [ x$list != x ] ; do
+@@ -215,6 +234,22 @@ while [ x$list != x ] ; do
  linux_root_device_thisversion=${GRUB_DEVICE}
fi
  
-+  if [[ $(grep Arch Linux /etc/os-release) ]]; then
++  if test -e /etc/arch-release ; then
 +is_first_entry=false
 +
 +linux_entry ${OS} ${version} true \
 +  ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
 +
-+for i in ${basename/vmlinuz/initramfs}-fallback.img 
initramfs-${version}-fallback.img ; do
-+  if test -e ${dirname}/${i}; then
++for i in ${initrd_arch}-fallback.img 
initramfs-${version}-fallback.img ; do
++  if test -e ${dirname}/${i} ; then
 +initrd=${i}
 +linux_entry ${OS} ${version} fallback \
 +${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
@@ -115,11 +116,11 @@
if [ x$is_first_entry = xtrue ]; then
  linux_entry ${OS} ${version} simple \
  ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
-@@ -228,8 +262,11 @@ while [ x$list != x ] ; do
+@@ -228,8 +263,11 @@ while [ x$list != x ] ; do
  echo submenu '$(gettext_printf Advanced options for %s ${OS} | 
grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {
fi
  
-+  if [[ ! $(grep Arch Linux /etc/os-release) ]]; then
++  if ! test -e /etc/arch-release ; then
linux_entry ${OS} ${version} advanced \
${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
 +  fi
@@ -127,11 +128,11 @@
if [ x${GRUB_DISABLE_RECOVERY} != xtrue ]; then
  linux_entry ${OS} ${version}

[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub_mkconfig_fixes.patch)

2012-03-21 Thread Ronald van Haren 
Date: Wednesday, March 21, 2012 @ 04:05:34
  Author: ronald
Revision: 153983

upgpkg: grub 1:2.00beta2-2

FS#25453

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/archlinux_grub_mkconfig_fixes.patch

-+
 PKGBUILD|   30 ++-
 archlinux_grub_mkconfig_fixes.patch |  128 ++
 2 files changed, 95 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-21 07:47:25 UTC (rev 153982)
+++ PKGBUILD2012-03-21 08:05:34 UTC (rev 153983)
@@ -1,24 +1,24 @@
 # Maintainer: Ronald van Haren ronald.archlinux.org
 # Contributor: Keshav P R (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) 
(ccoomm)
 
-_grub_bzr_rev=4174
+_grub_bzr_rev=4169
 _pkgver=2.00~beta2
 
-_grub_lua_ver=23
-_grub_gpxe_ver=12
-_grub_ntldr_ver=21
-_grub_915_ver=9
+_grub_lua_ver=24
+_grub_gpxe_ver=12
+_grub_ntldr_ver=21
+_grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
-pkgbase=grub2
-pkgver=2.00beta2
-pkgrel=1
+pkgbase=grub
+pkgver=2.00beta2
+pkgrel=2
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
 epoch=1
 makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo'
-   'help2man' 'gettext' 'device-mapper' 'fuse')
+   'help2man' 'gettext' 'device-mapper' 'fuse' 'dosfstools' 'efibootmgr')
 
 # source=(ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz;
 source=(http://alpha.gnu.org/gnu/grub/grub-${_pkgver}.tar.xz
@@ -27,7 +27,6 @@
 
ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz;
 
ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz;
 'archlinux_grub_mkconfig_fixes.patch'
-'grub_extras_lua_args_fix.patch'
 'grub.default'
 'grub.cfg'
 '20_memtest86+')
@@ -38,12 +37,11 @@
grub2_extras_915resolution_r${_grub_915_ver}.tar.xz)
 
 sha1sums=('2ba583f9466fb676b0ae3d7a9a82d1299b153a98'
-  'a09a4cbfd2f23699028ecd09c397bdc1bebf16aa'
+  '89290031b974780c6df76893836d2477d4add895'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
   'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
-  'e29559b3b97b773386364d8f99334ca0c60ee98a'
-  'f7d4014d71aa2e693c57920b504f64bc792217ef'
+  '3323e6167878ee123ebc0c63c6880df95c5604cc'
   'a76b251b110c9c2d49d2340e4ae932db13ad75bd'
   'fd422806c87905f9cabe1f0dc13e544e5fc09e53'
   'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
@@ -74,9 +72,6 @@
bsdtar xf 
${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz \
-C ${srcdir}/grub_bios-${_pkgver}/grub-extras
 
-   ## Fix args lua grub-extras
-   patch -Np1 -i ${srcdir}/grub_extras_lua_args_fix.patch
-
## Requires python2
# sed 's|python |python2 |g' -i 
${srcdir}/grub_bios-${_pkgver}/autogen.sh
 
@@ -132,9 +127,6 @@
bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz \
-C ${srcdir}/grub_efi-${_pkgver}/grub-extras
 
-   ## Fix args lua grub-extras
-   patch -Np1 -i ${srcdir}/grub_extras_lua_args_fix.patch
-
## Requires python2
# sed 's|python |python2 |g' -i 
${srcdir}/grub_efi-${_pkgver}/autogen.sh
 

Modified: archlinux_grub_mkconfig_fixes.patch
===
--- archlinux_grub_mkconfig_fixes.patch 2012-03-21 07:47:25 UTC (rev 153982)
+++ archlinux_grub_mkconfig_fixes.patch 2012-03-21 08:05:34 UTC (rev 153983)
@@ -31,60 +31,54 @@
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 8c75fab..62e87e1 100644
+index 8c75fab..0e00d19 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,8 +31,8 @@ CLASS=--class gnu-linux --class gnu --class os
- if [ x${GRUB_DISTRIBUTOR} = x ] ; then
-   OS=GNU/Linux
- else
--  OS=${GRUB_DISTRIBUTOR} GNU/Linux
--  CLASS=--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) 
${CLASS}
-+  OS=${GRUB_DISTRIBUTOR}
-+  CLASS=--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') 
${CLASS}
- fi
+@@ -87,6 +87,8 @@ linux_entry ()
+   case $type in
+ recovery)
+ title=$(gettext_printf %s, with Linux %s (recovery mode) 
${os} ${version}) ;;
++fallback)
++title=$(gettext_printf %s, with Linux %s (Fallback initramfs) 
${os} ${version}) ;;
+ *)
+ title=$(gettext_printf %s, with Linux %s ${os} 
${version}) ;;
+   esac
+@@ -100,7 +102,7 @@ linux_entry ()
+   else
+   echo menuentry '$(echo $os | grub_quote)' ${CLASS} 
\$menuentry_id_option 'gnulinux-simple-$boot_device_id' { | sed 
s/^/$submenu_indentation/
+   fi  
+-  if [ x$type != xrecovery ] ; then
++  if [

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-03-21 Thread Ronald van Haren 
Date: Wednesday, March 21, 2012 @ 05:16:45
  Author: ronald
Revision: 153999

wrong pkgname

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-21 09:16:33 UTC (rev 153998)
+++ PKGBUILD2012-03-21 09:16:45 UTC (rev 153999)
@@ -10,7 +10,7 @@
 _grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
-pkgbase=grub
+pkgbase=grub2
 pkgver=2.00beta2
 pkgrel=2
 url=http://www.gnu.org/software/grub/;

[arch-commits] Commit in grub2/trunk (PKGBUILD grub2.install grub2_bzr_export.sh)

2012-01-15 Thread Ronald van Haren 
Date: Sunday, January 15, 2012 @ 05:19:02
  Author: ronald
Revision: 146645

upgpkg: grub2 1:1.99-6

update to current bzr checkout; cleanup PKGBUILD; add message to install file 
that grub-mkconfig may fail on some custom kernels; thanks Keshav

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/grub2.install
  grub2/trunk/grub2_bzr_export.sh

-+
 PKGBUILD|  151 --
 grub2.install   |6 +
 grub2_bzr_export.sh |   96 +--
 3 files changed, 133 insertions(+), 120 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-15 10:18:40 UTC (rev 146644)
+++ PKGBUILD2012-01-15 10:19:02 UTC (rev 146645)
@@ -1,7 +1,7 @@
 # Maintainer: Ronald van Haren ronald.archlinux.org
 # Contributor: Keshav P R (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) 
(ccoomm)
 
-_grub2_rev=3732
+_grub2_rev=3750
 
 _grub2_lua_ver=20
 _grub2_gpxe_ver=12
@@ -16,16 +16,15 @@
 arch=('i686' 'x86_64')
 license=('GPL3')
 epoch=1
-makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo' 
-   'help2man' 'gettext' 'device-mapper' 'fuse' 
-   'efibootmgr' 'dosfstools')
+makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo'
+   'help2man' 'gettext' 'device-mapper' 'fuse')
 
 # source=(ftp://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
-source=(ftp://ftp.archlinux.org/other/grub2/grub2_r${_grub2_rev}.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;
+source=(ftp://ftp.archlinux.org/other/grub2/grub2_r${_grub2_rev}.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;
 'grub2_automake_1.11.2_pkglib_to_pkgdata.patch'
 'grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch'
 'archlinux_grub2_mkconfig_fixes.patch'
@@ -39,7 +38,7 @@
grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz)
 
-sha1sums=('3c52ea32bdd83fb7b5d3c408249672e7bc44fa03'
+sha1sums=('3fab3260a11756f2cfc39f13279a2a633b814d31'
   '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'd2d6bf4af2a372aa1a3edeb5d5193084322b77a9'
@@ -50,63 +49,64 @@
   'e1477db3700b27b5e5ad3d8fa43028555204759b'
   '8948d89537c12a4202df7c001e65a77030bbe5a3'
   '82a27eca5277218cf57c6c5767e0b17a72f62229'
-  'beb31419045db70fee7401aa6448c220a491e2a3')
-  
+  'b872ab94f506ea0d1587ebc3ef7d3d1d3652be7c')
+
 _build_grub2-common_and_bios() {
-   
+
## copy the source for building the common/bios package
cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_bios-${pkgver}
cd ${srcdir}/grub2_bios-${pkgver}
-   
+
## 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
-   
+
## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch 
kernels and initramfs
patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch
echo
-   
+
## 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
-   
+
## ntldr-img compile fails - disable for now
# 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
-   
+
## The below

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-01-09 Thread Ronald van Haren 
Date: Monday, January 9, 2012 @ 14:31:46
  Author: ronald
Revision: 146366

mv instead of copying with install...

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-09 19:01:56 UTC (rev 146365)
+++ PKGBUILD2012-01-09 19:31:46 UTC (rev 146366)
@@ -262,8 +262,8 @@

# move grub2 fonts from /usr/lib/grub to /usr/share/grub - incorrect 
path due to grub2_automake_1.11.2_pkglib_to_pkgdata.patch
install -d ${pkgdir}/usr/share/grub
-   install -Dm644 ${pkgdir}/usr/lib/grub/{ascii,euro,unicode}.pf2 
${pkgdir}/usr/share/grub/
-   install -Dm644 ${pkgdir}/usr/lib/grub/{ascii,widthspec}.h 
${pkgdir}/usr/share/grub/
+   mv -f ${pkgdir}/usr/lib/grub/{ascii,euro,unicode}.pf2 
${pkgdir}/usr/share/grub/
+   mv -f ${pkgdir}/usr/lib/grub/{ascii,widthspec}.h 
${pkgdir}/usr/share/grub/

 }

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2012-01-08 Thread Ronald van Haren 
Date: Sunday, January 8, 2012 @ 06:39:26
  Author: ronald
Revision: 146287

fix some small stuff in PKGBUILD

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-08 09:53:08 UTC (rev 146286)
+++ PKGBUILD2012-01-08 11:39:26 UTC (rev 146287)
@@ -16,7 +16,9 @@
 arch=('i686' 'x86_64')
 license=('GPL3')
 epoch=1
-makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo' 
'help2man' 'gettext' 'device-mapper' 'fuse')
+makedepends=('rsync' 'xz' 'bdf-unifont' 'python2' 'autogen' 'texinfo' 
+   'help2man' 'gettext' 'device-mapper' 'fuse' 
+   'efibootmgr' 'dosfstools')
 
 # source=(ftp://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
 source=(ftp://ftp.archlinux.org/other/grub2/grub2_r${_grub2_rev}.tar.xz;
@@ -28,8 +30,7 @@
 'grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch'
 'archlinux_grub2_mkconfig_fixes.patch'
 'grub.default'
-'grub.cfg.bios.example'
-'grub.cfg.uefi.example'
+'grub.cfg'
 '20_memtest86+'
 'grub2_bzr_export.sh')
 
@@ -41,17 +42,16 @@
 sha1sums=('3c52ea32bdd83fb7b5d3c408249672e7bc44fa03'
   '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
-  '0ea5456711b08145f806ce58c91f21268c621b40'
+  'd2d6bf4af2a372aa1a3edeb5d5193084322b77a9'
   '8bcaed545956bb33581e1b97ac96a2c3717ec793'
   'e149c8f14a74a9c367852a1615e68758f2c71d29'
   '16af6a7f65cdb10b7d0d0f86d5431609bc495559'
   'eaa7665e9cdcd330071437ca3eec1fead5f6d7b8'
   'e1477db3700b27b5e5ad3d8fa43028555204759b'
-  'd26852723029b5aebc5fb0903cad0b6da1330359'
-  'ac323353ed69b8824c40be8dbb1ce3e057df3913'
+  '8948d89537c12a4202df7c001e65a77030bbe5a3'
   '82a27eca5277218cf57c6c5767e0b17a72f62229'
-  'b872ab94f506ea0d1587ebc3ef7d3d1d3652be7c')
-
+  'beb31419045db70fee7401aa6448c220a491e2a3')
+  
 _build_grub2-common_and_bios() {

## copy the source for building the common/bios package
@@ -255,22 +255,22 @@
install -D -m0644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub

## install grub.cfg (needed so it doesn't get removed on upgrading 
because it was previously here)
-   install -D -m0644 ${srcdir}/grub.cfg.bios.example 
${pkgdir}/boot/grub/grub.cfg
-   install -D -m0644 ${srcdir}/grub.cfg.uefi.example 
${pkgdir}/usr/share/grub/grub.cfg.uefi.example
+   install -D -m0644 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg

# remove platform specific files
rm -rf ${pkgdir}/usr/lib/grub/i386-pc/

# move grub2 fonts from /usr/lib/grub to /usr/share/grub - incorrect 
path due to grub2_automake_1.11.2_pkglib_to_pkgdata.patch
-   mv ${pkgdir}/usr/lib/grub/{ascii,euro,unicode}.pf2 
${pkgdir}/usr/share/grub/
-   mv ${pkgdir}/usr/lib/grub/{ascii,widthspec}.h 
${pkgdir}/usr/share/grub/
+   install -d ${pkgdir}/usr/share/grub
+   install -Dm644 ${pkgdir}/usr/lib/grub/{ascii,euro,unicode}.pf2 
${pkgdir}/usr/share/grub/
+   install -Dm644 ${pkgdir}/usr/lib/grub/{ascii,widthspec}.h 
${pkgdir}/usr/share/grub/

 }
 
 package_grub2-bios() {

pkgdesc=The GNU GRand Unified Bootloader version 2 - Built for i386 PC 
BIOS
-   depends=(grub2-common=${epoch}:${pkgver})
+   depends=(grub2-common=${epoch}:${pkgver} sh)
optdepends=('os-prober: to detect other OSes when generating grub.cfg 
in BIOS systems')
replaces=('grub2')
provides=('grub2')

[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)

2011-08-27 Thread Ronald van Haren 
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)

2011-08-03 Thread Ronald van Haren 
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-mkconfig.in b/util/grub-mkconfig.in
 --- a/util/grub-mkconfig.in2011-04-06

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-06-13 Thread Ronald van Haren 
Date: Monday, June 13, 2011 @ 03:11:04
  Author: ronald
Revision: 127335

upgpkg: grub2 1.99-3
add epoch information in depends array FS#24610

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-13 05:59:31 UTC (rev 127334)
+++ PKGBUILD2011-06-13 07:11:04 UTC (rev 127335)
@@ -13,7 +13,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver='1.99'
-pkgrel=2
+pkgrel=3
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -176,7 +176,7 @@
 
 package_grub2-bios() {
pkgdesc=The GNU GRand Unified Bootloader version 2 - Built for PC BIOS
-   depends=(grub2-common=${pkgver})
+   depends=(grub2-common=${epoch}:${pkgver})
replaces=('grub2')
provides=('grub2')
   
@@ -191,7 +191,7 @@
 package_grub2-efi-i386() {
 
pkgdesc=The GNU GRand Unified Bootloader version 2 - i386 UEFI version
-   depends=(grub2-common=${pkgver} 'dosfstools' 'efibootmgr')
+   depends=(grub2-common=${epoch}:${pkgver} 'dosfstools' 'efibootmgr')
optdepends=('mtools')
   
cd ${srcdir}/grub2_efi-${pkgver}

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-06-12 Thread Ronald van Haren 
Date: Sunday, June 12, 2011 @ 05:18:46
  Author: ronald
Revision: 127279

upgpkg: grub2 1.99-1
update to 1.99 final

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 09:05:00 UTC (rev 127278)
+++ PKGBUILD2011-06-12 09:18:46 UTC (rev 127279)
@@ -12,7 +12,7 @@
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver='1.99~rc2.r3238'
+pkgver='1.99'
 pkgrel=1
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@
 options=(strip purge docs zipman !emptydirs)
 
 #  http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
-source=(ftp://ftp.archlinux.org/other/grub2/grub-${pkgver}.tar.xz;
+source=(ftp://ftp.gnu.org/gnu/grub/grub-1.99.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;
@@ -37,7 +37,7 @@
grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz)
 
-sha1sums=('e5ae00ae7dee95a64599fdf7cf89c8518aa2de5c'
+sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
   '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
   'b04994c005910b4bf123f034b30109d5c8d6fd86'
   'e0c1a97770cc23226cf4535c029ef50b17f67974'

Re: [arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-06-12 Thread Andrea Scarpino 
On Sunday 12 June 2011 05:18:47 Ronald van Haren wrote:
  pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
  pkgbase=grub2
 -pkgver='1.99~rc2.r3238'
 +pkgver='1.99'
Hi Ronald,
this needs epoch=1

-- 
Andrea

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-06-12 Thread Ronald van Haren 
Date: Sunday, June 12, 2011 @ 07:30:29
  Author: ronald
Revision: 127289

upgpkg: grub2 1.99-2
add epoch=1

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 11:13:28 UTC (rev 127288)
+++ PKGBUILD2011-06-12 11:30:29 UTC (rev 127289)
@@ -13,10 +13,11 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver='1.99'
-pkgrel=1
+pkgrel=2
 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')
 options=(strip purge docs zipman !emptydirs)

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-02-10 Thread Ronald van Haren 
Date: Friday, February 11, 2011 @ 02:10:53
  Author: ronald
Revision: 109614

upgpkg: grub2 1.99~rc1-3
re-upload

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-11 07:04:32 UTC (rev 109613)
+++ PKGBUILD2011-02-11 07:10:53 UTC (rev 109614)
@@ -40,8 +40,8 @@
   '963517b6f178d3cec3ff65f64cf6128cbde2f515'
   '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
   '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
-  '23cb743d0b864d415b033f71c79ebf182e909264'
-  '88c15058f5079c470d8a5061e0de0f1e8fe1effd'
+  '94b91fb6c7ddae9141af7568d476d69670f2706e'
+  '29ea1e5d400d21a199724db8f1da30c66b310595'
   '82a27eca5277218cf57c6c5767e0b17a72f62229'
   '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-01-29 Thread Ronald van Haren 
Date: Saturday, January 29, 2011 @ 07:21:16
  Author: ronald
Revision: 108082

set 644 permissions to grub.cfg

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-29 12:19:43 UTC (rev 108081)
+++ PKGBUILD2011-01-29 12:21:16 UTC (rev 108082)
@@ -138,7 +138,6 @@
depends=('xz' 'freetype2' 'device-mapper')
conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
-  
cd ${srcdir}/grub2_bios-${pkgver}
make DESTDIR=${pkgdir} install 
 
@@ -169,7 +168,7 @@
install -Dm644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub
 
## install grub.cfg (needed so it doesn't get removed on upgrading 
because it was previously here)
-   install -Dm755 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg
+   install -Dm644 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg
 
# remove platform specific files
rm -rf ${pkgdir}/usr/lib/grub/i386-pc/

[arch-commits] Commit in grub2/trunk (PKGBUILD grub2.install)

2011-01-29 Thread Ronald van Haren 
Date: Saturday, January 29, 2011 @ 08:15:44
  Author: ronald
Revision: 108098

upgpkg: grub2 1.99~rc1-3
move grub.cfg.pacsave to grub.cfg on first install so user config keeps being 
used

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/grub2.install

---+
 PKGBUILD  |2 +-
 grub2.install |   13 -
 2 files changed, 13 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-29 12:52:50 UTC (rev 108097)
+++ PKGBUILD2011-01-29 13:15:44 UTC (rev 108098)
@@ -11,7 +11,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver='1.99~rc1'
-pkgrel=2
+pkgrel=3
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')

Modified: grub2.install
===
--- grub2.install   2011-01-29 12:52:50 UTC (rev 108097)
+++ grub2.install   2011-01-29 13:15:44 UTC (rev 108098)
@@ -1,4 +1,10 @@
 post_install() {
+
+ if [ -f /boot/grub/grub.cfg.pacsave ]; then
+   echo Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg
+   install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+ fi
+
  echo -n Generating grub.cfg.example config file... 
  grub-mkconfig -o /boot/grub/grub.cfg.example 2 /dev/null
  echo done.
@@ -14,6 +20,11 @@
 
 
 post_upgrade() {
-post_install
+cat  EOF
+ An example config file is created at /boot/grub/grub.cfg.example
+
+ For more information and additional config settings please see 
http://wiki.archlinux.org/index.php/GRUB2
+
+EOF
 }

[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)

2011-01-28 Thread Ronald van Haren 
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 ronald.archlinux.org
-# Contributor: dongiovanni dongiovanni.archlinux.de
+# Contributor: Keshav P R skodabenz at rocketmail dot com
 
-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
+  
+

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-01-28 Thread Ronald van Haren 
Date: Friday, January 28, 2011 @ 14:19:19
  Author: ronald
Revision: 107991

fix small issues

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-28 19:05:26 UTC (rev 107990)
+++ PKGBUILD2011-01-28 19:19:19 UTC (rev 107991)
@@ -15,12 +15,9 @@
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
-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;
@@ -38,6 +35,16 @@
grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz)
 
+sha1sums=('866b6979974ad7209d236cb4e1819039f0bd1c6d'
+  'f116fed72eb70da1d503cf3c225dce68d658dabd'
+  'b04994c005910b4bf123f034b30109d5c8d6fd86'
+  '963517b6f178d3cec3ff65f64cf6128cbde2f515'
+  '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
+  '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
+  '23cb743d0b864d415b033f71c79ebf182e909264'
+  '88c15058f5079c470d8a5061e0de0f1e8fe1effd'
+  '82a27eca5277218cf57c6c5767e0b17a72f62229'
+  '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')
 
 build() {
# set architecture dependent variables
@@ -91,7 +98,8 @@
--enable-grub-mkfont --prefix=/usr \
--bindir=/bin --sbindir=/sbin \
--mandir=/usr/share/man --infodir=/usr/share/info \
-   --sysconfdir=/etc
+   --sysconfdir=/etc --enable-nls \
+   --program-transform-name=s,grub,grub
CFLAGS= make 
 }
 
@@ -122,7 +130,8 @@
--host=${CARCH}-unknown-linux-gnu \
--prefix=/usr --bindir=/bin \
--sbindir=/sbin --mandir=/usr/share/man \
-   --infodir=/usr/share/info --sysconfdir=/etc
+   --infodir=/usr/share/info --sysconfdir=/etc \
+   --enable-nls --program-transform-name=s,grub,grub
CFLAGS= make 
 }
 
@@ -130,7 +139,7 @@
pkgdesc=The GNU GRand Unified Bootloader version 2 - Files common for 
all platforms
install=grub2.install
depends=('xz' 'freetype2' 'device-mapper')
-   conflicts=('grub2')
+   conflicts=('grub2' 'grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
   
cd ${srcdir}/grub2_bios-${pkgver}
@@ -192,15 +201,6 @@
make DESTDIR=${pkgdir} install 
 
## remove non platform-specific files
-   rm -rf 
${pkgdir}/{bin,sbin,etc,usr/share/info,usr/share/man,usr/lib/grub}
+rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
+rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
 }
-sha1sums=('866b6979974ad7209d236cb4e1819039f0bd1c6d'
-  'f116fed72eb70da1d503cf3c225dce68d658dabd'
-  'b04994c005910b4bf123f034b30109d5c8d6fd86'
-  '963517b6f178d3cec3ff65f64cf6128cbde2f515'
-  '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
-  '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
-  '23cb743d0b864d415b033f71c79ebf182e909264'
-  '88c15058f5079c470d8a5061e0de0f1e8fe1effd'
-  '82a27eca5277218cf57c6c5767e0b17a72f62229'
-  '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-01-28 Thread Ronald van Haren 
Date: Friday, January 28, 2011 @ 15:37:36
  Author: ronald
Revision: 108001

upgpkg: grub2 1.99~rc1-1
update to 1.99rc

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-28 20:17:29 UTC (rev 108000)
+++ PKGBUILD2011-01-28 20:37:36 UTC (rev 108001)
@@ -99,7 +99,7 @@
--bindir=/bin --sbindir=/sbin \
--mandir=/usr/share/man --infodir=/usr/share/info \
--sysconfdir=/etc --enable-nls \
-   --program-transform-name=s,grub,grub
+   --program-transform-name=s,grub,grub,
CFLAGS= make 
 }
 
@@ -131,7 +131,7 @@
--prefix=/usr --bindir=/bin \
--sbindir=/sbin --mandir=/usr/share/man \
--infodir=/usr/share/info --sysconfdir=/etc \
-   --enable-nls --program-transform-name=s,grub,grub
+   --enable-nls --program-transform-name=s,grub,grub,
CFLAGS= make 
 }
 
@@ -204,3 +204,13 @@
 rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
 rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
 }
+sha1sums=('866b6979974ad7209d236cb4e1819039f0bd1c6d'
+  'f116fed72eb70da1d503cf3c225dce68d658dabd'
+  'b04994c005910b4bf123f034b30109d5c8d6fd86'
+  '963517b6f178d3cec3ff65f64cf6128cbde2f515'
+  '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
+  '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
+  '94b91fb6c7ddae9141af7568d476d69670f2706e'
+  '29ea1e5d400d21a199724db8f1da30c66b310595'
+  '82a27eca5277218cf57c6c5767e0b17a72f62229'
+  '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2011-01-28 Thread Ronald van Haren 
Date: Friday, January 28, 2011 @ 16:02:08
  Author: ronald
Revision: 108004

upgpkg: grub2 1.99~rc1-1
add provides line, remove group

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-28 20:39:07 UTC (rev 108003)
+++ PKGBUILD2011-01-28 21:02:08 UTC (rev 108004)
@@ -17,7 +17,6 @@
 license=('GPL3')
 makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 
'gettext' 'device-mapper')
 options=(strip purge docs zipman !emptydirs)
-groups=('grub2')
 
 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;
@@ -121,8 +120,6 @@
# start the actual build process
cd ${srcdir}/grub2_efi-${pkgver}
./autogen.sh
-   #install -d ${srcdir}/grub2_efi-${pkgver}/BUILD_EFI_i386
-   #cd ${srcdir}/grub2_efi-${pkgver}/BUILD_EFI_i386
 
CFLAGS= ./configure \
--with-platform=efi --target=i386 \
@@ -182,6 +179,7 @@
pkgdesc=The GNU GRand Unified Bootloader version 2 - Built for PC BIOS
depends=(grub2-common=${pkgver})
replaces=('grub2')
+   provides=('grub2')
   
cd ${srcdir}/grub2_bios-${pkgver}
make DESTDIR=${pkgdir} install

[arch-commits] Commit in grub2/trunk (PKGBUILD grub2.install)

2011-01-28 Thread Ronald van Haren 
Date: Saturday, January 29, 2011 @ 02:09:55
  Author: ronald
Revision: 108042

upgpkg: grub2 1.99~rc1-2
remove conflicts with grub2; fix typo in install message

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/grub2.install

---+
 PKGBUILD  |4 ++--
 grub2.install |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-29 06:39:30 UTC (rev 108041)
+++ PKGBUILD2011-01-29 07:09:55 UTC (rev 108042)
@@ -11,7 +11,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver='1.99~rc1'
-pkgrel=1
+pkgrel=2
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -136,7 +136,7 @@
pkgdesc=The GNU GRand Unified Bootloader version 2 - Files common for 
all platforms
install=grub2.install
depends=('xz' 'freetype2' 'device-mapper')
-   conflicts=('grub2' 'grub')
+   conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
   
cd ${srcdir}/grub2_bios-${pkgver}

Modified: grub2.install
===
--- grub2.install   2011-01-29 06:39:30 UTC (rev 108041)
+++ grub2.install   2011-01-29 07:09:55 UTC (rev 108042)
@@ -4,7 +4,7 @@
  echo done.
 
 cat  EOF 
- An example config file is created at /boot/gru/grub.cfg.example
+ An example config file is created at /boot/grub/grub.cfg.example
  
  For more information and additional config settings please see 
http://wiki.archlinux.org/index.php/GRUB2

[arch-commits] Commit in grub2/trunk (PKGBUILD lvm-detection.patch)

2010-07-12 Thread Tobias Powalowski 
Date: Monday, July 12, 2010 @ 14:45:31
  Author: tpowa
Revision: 85404

upgpkg: grub2 1.98-5
fix lvm detection

Added:
  grub2/trunk/lvm-detection.patch
Modified:
  grub2/trunk/PKGBUILD

-+
 PKGBUILD|   48 ++--
 lvm-detection.patch |   25 +
 2 files changed, 55 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-12 18:43:47 UTC (rev 85403)
+++ PKGBUILD2010-07-12 18:45:31 UTC (rev 85404)
@@ -4,7 +4,7 @@
 
 pkgname=grub2
 pkgver=1.98
-pkgrel=4
+pkgrel=5
 pkgdesc=The GNU GRand Unified Bootloader
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
@@ -16,41 +16,43 @@
 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+')
-md5sums=('c0bcf60e524739bb64e3a2d4e3732a59' 
'0910da120700a6928cd0290211acc79f'
- '897f8af2fc83fcdaf7329da39f06d3dc' 
'00ae9ff8991b8f00ab90739859af2921'
- 'fa14d3feabe17ac11dd3163501a66155' 
'81bcdf26aa01b08b9925d72cbc4c3dab'
- 'ff99d316b0c59e514e5bb641a392d330' 
'743215998a581a54ac77630f0db222ce'
- '5a07e04c4ecb8ed145d54fec3043e0d5')
+   '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')
 
 build() {
   cd $srcdir/grub-${pkgver}
 
   # some random patches to facilitate automatic creation of grub.cfg
-  patch -Np1 -i ${srcdir}/archlinux-script-fixes.patch || return 1
-  patch -Np1 -i ${srcdir}/gfxmenu-dependencies.patch || return 1
-  patch -Np1 -i ${srcdir}/menucolors-in-mkconfig.patch || return 1
-  patch -Np1 -i ${srcdir}/background-image-in-mkconfig.patch || return 1
-  patch -Np1 -i ${srcdir}/hidden-timeout-fix.patch || return 1
-
+  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
 
   # fix unifont.bdf location
-  sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure 
|| return 1
+  sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure
 
   CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
--sbindir=/sbin --mandir=/usr/share/man \
--infodir=/usr/share/info --sysconfdir=/etc
 
-  CFLAGS= make || return 1
+  CFLAGS= make
 }
 
 package() {
   cd $srcdir/grub-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # install /etc/default/grub
   install -Dm644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub
@@ -61,3 +63,13 @@
   # install memtest config detection
   install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+
 }
+md5sums=('c0bcf60e524739bb64e3a2d4e3732a59'
+ '0910da120700a6928cd0290211acc79f'
+ '897f8af2fc83fcdaf7329da39f06d3dc'
+ '00ae9ff8991b8f00ab90739859af2921'
+ 'fa14d3feabe17ac11dd3163501a66155'
+ '81bcdf26aa01b08b9925d72cbc4c3dab'
+ 'ff99d316b0c59e514e5bb641a392d330'
+ '743215998a581a54ac77630f0db222ce'
+ '5a07e04c4ecb8ed145d54fec3043e0d5'
+ '60b0157ed87041541ad0f62e3c7c0577')

Added: lvm-detection.patch
===
--- lvm-detection.patch (rev 0)
+++ lvm-detection.patch 2010-07-12 18:45:31 UTC (rev 85404)
@@ -0,0 +1,25 @@
+--- util/getroot.c~2010-07-12 20:34:58.498317508 +0200
 util/getroot.c 2010-07-12 20:34:58.556288678 +0200
+@@ -222,9 +222,20 @@
+   /* Ignore any error.  */
+   continue;
+ 
+-  if (S_ISLNK (st.st_mode))
+-  /* Don't follow symbolic links.  */
++  if (S_ISLNK (st.st_mode)) {
++#ifdef __linux__
++   if (strcmp (dir, mapper) == 0) {
++ /* Follow symbolic links under /dev/mapper/; the canonical name
++may be something like /dev/dm-0, but the names under
++/dev/mapper/ are more human-readable and so we prefer them if
++we can get them.  */
++ if (stat (ent-d_name, st)  0)
++   continue;
++   } else
++#endif /* __linux__ */
++   /* Don't follow other symbolic links.  */
+   continue;
++  }
+ 
+   if

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2010-03-25 Thread Ronald van Haren 
Date: Thursday, March 25, 2010 @ 08:01:53
  Author: ronald
Revision: 73374

add gettext to optdepends, it is used by the grub-mkconfig script FS#18822

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-25 11:33:14 UTC (rev 73373)
+++ PKGBUILD2010-03-25 12:01:53 UTC (rev 73374)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('sh' 'lzo2' 'freetype2')
-optdepends=('ruby:usr/share/grub/genmk.rb script' 'libusb: /sbin/grub-emu')
+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')

[arch-commits] Commit in grub2/trunk (PKGBUILD grub2.install)

2010-03-16 Thread Ronald van Haren 
Date: Tuesday, March 16, 2010 @ 14:30:20
  Author: ronald
Revision: 72470

upgpkg: grub2 1.98-3
FS18711: removing grub.cfg from backup array removes the file  create 
grub.cfg.example file instead of grub.cfg file

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/grub2.install

---+
 PKGBUILD  |3 ++-
 grub2.install |   14 --
 2 files changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-16 16:57:13 UTC (rev 72469)
+++ PKGBUILD2010-03-16 18:30:20 UTC (rev 72470)
@@ -4,7 +4,7 @@
 
 pkgname=grub2
 pkgver=1.98
-pkgrel=2
+pkgrel=3
 pkgdesc=The GNU GRand Unified Bootloader
 url=http://www.gnu.org/software/grub/;
 arch=('i686' 'x86_64')
@@ -12,6 +12,7 @@
 depends=('sh' 'lzo2' 'freetype2')
 optdepends=('ruby:usr/share/grub/genmk.rb script' 'libusb: /sbin/grub-emu')
 makedepends=('bdf-unifont' 'ruby')
+backup=('boot/grub/grub.cfg')
 conflicts=('grub')
 provides=('grub')
 install=${pkgname}.install

Modified: grub2.install
===
--- grub2.install   2010-03-16 16:57:13 UTC (rev 72469)
+++ grub2.install   2010-03-16 18:30:20 UTC (rev 72470)
@@ -1,18 +1,20 @@
 post_install() {
 if [ ! -f /boot/grub/grub.cfg ]; then
- echo -n Generating grub.cfg config file... 
- grub-mkconfig -o /boot/grub/grub.cfg 2 /dev/null
+ echo -n Generating grub.cfg.example config file... 
+ grub-mkconfig -o /boot/grub/grub.cfg.example 2 /dev/null
  echo done.
 fi
 cat  EOF 
- Please verify the config file installed in /boot/grub/grub.cfg
+ An example config file is created at /boot/grug/grub.cfg.example
+ 
  For more information and additional config settings please see 
http://wiki.archlinux.org/index.php/GRUB2
 
- GRUB2 is still expiremental and under heavy development!. 
- Only install it if you know what you are doing. 
-
 EOF
 
 }
 
 
+post_upgrade() {
+post_install
+}
+

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2010-02-09 Thread Ronald van Haren 
Date: Tuesday, February 9, 2010 @ 08:30:08
  Author: ronald
Revision: 67901

upgpkg: grub2 1.97.2-1
update to latest version; grub2 now compiles on x86_64: FS#18217

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 6 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-09 13:06:10 UTC (rev 67900)
+++ PKGBUILD2010-02-09 13:30:08 UTC (rev 67901)
@@ -3,7 +3,7 @@
 # Contributor: dongiovanni dongiovanni.archlinux.de
 
 pkgname=grub2
-pkgver=1.97.1
+pkgver=1.97.2
 pkgrel=1
 pkgdesc=The GNU GRand Unified Bootloader
 url=http://www.gnu.org/software/grub/;
@@ -22,14 +22,10 @@
'grub.cfg')  
 # don't install auto-install script. TODO: It needs a rewrite to work with 
grub2
 #  'install-grub')  
-md5sums=('66fe18cd9318e3d67a34d7b7a8e7b1f6'
+md5sums=('db4d23fb8897523a7e484e974ae3d1c9'
  '743215998a581a54ac77630f0db222ce')
 
 build() {
-  # Set destination architecture here
-  #DESTARCH=i686
-  DESTARCH=x86_64
-
   cd $srcdir/grub-${pkgver}
   # run autogen.sh to create configure files
   ./autogen.sh
@@ -37,35 +33,15 @@
   # fix unifont.bdf location
   sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure 
|| return 1
 
-  # Arch64 grub2 needs to be statically build on i686
-  if [ $CARCH = x86_64 ]; then
-echo this package has to be built on i686, won't compile on x86_64
-sleep 5
-  else
+  CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
+   --sbindir=/sbin --mandir=/usr/share/man \
+   --infodir=/usr/share/info --sysconfdir=/etc
 
-if [ $DESTARCH = x86_64 ]; then
-   export LDFLAGS=-static
-export CFLAGS=-static
-   ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
-   --sbindir=/sbin --mandir=/usr/share/man \
-   --infodir=/usr/share/info --sysconfdir=/etc
-   unset CFLAGS CPPFLAGS LDFLAGS
-
-else
-  CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
-   --sbindir=/sbin --mandir=/usr/share/man \
-   --infodir=/usr/share/info --sysconfdir=/etc
-fi
-  fi
-
   CFLAGS= make || return 1
   make DESTDIR=${pkgdir} install || return 1
   
   install -Dm644 ${srcdir}/grub.cfg $startdir/pkg/boot/grub/grub.cfg
   #install -Dm755 ${srcdir}/install-grub $startdir/pkg/sbin/install-grub
 
-  # Fool makepkg into building a x86_64 package
-  if [ $DESTARCH = x86_64 ]; then
-export CARCH=x86_64
-  fi
 }
+

[arch-commits] Commit in grub2/trunk (PKGBUILD)

2009-11-10 Thread Ronald van Haren 
Date: Tuesday, November 10, 2009 @ 06:58:16
  Author: ronald
Revision: 58619

upgpkg: grub2 1.97.1-1
update to latest upstream version 1.97.1

Modified:
  grub2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-10 11:35:18 UTC (rev 58618)
+++ PKGBUILD2009-11-10 11:58:16 UTC (rev 58619)
@@ -3,7 +3,7 @@
 # Contributor: dongiovanni dongiovanni.archlinux.de
 
 pkgname=grub2
-pkgver=1.97
+pkgver=1.97.1
 pkgrel=1
 pkgdesc=The GNU GRand Unified Bootloader
 url=http://www.gnu.org/software/grub/;
@@ -16,19 +16,19 @@
 provides=('grub')
 backup=('boot/grub/grub.cfg')
 install=${pkgname}.install
-source=(ftp://alpha.gnu.org/gnu/grub/grub-1.97.tar.gz  
+source=(ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz  
# use our own svn checkout so disable snapshot
#ftp://ftp.archlinux.org/sources/${pkgname}-${pkgver}.src.tar.bz2
'grub.cfg')  
 # don't install auto-install script. TODO: It needs a rewrite to work with 
grub2
 #  'install-grub')  
-md5sums=('3700068f871b4f394315ebb8ba324df4'
+md5sums=('66fe18cd9318e3d67a34d7b7a8e7b1f6'
  '743215998a581a54ac77630f0db222ce')
 
 build() {
   # Set destination architecture here
-  DESTARCH=i686
-  #DESTARCH=x86_64
+  #DESTARCH=i686
+  DESTARCH=x86_64
 
   cd $srcdir/grub-${pkgver}
   # run autogen.sh to create configure files