Changeset 1260

Timestamp:

01/28/12 12:38:57 (4 months ago)

Author:

tschmitt

Message:

• grub4dos: auf 0.4.5c-2012-01-17 aktualisiert.
• linbofs: badgrub.exe testweise hinzugefügt.

Location:

main/linuxmuster-linbo/branches/testing

Files:

• conf/initramfs.conf (modified) (2 diffs, 1 prop)
• debian/changelog (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• debian/rules (modified) (4 diffs)

main/linuxmuster-linbo/branches/testing/conf/initramfs.conf

@@ +1 @@
+# $Id$
+#
 # root directory
 dir / 755 0 0
@@ -172 +174 @@
 
 # grub4dos
-file /usr/lib/grub.exe ../../src/grub4dos/stage2/grub.exe 755 0 0
-file /usr/lib/grub/grldr ../../src/grub4dos/stage2/grldr 755 0 0
-file /usr/sbin/bootlace.com ../../src/grub4dos/stage2/bootlace.com 755 0 0
+#file /usr/lib/grub.exe ../../src/grub4dos/stage2/grub.exe 755 0 0
+#file /usr/lib/grub/grldr ../../src/grub4dos/stage2/grldr 755 0 0
+#file /usr/sbin/bootlace.com ../../src/grub4dos/stage2/bootlace.com 755 0 0
+file /usr/lib/badgrub.exe ../../src/grub4dos/badgrub.exe 755 0 0
+file /usr/lib/grub.exe ../../src/grub4dos/grub.exe 755 0 0
+file /usr/lib/grub/grldr ../../src/grub4dos/grldr 755 0 0
+file /usr/sbin/bootlace.com ../../src/grub4dos/bootlace.com 755 0 0
 
 # rsync

main/linuxmuster-linbo/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-linbo (2.0.5-0) unstable; urgency=low
+
+  * grub4dos: updated to 0.4.5c-2012-01-17.
+  * linbofs: added badgrub.exe for testing purposes.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 28 Jan 2011 12:28:41 +0100
+
 linuxmuster-linbo (2.0.4-0) unstable; urgency=low
 

main/linuxmuster-linbo/branches/testing/debian/md5sums.src

@@ -3 +3 @@
 458d7cc0c69646a2caaedec5c836cdcc  cloop_2.639-2.tar.gz
 59b23dd05ff70791cd6449effa7fc3b6  ctorrent-dnh3.3.2.tar.gz
-e9a5936688e97075901f099b1749dc80  grub4dos-0.4.4-2009-10-16-src.zip
+5dfa212a43c364b0b3fb43d301225f36  grub4dos-0.4.5b-2011-12-26.zip
 b3ced2097ce3981abba38ceedc84f939  kexec-tools-2.0.3.tar.bz2
 67252770d7009eabe8bac7c26e074f9d  linux-3.0.18.tar.bz2

main/linuxmuster-linbo/branches/testing/debian/rules

@@ -56 +56 @@
 GRUB4DOS_ARCHIVE=$(shell grep grub4dos- debian/md5sums.src | awk '{ print $$2 }')
 #GRUB4DOS_DIR=src/grub4dos-$(shell echo $(GRUB4DOS_ARCHIVE) | awk -F\- '{ print $$2 }')
-GRUB4DOS_DIR=src/$(shell echo $(GRUB4DOS_ARCHIVE) | sed -e 's/.zip//')
+#GRUB4DOS_DIR=src/$(shell echo $(GRUB4DOS_ARCHIVE) | sed -e 's/.zip//')
+GRUB4DOS_DIR=src/$(shell echo $(GRUB4DOS_ARCHIVE) | sed -e 's/.zip//' | awk -F\- '{ print $$1 "-" $$2 }')
 #GRUB4DOS_URL=http://nufans.net/grub4dos
 GRUB4DOS_URL=$(LML_URL)
@@ -113 +114 @@
 
         # grub4dos
+#       -@if [ ! -d $(GRUB4DOS_DIR) ]; then \
+#               ( [ -e cache/$(GRUB4DOS_ARCHIVE) ] || ( cd cache && wget $(GRUB4DOS_URL)/$(GRUB4DOS_ARCHIVE) ) ); \
+#               ( cd cache && grep $(GRUB4DOS_ARCHIVE) ../debian/md5sums.src | md5sum -c ); \
+#               echo "[1mUnpacking $(GRUB4DOS_ARCHIVE)...[0m" ; \
+#               ( cd src && unzip ../cache/$(GRUB4DOS_ARCHIVE) ); \
+#               echo "[1mPatching grub4dos sources...[0m" ; \
+#               ( cd $(GRUB4DOS_DIR) && for i in ../../patches/grub4dos/*; do patch -p1 <$$i; done ); \
+#               chmod 755 $(GRUB4DOS_DIR)/configure; \
+#               ln -sf ../$(GRUB4DOS_DIR) src/grub4dos; \
+#       fi
         -@if [ ! -d $(GRUB4DOS_DIR) ]; then \
                 ( [ -e cache/$(GRUB4DOS_ARCHIVE) ] || ( cd cache && wget $(GRUB4DOS_URL)/$(GRUB4DOS_ARCHIVE) ) ); \
@@ -118 +129 @@
                 echo "[1mUnpacking $(GRUB4DOS_ARCHIVE)...[0m" ; \
                 ( cd src && unzip ../cache/$(GRUB4DOS_ARCHIVE) ); \
-                echo "[1mPatching grub4dos sources...[0m" ; \
-                ( cd $(GRUB4DOS_DIR) && for i in ../../patches/grub4dos/*; do patch -p1 <$$i; done ); \
-                chmod 755 $(GRUB4DOS_DIR)/configure; \
                 ln -sf ../$(GRUB4DOS_DIR) src/grub4dos; \
         fi
@@ -257 +265 @@
 
         # grub4dos
-        -@if [ ! -e $(GRUB4DOS_DIR)/stage2/grub.exe -o ! -e $(GRUB4DOS_DIR)/stage2/grldr -o ! -e $(GRUB4DOS_DIR)/stage2/bootlace.com ]; then \
-                echo "[1mBuilding grub4dos...[0m" ; \
-                ( cd $(GRUB4DOS_DIR) && CC=gcc-4.1 CFLAGS=-fno-stack-protector ./configure --prefix=/usr --enable-preset-menu=preset_menu.lst && make all && strip grub/grub );\
-        fi
+#       -@if [ ! -e $(GRUB4DOS_DIR)/stage2/grub.exe -o ! -e $(GRUB4DOS_DIR)/stage2/grldr -o ! -e $(GRUB4DOS_DIR)/stage2/bootlace.com ]; then \
+#               echo "[1mBuilding grub4dos...[0m" ; \
+#               ( cd $(GRUB4DOS_DIR) && CC=gcc-4.1 CFLAGS=-fno-stack-protector ./configure --prefix=/usr --enable-preset-menu=preset_menu.lst && make all && strip grub/grub );\
+#       fi
 
         # kexec-tools