|
From: <dot...@us...> - 2008-01-14 19:33:16
|
Revision: 1008
http://ipcop.svn.sourceforge.net/ipcop/?rev=1008&view=rev
Author: dotzball
Date: 2008-01-14 11:33:17 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
No need to have the 'default' file in SVN, create it on compile time.
IIRC the minix filesystem was dropped, don't build the minix grub stage
file.
Apply debian patches correctly (found correct syntax in newt, before I
copied from discover there is may some correct patching missing?).
Run auto* to rebuild the configure file according to the patches.
The splashimage is still not working, will write an email to
ipcop-devel.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/arch_i486/grub
ipcop/trunk/lfs/grub
Removed Paths:
-------------
ipcop/trunk/config/grub/default
Deleted: ipcop/trunk/config/grub/default
===================================================================
--- ipcop/trunk/config/grub/default 2008-01-14 19:19:40 UTC (rev 1007)
+++ ipcop/trunk/config/grub/default 2008-01-14 19:33:17 UTC (rev 1008)
@@ -1,14 +0,0 @@
-0
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# WARNING: If you want to edit this file directly, do not remove any line
-# from this file, including this warning. Using `grub-set-default\' is
-# strongly recommended.
Modified: ipcop/trunk/config/rootfiles/arch_i486/grub
===================================================================
--- ipcop/trunk/config/rootfiles/arch_i486/grub 2008-01-14 19:19:40 UTC (rev 1007)
+++ ipcop/trunk/config/rootfiles/arch_i486/grub 2008-01-14 19:33:17 UTC (rev 1008)
@@ -7,7 +7,6 @@
boot/grub/menu.lst
boot/grub/grubbatch
boot/grub/ipcop.xpm.gz
-boot/grub/minix_stage1_5
boot/grub/stage1
boot/grub/stage2
#usr/bin/mbchk
Modified: ipcop/trunk/lfs/grub
===================================================================
--- ipcop/trunk/lfs/grub 2008-01-14 19:19:40 UTC (rev 1007)
+++ ipcop/trunk/lfs/grub 2008-01-14 19:33:17 UTC (rev 1008)
@@ -92,12 +92,21 @@
# Now patch, compile and install grub
cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -Np1
+ cd $(DIR_APP) && for patch in debian/patches/*.diff; do \
+ patch -Np1 -i $$patch; \
+ done
+
+ cd $(DIR_APP) && autoupdate
+ cd $(DIR_APP) && autoconf
+
cd $(DIR_APP) && ./configure --prefix=/usr \
+ --enable-graphics=yes \
--disable-fat \
--disable-ffs \
--disable-reiserfs \
--disable-vstafs \
--disable-jfs \
+ --disable-minix \
--disable-xfs
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
@@ -106,7 +115,6 @@
mkdir -p /boot/grub
cp -f /usr/lib/grub/i386-pc/e2fs_stage1_5 /boot/grub
- cp -f /usr/lib/grub/i386-pc/minix_stage1_5 /boot/grub
cp -f /usr/lib/grub/i386-pc/stage1 /boot/grub
cp -f /usr/lib/grub/i386-pc/stage2 /boot/grub
@@ -114,6 +122,9 @@
[ -f $$i ] && cp -f $$i /boot/grub; \
done
+ # create 'default' file for 'savedefault' option
+ /usr/sbin/grub-set-default 0
+
install -m 0755 $(DIR_SRC)/config/grub/grubbatch /boot/grub
@rm -rf $(DIR_APP)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|