Revision: 6201
http://ipcop.svn.sourceforge.net/ipcop/?rev=6201&view=rev
Author: gespinasse
Date: 2011-12-28 20:30:57 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
No more need of black magic when updating stage2 rootfile.
lfs/stage2 has needed hack that create stage2 rootfile without manual change
required
- /dev, /proc and /sys look installed here (they need to appear somewhere to be
include in iso)
- symlinks made here are not referenced on rootfile (bin/{cat,echo,pwd},
usr/{bin/perl,lib/libgcc_s.so*,lib/libstdc++.so*)
So a file should not appear more than once in rootfile, there is no
enforcement on that rule, just try to be cleaner
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/stage2
ipcop/trunk/lfs/stage2
Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2 2011-12-27 22:34:24 UTC (rev
6200)
+++ ipcop/trunk/config/rootfiles/common/stage2 2011-12-28 20:30:57 UTC (rev
6201)
@@ -1,8 +1,5 @@
-## stage2, we cheat for /dev, /proc and /sys here
-##
#boot
-dev/console
-dev/null
+dev
#etc
etc/certparams
etc/dhcpcd.conf
@@ -38,15 +35,10 @@
#sbin
sys
#usr/bin
-#usr/bin/perl
#usr/doc
#usr/include
#usr/info
#usr/lib
-#usr/lib/libgcc_s.so
-#usr/lib/libgcc_s.so.1
-#usr/lib/libstdc++.so
-#usr/lib/libstdc++.so.6
#usr/local
#usr/local/bin
#usr/local/bin/install-diff.pl
Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2 2011-12-27 22:34:24 UTC (rev 6200)
+++ ipcop/trunk/lfs/stage2 2011-12-28 20:30:57 UTC (rev 6201)
@@ -149,3 +149,9 @@
env
@$(POSTBUILD)
+ # Here stage2 rootfile is hacked, so no manual change is needed
+ # Cheat : pretend /dev, /proc and /sys are created here, when in fact
they are already mounted before stage2 start
+ # Can't simply suppress them after PREBUILD as /dev, /proc and /sys are
excluded from FIND_FILES path
+ grep '^dev$$' $(TARGET) || sed -i -e
's|#boot|&\ndev|;s|mnt|&\nproc|;s|#sbin|&\nsys|' $(TARGET)
+ # Cheat : pretend bin/{cat,echo,pwd},
usr/{bin/perl,lib/libgcc_s.so*,lib/libstdc++.so* are not installed here (only
as symlink here, replaced later)
+ sed -i -e
'/bin\/cat$$/d;/bin\/echo$$/d;/bin\/pwd$$/d;/usr\/bin\/perl$$/d;/usr\/lib\/libgcc_s.so.*/d;/usr\/lib\/libstdc++.so.*/d'
$(TARGET)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
