Author: jhuntwork Date: 2005-04-03 15:44:02 -0600 (Sun, 03 Apr 2005) New Revision: 76
Added: trunk/packages/sysklogd/ trunk/uname/Makefile.old Removed: trunk/packages/libol/ trunk/packages/syslog-ng/ trunk/uname/Makefile Modified: trunk/Makefile trunk/etc/issue trunk/packages/LFS-BOOK/Makefile trunk/packages/binutils/Makefile trunk/packages/gcc/Makefile trunk/packages/openssh/Makefile trunk/packages/sysklogd/Makefile trunk/packages/wget/Makefile trunk/scripts/net-setup Log: Added sysklogd and removed syslog-ng/libol Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -20,19 +20,6 @@ # Page size for groff export pagesize := letter -# Change this to 'n' if you don't want to use the -# uname module to build for i486. (Of course, the resultant -# cd will not be an official cd then ;) ) -UNAMEMOD= y - -# Directory where your current compiled kernel source is located. -# This is needed to be able to compile the uname module, if you -# have left UNAMEMOD to its default 'y'. -# Since it's not a good idea to have your kernel source in -# /usr/src/linux, this value should probably be changed to match -# where you have wisely stored your source. :) -LINUXSRC= /mnt/lfs/linux-2.6.10 - # Top-level of these Makefiles. Edit this if you've named # this directory differently. # (The beginning / is necessary - leave it in place - this is *not* @@ -40,7 +27,7 @@ export ROOT := /lfs-livecd # Ftp server for the lfs-base packages -export FTP := ftp://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration +export FTP := ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration # Don't edit these! export VERSION=x86-6.1-1-pre3 @@ -49,13 +36,21 @@ export SRC := /sources export PKG := packages export MKTREE := $(MP)$(ROOT) -export CFLAGS := -Os -s -export lfsenv := exec env -i CFLAGS=' $(CFLAGS) ' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c +export CFLAGS := -Os -s -march=i486 +export CXXFLAGS := -Os -s -march=i486 +export CHOST := i486-pc-linux-gnu +export lfsenv := exec env -i CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c + export lfsbash := set +h && umask 022 && cd $(MKTREE) -export chenv1 := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c -export chenv2 := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c -export chenv3 := /usr/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.67.2/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c + +export chenv1 := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c + +export chenv2 := $(WD)/bin/env -i HOME=/root CFLGAS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c + +export chenv3 := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.67.2/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c + export chenvstrip := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin $(WD)/bin/bash -c + export chbash1 := SHELL=$(WD)/bin/bash export chbash2 := SHELL=/bin/bash export WHICH= $(WD)/bin/which @@ -72,11 +67,13 @@ # lfs-base, extend-lfs and iso, then it echos a handy notice that it's finished. :) all: lfs-base extend-lfs iso - @echo "The livecd, $(MKTREE)/livecd-$(VERSION).iso, is ready!" + @echo "The livecd, $(MKTREE)/lfslivecd-$(VERSION).iso, is ready!" # This target builds just a base LFS system, minus the kernel and bootscripts lfs-base: + @if [ `whoami` != "root" ] ; then echo "You must be logged in as root." \ + && exit 1 ; fi @echo "===============================================================" @echo " Before you begin building the LiveCD image, please ensure " @echo " that the following is true: " @@ -84,13 +81,7 @@ @echo " 1) Your running kernel is the same version as the target " @echo " kernel for the cd." @echo "" - @echo " 2) Your compiled source for your current kernel and the" - @echo " variable LINUXSRC set to that location. (Default is" - @echo " /usr/src/linux). You can set that by passing the variable " - @echo " to make: 'make LINUXSRC=/path/to/kernel/source'" - @echo " This is necessary for building a uname module." - @echo "" - @echo " 3) You have an active internet connection." + @echo " 2) You have an active internet connection." @echo "===============================================================" @echo "" @echo -n -e "Countdown to commence building:" @@ -99,6 +90,7 @@ @-mkdir -p $(MP)$(WD)/bin; ln -s $(MP)$(WD) / @if [ ! -d $(MP)$(SRC) ] ; then mkdir $(MP)$(SRC) ; fi @-ln -sf $(MP)$(SRC) / + @-ln -s $(MP)$(ROOT) / @make lfsuser @-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin $(SRC) $(MP)$(SRC) $(MKTREE) @echo "" @@ -146,14 +138,6 @@ @$(MAKE) -C $(PKG)/wget prebuild unamemod: -ifeq ($(UNAMEMOD),y) - @if [ ! -f uname/uname_i486.ko ] ; then echo "" && echo "=====> Making Uname Module" && echo "" && \ - make -C $(LINUXSRC) SUBDIRS=$(MKTREE)/uname modules ; fi - @lsmod 1> $(WD)/.file - @if ! grep -q uname_i486 $(WD)/.file ; then insmod uname/uname_i486.ko ; fi - @-rm -f $(WD)/.file -else -endif tools: pre-which pre-wget lfs-binutils-pass1-scpt lfs-gcc-pass1-scpt lfs-linux-libc-headers-scpt lfs-glibc-scpt \ lfs-adjust-toolchain-scpt lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2-scpt lfs-binutils-pass2-scpt \ @@ -176,8 +160,8 @@ ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs ch-grep ch-grub ch-gzip \ - ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow ch-libol \ - ch-syslog-ng ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment + ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \ + ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe ch-screen ch-curl ch-gpm ch-zip \ ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \ @@ -543,14 +527,10 @@ make -C $(PKG)/$@ chroot make unmount -libol: unamemod prep-chroot +sysklogd: unamemod prep-chroot make -C $(PKG)/$@ chroot make unmount -syslog-ng: unamemod prep-chroot - make -C $(PKG)/$@ chroot - make unmount - sysvinit: unamemod prep-chroot make -C $(PKG)/$@ chroot make unmount @@ -1070,12 +1050,9 @@ ch-shadow: popdev make -C $(PKG)/shadow stage2 -ch-libol: popdev - make -C $(PKG)/libol stage2 +ch-sysklogd: popdev + make -C $(PKG)/sysklogd stage2 -ch-syslog-ng: popdev - make -C $(PKG)/syslog-ng stage2 - ch-sysvinit: popdev make -C $(PKG)/sysvinit stage2 Modified: trunk/etc/issue =================================================================== --- trunk/etc/issue 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/etc/issue 2005-04-03 21:44:02 UTC (rev 76) @@ -9,7 +9,7 @@ All the source packages you will need to build an LFS system are located in /sources and you can find the book in -/usr/share/LFS-BOOK-testing-HTML. +/usr/share/LFS-BOOK-6.1-HTML. Support questions concerning this cd should be directed to [email protected] Modified: trunk/packages/LFS-BOOK/Makefile =================================================================== --- trunk/packages/LFS-BOOK/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/LFS-BOOK/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -2,7 +2,7 @@ # Package versions NM= LFS-BOOK -VRS= testing +VRS= 6.1 DIR= $(NM)-$(VRS)-HTML URL= svn://svn.linuxfromscratch.org/LFS/branches/$(VRS)/BOOK Modified: trunk/packages/binutils/Makefile =================================================================== --- trunk/packages/binutils/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/binutils/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -19,8 +19,10 @@ mv $(FILE) $(SRC) ; fi @if [ ! -f $(WD)/bin/ld ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ - ../$(DIR)/configure --prefix=$(WD) --disable-nls && make configure-host && make -j3 LDFLAGS="-all-static" && \ - make install && make -C ld clean && make -j3 -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib ; fi + ../$(DIR)/configure --prefix=$(WD) --host=$(CHOST) --target=$(CHOST) --disable-nls && make && \ + make install && \ + make -C ld clean && \ + make -j3 -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib ; fi adjust-toolchain: @echo 'main(){}' > dummy.c && cc dummy.c && readelf -l a.out > .specstest @@ -39,8 +41,11 @@ mv $(FILE) $(SRC) ; fi @if [ ! -f .pass2 ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ - ../$(DIR)/configure --prefix=$(WD) --enable-shared --with-lib-path=$(WD)/lib && \ - make -j3 && make install && make -C ld clean && make -C ld LIB_PATH=/usr/lib:/lib ; fi + ../$(DIR)/configure --prefix=$(WD) --host=$(CHOST) --target=$(CHOST) \ + --enable-shared --with-lib-path=$(WD)/lib && \ + make -j3 && \ + make install && \ + make -C ld clean && make -C ld LIB_PATH=/usr/lib:/lib ; fi @touch .pass2 chroot-re-adjust-toolchain: @@ -64,7 +69,7 @@ mv $(FILE) $(SRC) ; fi @if [ ! -f /usr/bin/ld ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ - ../$(DIR)/configure --prefix=/usr --enable-shared && \ + ../$(DIR)/configure --prefix=/usr --host=$(CHOST) --target=$(CHOST) --enable-shared && \ make -j3 tooldir=/usr && \ make tooldir=/usr install && \ cp ../$(DIR)/include/libiberty.h /usr/include ; fi Modified: trunk/packages/gcc/Makefile =================================================================== --- trunk/packages/gcc/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/gcc/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -30,7 +30,8 @@ if [ ! -f $(WD)/bin/$(NM) ] ; then tar xjvf $(SRC)/$(FILE1) && cd $(DIR) && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib --with-local-prefix=$(WD) \ - --disable-nls --enable-shared && make -j3 BOOT_LDFLAGS="-static" bootstrap && \ + --disable-nls --enable-shared --host=$(CHOST) --target=$(CHOST) && \ + make -j3 bootstrap && \ make install && ln -s gcc $(WD)/bin/cc ; fi @make clean @@ -50,7 +51,8 @@ patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib --with-local-prefix=$(WD) --enable-clocale=gnu \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch && \ + --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \ + --host=$(CHOST) --target=$(CHOST) && \ make -j3 && make install ; fi @make clean @touch .pass2 @@ -79,7 +81,7 @@ sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in && \ mkdir ../$(NM)-build && cd ../$(NM)-build && \ ../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib --enable-shared --enable-threads=posix \ - --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ && \ + --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ --host=$(CHOST) --target=$(CHOST) && \ make -j3 && make install && ln -s ../usr/bin/cpp /lib && ln -s gcc /usr/bin/cc ; fi @make clean Modified: trunk/packages/openssh/Makefile =================================================================== --- trunk/packages/openssh/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/openssh/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -6,7 +6,7 @@ DIR= $(NM)-$(VRS) FILE= $(DIR).tar.gz URL= http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/$(FILE) -HOST-ORIG= `hostname` +HOSTORIG= `hostname` #RULES @@ -30,7 +30,7 @@ ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin --with-md5-passwords && \ make -j3 && make install ; fi @make clean - @hostname $(HOST-ORIG) + @hostname $(HOSTORIG) clean: @-rm -rf $(DIR) Copied: trunk/packages/sysklogd (from rev 75, trunk/packages/syslog-ng) Modified: trunk/packages/sysklogd/Makefile =================================================================== --- trunk/packages/syslog-ng/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/sysklogd/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -1,12 +1,13 @@ -# Syslog-ng Makefile +# Sysklogd Makefile # Package versions -NM= syslog-ng -VRS= 1.6.6 +NM= sysklogd +VRS= 1.6.20 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 +PATCH=$(DIR)-fixes-1.patch URL= $(FTP)/$(NM)/$(FILE) -URL1= $(FTP)/$(NM)/$(PATCH1) +URL1= $(FTP)/$(NM)/$(PATCH) # RULES @@ -22,7 +23,7 @@ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi @if [ ! -d /etc/syslog-ng ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - ./configure --prefix=/usr --sysconfdir=/etc && \ + patch -Np1 -i ../$(PATCH) && \ make -j3 && make install && \ cp -ra $(ROOT)/etc/syslog-ng /etc ; fi @make clean Modified: trunk/packages/wget/Makefile =================================================================== --- trunk/packages/wget/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/packages/wget/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -17,7 +17,7 @@ @if [ ! -f $(FILE) ] ; then ftpget ; fi @if [ ! -f $(WD)/bin/$(NM) ] ; then \ tar xzvf $(FILE) && cd $(DIR) && ./configure --prefix=$(WD) --libdir=$(WD)/lib --without-ssl \ - --enable-static --disable-shared && \ + --enable-static --disable-shared --host=$(CHOST) --target=$(CHOST) && \ make -j3 && make install ; fi @make clean @@ -31,7 +31,7 @@ @if [ ! -f $(FILE) ] ; then $(WD)/bin/ftpget ; fi @if [ ! -f /usr/bin/$(NM) ] ; then \ tar xzvf $(FILE) && cd $(DIR) && \ - ./configure --prefix=/usr --with-ssl && \ + ./configure --prefix=/usr --with-ssl --host=$(CHOST) --target=$(CHOST) && \ make -j3 && make install ; fi @make clean Modified: trunk/scripts/net-setup =================================================================== --- trunk/scripts/net-setup 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/scripts/net-setup 2005-04-03 21:44:02 UTC (rev 76) @@ -7,8 +7,7 @@ # DIR=/etc/sysconfig/network-devices -DHCP=$DIR/ifconfig.eth0/dhcpcd -IPV4=$DIR/ifconfig.eth0/ipv4 +ETH0CFG=$DIR/ifconfig.eth0 IFUP=$DIR/ifup IFDOWN=$DIR/ifdown LINKTEST=`ip link show eth0 2> /dev/null` @@ -51,7 +50,7 @@ echo "$IP is not a valid IP address." set_static_ip; else - echo "IP=$IP" >> $IPV4 + echo "IP=$IP" >> $ETH0CFG fi } @@ -63,7 +62,7 @@ echo "$GTWY is not a valid default gateway." set_static_gateway; else - echo "GATEWAY=$GTWY" >> $IPV4 + echo "GATEWAY=$GTWY" >> $ETH0CFG fi } @@ -79,7 +78,7 @@ echo "$PRFX is not a valid prefix." set_static_prefix; else - echo "PREFIX=$PRFX" >> $IPV4 + echo "PREFIX=$PRFX" >> $ETH0CFG fi else echo "Prefix cannot be empty." @@ -96,7 +95,7 @@ echo "$BRDCST is not a valid broadcast address." set_static_broadcast; else - echo "BROADCAST=$BRDCST" >> $IPV4 + echo "BROADCAST=$BRDCST" >> $ETH0CFG fi } @@ -116,9 +115,9 @@ case "$SERVICE" in dhcp) - echo "SERVICE=dhcpcd" > $DHCP - echo "DHCP_START=\"\"" >> $DHCP - echo "DHCP_STOP=\"-k\"" >> $DHCP + echo "SERVICE=dhcpcd" > $ETH0CFG + echo "DHCP_START=\"\"" >> $ETH0CFG + echo "DHCP_STOP=\"-k\"" >> $ETH0CFG # Start the service $IFUP eth0 @@ -135,7 +134,7 @@ ;; static) - echo "SERVICE=ipv4-static" > $IPV4 + echo "SERVICE=ipv4-static" > $ETH0CFG set_static_ip; set_static_gateway; set_static_prefix; Deleted: trunk/uname/Makefile =================================================================== --- trunk/uname/Makefile 2005-03-31 04:09:33 UTC (rev 75) +++ trunk/uname/Makefile 2005-04-03 21:44:02 UTC (rev 76) @@ -1 +0,0 @@ -obj-m += uname_i486.o Copied: trunk/uname/Makefile.old (from rev 75, trunk/uname/Makefile) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
