[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, July 20, 2012 @ 06:02:39 Author: ronald Revision: 163805 db-remove: grub2 removed by ronald Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Monday, June 13, 2011 @ 03:11:08 Author: ronald Revision: 127336 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Monday, June 13, 2011 @ 03:11:23 Author: ronald Revision: 127337 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Sunday, August 7, 2011 @ 15:17:25 Author: ibiru Revision: 134761 db-move: grub2 removed by ibiru for move to [extra] (i686) Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Thursday, February 10, 2011 @ 14:33:20 Author: ronald Revision: 109559 db-move: grub2 removed by ronald for move to [extra] (i686) Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, February 11, 2011 @ 02:04:21 Author: ronald Revision: 109612 db-remove: grub2 removed by ronald Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, February 11, 2011 @ 02:11:40 Author: ronald Revision: 109615 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, February 11, 2011 @ 03:44:05 Author: bisson Revision: 109617 db-remove: grub2 removed by bisson Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, February 11, 2011 @ 03:51:32 Author: bisson Revision: 109619 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Tuesday, March 16, 2010 @ 09:16:45 Author: ronald Revision: 72455 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Tuesday, March 16, 2010 @ 09:17:05 Author: ronald Revision: 72456 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Wednesday, March 17, 2010 @ 07:53:16 Author: ronald Revision: 72511 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Wednesday, March 17, 2010 @ 07:53:31 Author: ronald Revision: 72512 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, April 22, 2011 @ 07:24:19 Author: ronald Revision: 120336 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Friday, April 22, 2011 @ 07:24:35 Author: ronald Revision: 120337 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Tuesday, May 3, 2011 @ 11:18:37 Author: ronald Revision: 122265 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Tuesday, May 3, 2011 @ 11:19:14 Author: ronald Revision: 122266 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Monday, July 12, 2010 @ 14:49:24 Author: tpowa Revision: 85407 archrelease: remove extra-i686 Deleted: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos (extra-i686)
Date: Monday, July 12, 2010 @ 14:49:45 Author: tpowa Revision: 85408 archrelease: copy trunk to extra-i686 Added: grub2/repos/extra-i686/
[arch-commits] Commit in grub2/repos/extra-i686 (PKGBUILD)
Date: Wednesday, March 21, 2012 @ 05:16:33 Author: ronald Revision: 153998 wrong pkgname Modified: grub2/repos/extra-i686/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-03-21 09:16:27 UTC (rev 153997) +++ PKGBUILD2012-03-21 09:16:33 UTC (rev 153998) @@ -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/repos (extra-i686 extra-x86_64)
Date: Wednesday, March 21, 2012 @ 04:27:24 Author: ronald Revision: 153989 cleanup repos Deleted: grub2/repos/extra-i686/ grub2/repos/extra-x86_64/
[arch-commits] Commit in grub2/repos (extra-i686 testing-i686)
Date: Sunday, August 7, 2011 @ 15:17:26 Author: ibiru Revision: 134762 db-move: moved grub2 from [testing] to [extra] (i686) Added: grub2/repos/extra-i686/ Deleted: grub2/repos/testing-i686/
[arch-commits] Commit in grub2/repos (extra-i686 testing-i686)
Date: Thursday, February 10, 2011 @ 14:33:21 Author: ronald Revision: 109560 db-move: moved grub2 from [testing] to [extra] (i686) Added: grub2/repos/extra-i686/ Deleted: grub2/repos/testing-i686/
[arch-commits] Commit in grub2/repos/extra-i686 (3 files)
Date: Tuesday, March 16, 2010 @ 10:30:43 Author: ronald Revision: 72460 fix merge error Added: grub2/repos/extra-i686/05_archtheme Modified: grub2/repos/extra-i686/PKGBUILD grub2/repos/extra-i686/grubconfig.archlinux.patch + 05_archtheme |6 ++ PKGBUILD | 17 - grubconfig.archlinux.patch | 22 -- 3 files changed, 18 insertions(+), 27 deletions(-) Added: 05_archtheme === --- 05_archtheme(rev 0) +++ 05_archtheme2010-03-16 14:30:43 UTC (rev 72460) @@ -0,0 +1,6 @@ +#!/bin/bash -e + +cat << EOF +set menu_color_normal=light-blue/black +set menu_color_highlight=light-cyan/blue +EOF Modified: PKGBUILD === --- PKGBUILD2010-03-16 14:28:38 UTC (rev 72459) +++ PKGBUILD2010-03-16 14:30:43 UTC (rev 72460) @@ -4,7 +4,7 @@ pkgname=grub2 pkgver=1.98 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; arch=('i686' 'x86_64') @@ -16,17 +16,17 @@ provides=('grub') install=${pkgname}.install source=(ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz - 'grubconfig.archlinux.patch') + 'grubconfig.archlinux.patch' '05_archtheme') md5sums=('c0bcf60e524739bb64e3a2d4e3732a59' - '16a1d27f2e0e6bcb415e3f5b52ec2b78') + 'c71f5b20b35f3e1da5e9e3577e486af3' + 'e143ae2e453b7c3ced309667df30da55') build() { cd $srcdir/grub-${pkgver}/util/grub.d - # modify scripts to detect Arch Linux kernels & set custom default colors + # modify scripts to detect Arch Linux kernels patch -Np3 -i ${srcdir}/grubconfig.archlinux.patch || return 1 - # run autogen.sh to create configure files cd ../.. ./autogen.sh @@ -39,6 +39,13 @@ --infodir=/usr/share/info --sysconfdir=/etc CFLAGS= make || return 1 +} + +package() { + cd $srcdir/grub-${pkgver} make DESTDIR=${pkgdir} install || return 1 + # install script to set default colors + install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme + } Modified: grubconfig.archlinux.patch === --- grubconfig.archlinux.patch 2010-03-16 14:28:38 UTC (rev 72459) +++ grubconfig.archlinux.patch 2010-03-16 14:30:43 UTC (rev 72460) @@ -1,25 +1,3 @@ -diff -Naur /etc/grub.d.orig/00_header /etc/grub.d/00_header /etc/grub.d.orig/00_header.in 2010-03-16 12:05:22.998499105 +0100 -+++ /etc/grub.d/00_header.in 2010-03-16 13:01:21.018170738 +0100 -@@ -120,6 +120,8 @@ - ;; - x) - # Just use the native terminal -+set menu_color_normal=light-blue/black -+set menu_color_highlight=light-cyan/blue - ;; - x*) - cat << EOF -diff -Naur /etc/grub.d.orig/05_archtheme /etc/grub.d/05_archtheme /etc/grub.d.orig/05_archtheme.in 1970-01-01 01:00:00.0 +0100 -+++ /etc/grub.d/05_archtheme.in2010-03-16 13:05:59.878411766 +0100 -@@ -0,0 +1,6 @@ -+#!/bin/bash -e -+ -+cat << EOF -+set menu_color_normal=light-blue/black -+set menu_color_highlight=light-cyan/blue -+EOF diff -Naur /etc/grub.d.orig/10_linux /etc/grub.d/10_linux --- /etc/grub.d.orig/10_linux.in 2010-03-16 12:05:22.998499105 +0100 +++ /etc/grub.d/10_linux.in2010-03-16 13:26:36.669907054 +0100
[arch-commits] Commit in grub2/repos/extra-i686 (grub2.install)
Date: Tuesday, March 16, 2010 @ 10:49:50 Author: ronald Revision: 72463 fix merge error Modified: grub2/repos/extra-i686/grub2.install ---+ grub2.install |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) Modified: grub2.install === --- grub2.install 2010-03-16 14:49:00 UTC (rev 72462) +++ grub2.install 2010-03-16 14:49:50 UTC (rev 72463) @@ -1,8 +1,9 @@ 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 "done." - +fi cat << EOF Please verify the config file installed in /boot/grub/grub.cfg For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2 @@ -14,7 +15,4 @@ } -post_upgrade() { -post_install -}
[arch-commits] Commit in grub2/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, November 5, 2009 @ 18:53:41 Author: ronald Revision: 58210 Merged revisions 53545,58209 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/grub2/trunk r53545 | ronald | 2009-10-02 11:40:36 +0200 (Fri, 02 Oct 2009) | 2 lines upgpkg: grub2 1.97beta3-1 update to latest version 1.97-beta3 r58209 | ronald | 2009-11-06 00:53:10 +0100 (Fri, 06 Nov 2009) | 2 lines upgpkg: grub2 1.97-1 update to latest snapshot release 1.97 Modified: grub2/repos/extra-i686/ (properties) grub2/repos/extra-i686/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Property changes on: grub2/repos/extra-i686 ___ Modified: svnmerge-integrated - /grub2/trunk:1-53543 + /grub2/trunk:1-58209 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2009-11-05 23:53:10 UTC (rev 58209) +++ extra-i686/PKGBUILD 2009-11-05 23:53:41 UTC (rev 58210) @@ -3,7 +3,7 @@ # Contributor: dongiovanni pkgname=grub2 -pkgver=1.97beta3 +pkgver=1.97 pkgrel=1 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; @@ -16,13 +16,13 @@ provides=('grub') backup=('boot/grub/grub.cfg') install=${pkgname}.install -source=(ftp://alpha.gnu.org/gnu/grub/grub-1.97~beta3.tar.gz +source=(ftp://alpha.gnu.org/gnu/grub/grub-1.97.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=('542917012de4d2e47241bdffb67bedef' +md5sums=('3700068f871b4f394315ebb8ba324df4' '743215998a581a54ac77630f0db222ce') build() { @@ -30,7 +30,7 @@ DESTARCH="i686" #DESTARCH="x86_64" - cd $srcdir/grub-1.97~beta3 + cd $srcdir/grub-${pkgver} # run autogen.sh to create configure files ./autogen.sh
[arch-commits] Commit in grub2/repos (extra-i686 extra-i686/PKGBUILD)
Date: Tuesday, November 10, 2009 @ 06:58:45 Author: ronald Revision: 58620 Merged revisions 58619 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/grub2/trunk r58619 | ronald | 2009-11-10 12:58:16 +0100 (Tue, 10 Nov 2009) | 2 lines upgpkg: grub2 1.97.1-1 update to latest upstream version 1.97.1 Modified: grub2/repos/extra-i686/ (properties) grub2/repos/extra-i686/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Property changes on: grub2/repos/extra-i686 ___ Modified: svnmerge-integrated - /grub2/trunk:1-58209 + /grub2/trunk:1-58619 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2009-11-10 11:58:16 UTC (rev 58619) +++ extra-i686/PKGBUILD 2009-11-10 11:58:45 UTC (rev 58620) @@ -3,7 +3,7 @@ # Contributor: dongiovanni 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
[arch-commits] Commit in grub2/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 11:58:19 Author: ronald Revision: 68212 Merged revisions 67901 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/grub2/trunk r67901 | ronald | 2010-02-09 14:30:08 +0100 (Tue, 09 Feb 2010) | 2 lines upgpkg: grub2 1.97.2-1 update to latest version; grub2 now compiles on x86_64: FS#18217 Modified: grub2/repos/extra-i686/ (properties) grub2/repos/extra-i686/PKGBUILD --+ PKGBUILD | 36 ++-- 1 file changed, 6 insertions(+), 30 deletions(-) Property changes on: grub2/repos/extra-i686 ___ Modified: svnmerge-integrated - /grub2/trunk:1-58619 + /grub2/trunk:1-68211 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 15:31:06 UTC (rev 68211) +++ extra-i686/PKGBUILD 2010-02-11 16:58:19 UTC (rev 68212) @@ -3,7 +3,7 @@ # Contributor: dongiovanni 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/repos/extra-i686 (PKGBUILD grub2.install)
Date: Tuesday, March 16, 2010 @ 15:05:26 Author: ronald Revision: 72473 fix merge error Modified: grub2/repos/extra-i686/PKGBUILD grub2/repos/extra-i686/grub2.install ---+ PKGBUILD |3 ++- grub2.install | 17 + 2 files changed, 11 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-03-16 19:04:58 UTC (rev 72472) +++ PKGBUILD2010-03-16 19:05:26 UTC (rev 72473) @@ -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 19:04:58 UTC (rev 72472) +++ grub2.install 2010-03-16 19:05:26 UTC (rev 72473) @@ -1,18 +1,19 @@ 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 +} +