Changeset 1261

Timestamp:

01/28/12 15:24:51 (4 months ago)

Author:

tschmitt

Message:

• veraltete Dokumentation entfernt.
• grub4dos-Kompilieroptionen optimiert.
• tetex, gcc-4.1 und g++-4.1 aus Bauabhängigkeiten entfernt.

Location:

main/linuxmuster-linbo/branches/testing

Files:

• conf/initramfs.conf (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• debian/rules (modified) (7 diffs)
• doc (deleted)
• linbo/etc/linbo-version (modified) (1 diff)

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

@@ -148 +148 @@
 
 # grub from build system
-#file /usr/sbin/grub-set-default /usr/sbin/grub-install 755 0 0
+#file /usr/sbin/grub-install /usr/sbin/grub-install 755 0 0
 #file /usr/sbin/grub-set-default /usr/sbin/grub-set-default 755 0 0
 #file /usr/sbin/grub-probe /usr/sbin/grub-probe 755 0 0
@@ -163 +163 @@
 file /usr/sbin/grub-set-default ../../src/grub4dos/util/grub-set-default 755 0 0
 file /usr/sbin/grub-install ../../src/grub4dos/util/grub-install 755 0 0
+#file /usr/sbin/grub-image ../../src/grub4dos/util/grub-image 755 0 0
 file /usr/lib/grub/i386-pc/e2fs_stage1_5 ../../src/grub4dos/stage2/e2fs_stage1_5 755 0 0
 file /usr/lib/grub/i386-pc/fat_stage1_5 ../../src/grub4dos/stage2/fat_stage1_5 755 0 0
-file /usr/lib/grub/i386-pc/jfs_stage1_5 ../../src/grub4dos/stage2/jfs_stage1_5 755 0 0
+#file /usr/lib/grub/i386-pc/jfs_stage1_5 ../../src/grub4dos/stage2/jfs_stage1_5 755 0 0
 file /usr/lib/grub/i386-pc/ntfs_stage1_5 ../../src/grub4dos/stage2/ntfs_stage1_5 755 0 0
 file /usr/lib/grub/i386-pc/reiserfs_stage1_5 ../../src/grub4dos/stage2/reiserfs_stage1_5 755 0 0
 file /usr/lib/grub/i386-pc/stage1 ../../src/grub4dos/stage1/stage1 755 0 0
 file /usr/lib/grub/i386-pc/stage2 ../../src/grub4dos/stage2/stage2 755 0 0
-file /usr/lib/grub/i386-pc/xfs_stage1_5 ../../src/grub4dos/stage2/xfs_stage1_5 755 0 0
+#file /usr/lib/grub/i386-pc/xfs_stage1_5 ../../src/grub4dos/stage2/xfs_stage1_5 755 0 0
 file /usr/lib/grub/i386-pc/stage2_eltorito ../../src/grub4dos/stage2/stage2_eltorito 755 0 0
 
 # 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/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
+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/stage2/badgrub.exe 755 0 0
 
 # rsync

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

@@ -1 +1 @@
 linuxmuster-linbo (2.0.5-0) unstable; urgency=low
 
-  * grub4dos: updated to 0.4.5c-2012-01-17.
+  * grub4dos: updated to 0.4.5c-2012-01-17, optimized compile options.
   * linbofs: added badgrub.exe for testing purposes.
-
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 28 Jan 2011 12:28:41 +0100
+  * removed obsolete documentation.
+  * removed tetex stuff, gcc-4.1 and g++-4.1 from build dependencies.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 28 Jan 2011 15:06:50 +0100
 
 linuxmuster-linbo (2.0.4-0) unstable; urgency=low

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

@@ -6 +6 @@
                dropbear, nasm, ncurses-base, coreutils, sysvinit-utils, util-linux, ntfsprogs,
                tetex-base, libstdc++6, reiserfsprogs, e2fsprogs, dosfstools, unzip, tar, gzip, gettext, zlib1g-dev,
-               libncurses5-dev, tetex-bin, tetex-extra, udpcast, perl, libpopt-dev, libacl1-dev, libattr1-dev,
-               qt3-dev-tools, gcc-4.1, g++-4.1, gcc-4.3, g++-4.3, flex, libxext-dev (>= 4.3.0.dfsg.1-4),
+               libncurses5-dev, udpcast, perl, libpopt-dev, libacl1-dev, libattr1-dev,
+               qt3-dev-tools, gcc-4.3, g++-4.3, flex, libxext-dev (>= 4.3.0.dfsg.1-4),
                libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
                libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4),

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

@@ -3 +3 @@
 458d7cc0c69646a2caaedec5c836cdcc  cloop_2.639-2.tar.gz
 59b23dd05ff70791cd6449effa7fc3b6  ctorrent-dnh3.3.2.tar.gz
-5dfa212a43c364b0b3fb43d301225f36  grub4dos-0.4.5b-2011-12-26.zip
+69c1ab88090d313cbb7d57c90c62133a  grub4dos-0.4.5c-2012-01-17-src.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//' | awk -F\- '{ print $$1 "-" $$2 }')
+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)
@@ -114 +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) ) ); \
@@ -129 +119 @@
                 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
@@ -265 +258 @@
 
         # 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) && ./configure --prefix=/usr \
+                        --enable-preset-menu=preset_menu.lst \
+                        --disable-ffs \
+                        --disable-minix \
+                        --disable-vstafs \
+                        --disable-jfs \
+                        --disable-xfs \
+                        --disable-ufs2 \
+                        --disable-hercules \
+                        --disable-serial && make && strip grub/grub );\
+        fi
 
         # kexec-tools
@@ -335 +337 @@
                 ( cd linbo_gui && ./build_gui ); \
         fi
-        
-        # docs
-        @echo "[1mBuilding docs...[0m" ; \
-        ( cd doc && make )
 
         # linbo kernel
@@ -364 +362 @@
         rm -rf src || true
         rm -rf kernel || true
-        ( cd doc && rm *.toc *.pdf *.out *.log *.lof *.aux ) || true
 
 clean: 
@@ -429 +426 @@
         install -m 644 graphics/linbo-cd.png debian/linuxmuster-linbo/usr/share/linuxmuster-linbo/linbo-cd.png
         install -m 644 graphics/linbo-usb.png debian/linuxmuster-linbo/usr/share/linuxmuster-linbo/linbo-usb.png
-        install -m 644 doc/LINBO-M3.pdf debian/linuxmuster-linbo/usr/share/doc/linuxmuster-linbo/LINBO.pdf
-        install -m 644 doc/LINBO-Vortrag-2007-09-25.pdf debian/linuxmuster-linbo/usr/share/doc/linuxmuster-linbo/LINBO-Vortrag.pdf
         install -m 644 examples/* debian/linuxmuster-linbo/usr/share/doc/linuxmuster-linbo/examples/
         install -m 644 linbo/menu.lst debian/linuxmuster-linbo/usr/share/doc/linuxmuster-linbo/examples/menu.lst.default

main/linuxmuster-linbo/branches/testing/linbo/etc/linbo-version

@@ -1 @@
-LINBO 2.0.4-0
+LINBO 2.0.5-0