[arch-commits] Commit in grub2/repos/extra-i686 (3 files)

[Ronald van Haren]

    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_archtheme	2010-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
===================================================================
--- PKGBUILD	2010-03-16 14:28:38 UTC (rev 72459)
+++ PKGBUILD	2010-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.000000000 +0100
-+++ /etc/grub.d/05_archtheme.in	2010-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.in	2010-03-16 13:26:36.669907054 +0100