Removed directfb from deps of videolan and sdl

[people/teissler/ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 1fa8dcb8b7ae725df1613c5cfcc78909ddb58b38..59cb947b44b31a7d8fa7835e03b5c546ca3b2a72 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -51,20 +49,17 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create directories
-       -mkdir -pv /{bin,boot,etc/opt,home,lib,mnt,opt}
-       -mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
+       -mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt}
+       -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
        -install -dv -m 0750 /root
        -install -dv -m 1777 /tmp /var/tmp
        -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
        -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
        -mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
        -mkdir -pv /usr/{,local/}share/man/man{1..8}
-       -for dir in /usr /usr/local; do \
-         ln -sv share/{man,doc,info} $$dir; \
-       done
-
-       # Permissions
-       chmod 0711 /var/empty
+       #-for dir in /usr /usr/local; do \
+       #  ln -sv share/{man,doc,info} $$dir; \
+       #done
        
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
@@ -78,7 +73,17 @@ $(TARGET) :
            [ -f $$i ] && cp $$i /etc; \
        done
        touch /etc/mtab
-       echo "$(NAME) v$(VERSION) - $(SLOGAN)" > /etc/issue
+       echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
+       echo "===============================" >> /etc/issue
+       echo "\n running on \s \r \m"          >> /etc/issue
+
+       # Bash startup files
+       install --directory --mode=0755 --owner=root --group=root /etc/profile.d
+       for i in $(DIR_SRC)/config/profile.d/*; do \
+           [ -f $$i ] && cp $$i /etc/profile.d; \
+       done
+       chmod 755 /etc/bashrc
+       ln -svf ../bashrc /etc/profile.d/bashrc.sh
 
        # Scripts
        for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
@@ -93,8 +98,16 @@ $(TARGET) :
        # Create /var dirs and files
        -mkdir -v /var/{lock,log,mail,run,spool,empty}
        -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
-       touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+       -mkdir -pv /var/log/{counter,calamaris}
+       chown nobody.nobody /var/log/calamaris
+       touch /var/run/utmp /var/log/{btmp,lastlog,wtmp,net-traffic.log}
        chgrp -v utmp /var/run/utmp /var/log/lastlog
        chmod -v 664 /var/run/utmp /var/log/lastlog
 
+       # Permissions
+       chmod 0711 /var/empty
+       
+       # A small hack to include /root to the iso but not all of it's files.
+       touch /root/ipfire
+
        @$(POSTBUILD)