[Gsrc-commit] /srv/bzr/gsrc/trunk r1106: clean up grub

[Brandon Invergo]

------------------------------------------------------------
revno: 1106
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-10 22:18:16 +0100
message:
  clean up grub
added:
  gnu/grub/config.mk
modified:
  gnu/grub/Makefile
  gnu/grub/sha256sums

=== modified file 'gnu/grub/Makefile'
--- a/gnu/grub/Makefile 2012-08-25 20:58:39 +0000
+++ b/gnu/grub/Makefile 2012-11-10 21:18:16 +0000
@@ -1,21 +1,24 @@
 GARNAME = grub
 GARVERSION = 2.00
-
-MASTER_SITES = $(MASTER_GNU_ALPHA)
-MASTER_SUBDIR = grub/
-
-DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = $(DISTNAME).tar.gz.sig
+HOME_URL = http://www.gnu.org/software/grub/
+DESCRIPTION = The Grand Unified Bootloader
+
+######################################################################
+
+MASTER_SITES = $(MASTER_GNU)
+MASTER_SUBDIR = $(GARNAME)/
+DISTFILES = $(DISTNAME).tar.xz
+SIGFILES = $(DISTNAME).tar.xz.sig
 
 BUILDDEPS = gettext bison #flex
-# LIBDEPS = 
+LIBDEPS = 
 
-HOME_URL = http://www.gnu.org/software/grub/
-DESCRIPTION = GNU GRUB
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
 
-CONFIGURE_OPTS = --with-bootdir=$(prefix)/boot 
--with-libiconv-prefix=$(prefix) --disable-werror
+CONFIGURE_ARGS += --with-bootdir=$(prefix)/boot 
--with-libiconv-prefix=$(prefix) --disable-werror
 
 pre-build:
        exec sed -i -e '/gets is a security/d' 
$(WORKSRC)/grub-core/gnulib/stdio.in.h

=== added file 'gnu/grub/config.mk'
--- a/gnu/grub/config.mk        1970-01-01 00:00:00 +0000
+++ b/gnu/grub/config.mk        2012-11-10 21:18:16 +0000
@@ -0,0 +1,4 @@
+## Configuration options for grub ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== modified file 'gnu/grub/sha256sums'
--- a/gnu/grub/sha256sums       2012-08-25 20:58:39 +0000
+++ b/gnu/grub/sha256sums       2012-11-10 21:18:16 +0000
@@ -1,2 +1,2 @@
-65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3  
download/grub-2.00.tar.gz
-49ea018f939ebe0738f43f2bccdc994bc925d5553ffe21a3d0052ab990b09680  
download/grub-2.00.tar.gz.sig
+784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458  
download/grub-2.00.tar.xz
+9e8a7b755e377ee556eff84c4d0a1e2f085e534a55f415ef90b78e545e0f2883  
download/grub-2.00.tar.xz.sig