r365 - in x86/branches/utf8: . packages/wget

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 17 23:07:37 PDT 2005


Author: jhuntwork
Date: 2005-07-18 00:07:36 -0600 (Mon, 18 Jul 2005)
New Revision: 365

Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/wget/Makefile
Log:
Merged -r357 from trunk to utf8

Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-18 05:58:48 UTC (rev 364)
+++ x86/branches/utf8/Makefile	2005-07-18 06:07:36 UTC (rev 365)
@@ -1,37 +1,53 @@
 #
 # Makefiles for automating the LFS LiveCD build
 #
-# Written by Jeremy Huntwork, 2004-1-27
+# Written by Jeremy Huntwork | jhuntwork at linuxfromscratch.org
+# Several additions and edits by Alexander Patrakov
 #
-# jhuntwork at linuxfromscratch.org
+# Last Edited: 2005-07-17
 #
 # Version for x86 arch using LFS 6.1
 #
 #==============================================================================
+#
+# Unless otherwise noted, please try to keep all line lengths below 80 chars. 
+#
 
-# Edit this line to match the mount-point of the
-# partition you'll be using to build the cd.
+
+# Edit this line to match the mount-point of the partition you'll be using to
+# build the cd.
+#==============================================================================
 export MP := /mnt/lfs-utf8
 
+
 # Timezone, obviously ;)
+#==============================================================================
 export timezone := GMT
 
+
 # Page size for groff
+#==============================================================================
 export pagesize := letter
 
-# 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*
-# an absolute file path.)
+
+# Top-level of these Makefiles. Edit this if you've named this directory
+# differently. (The beginning '/' is necessary - this is *not* an absolute file
+# path.)
+#==============================================================================
 export ROOT := /lfs-livecd
 
+
 # Parallel Build Level
+#==============================================================================
 export PM := -j3
 
-# Http server for the lfs-base packages
+
+# Default http server for the lfs-base packages
+#==============================================================================
 export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
 
-# Don't edit these!
+# Version and Directory variables
+#==============================================================================
 export VERSION=x86-6.x-utf8
 export KVERS= 2.6.11.12
 export HOSTNAME := lfslivecd
@@ -41,9 +57,10 @@
 export PKG := packages
 export MKTREE := $(MP)$(ROOT)
 export REDHAT := $(ROOT)/$(PKG)/redhat-patches/devel
-export CFLAGS := -Os -s -march=i486
-export CXXFLAGS := -Os -s -march=i486
-export CHOST := i486-pc-linux-gnu
+
+# Environment Variables
+# The following lines need to be all on one line - no newlines.
+#===============================================================================
 export lfsenv := exec env -i HOME=$$HOME CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c
 
 export lfsbash := set +h && umask 022 && cd $(MKTREE)
@@ -54,6 +71,11 @@
 
 export chenv-blfs := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' 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.68.1/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c
 
+# More Environment Variables
+#==============================================================================
+export CFLAGS := -Os -s -march=i486
+export CXXFLAGS := -Os -s -march=i486
+export CHOST := i486-pc-linux-gnu
 export chbash-pre-bash := SHELL=$(WD)/bin/bash
 export chbash-post-bash := SHELL=/bin/bash
 export WHICH= $(WD)/bin/which
@@ -70,21 +92,22 @@
 WGET_V= 1.9.1
 
 # TARGETS
-#=======================================================================
+#==============================================================================
+#
+# The build starts and ends here, first building the dependency targets,
+# lfs-base, extend-lfs and iso, then it echoes a notice that it's finished. :)
 
-
-# The make build starts and ends here, first building the dependency targets,
-# lfs-base, extend-lfs and iso, then it echos a notice that it's finished. :)
-
 all: test-host lfs-base extend-lfs iso
 	@echo "The livecd, $(MKTREE)/lfslivecd-$(VERSION).iso, is ready!"
 
 test-host:
-	@if [ `whoami` != "root" ] ; then echo "You must be logged in as root." \
+	@if [ `whoami` != "root" ] ; then \
+	 echo "You must be logged in as root." && exit 1 ; fi
+	@if [ `uname -r` != "$(KVERS)" ] ; then \
+	 echo "Please update your host kernel to version $(KVERS)." \
          && exit 1 ; fi
-	@if [ `uname -r` != "$(KVERS)" ] ; then echo "Please update your host kernel to version $(KVERS)." \
-         && exit 1 ; fi
 
+
 # This target builds just a base LFS system, minus the kernel and bootscripts
 #==============================================================================
 lfs-base: lfsuser
@@ -99,15 +122,18 @@
 	@-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin $(SRC) $(MP)$(SRC) $(MKTREE)
 	@cp $(ROOT)/scripts/unpack $(WD)/bin
 	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
-	@if [ ! -f $(PKG)/wget/.pass2 ] ; then make lfs-rm-wget && make lfs-wget ; fi
+	@if [ ! -f $(PKG)/wget/.pass2 ] ; then \
+	 make lfs-rm-wget && make lfs-wget ; fi
 	@touch $(PKG)/wget/.pass2
 	@make prep-chroot
 	@-mkdir $(MP)/bin
 	@if [ ! -f $(MP)/bin/bash ] ; then if [ ! -d $(MP) ] ; then \
 	 mkdir $(MP)/bin ; fi ; ln -s ${WD}/bin/bash ${MP}/bin/bash ; fi
-	@chroot "$(MP)" $(chenv-pre-bash) 'set +h && chown -R 0:0 $(WD) $(SRC) $(ROOT) && \
+	@chroot "$(MP)" $(chenv-pre-bash) 'set +h && \
+	 chown -R 0:0 $(WD) $(SRC) $(ROOT) && \
 	 cd $(ROOT) && make pre-bash $(chbash-pre-bash)'
-	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && make post-bash $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
+	 make post-bash $(chbash-post-bash)'
 	@touch $@
 
 stop-here:
@@ -118,7 +144,8 @@
 extend-lfs:
 	@cp $(WD)/bin/which $(MP)/usr/bin
 	@cp $(ROOT)/scripts/unpack $(MP)/bin
-	@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && make blfs $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
+	 make blfs $(chbash-post-bash)'
 	@make unloadmodule
 	@make unmount
 	@touch $@
@@ -134,20 +161,8 @@
 	@chmod 755 $(WHICH)
 
 pre-wget: 
-	@if [ ! -f /tools/bin/ftpget ] ; then \
-	 echo "#!/bin/sh" > $(FTPGET) && \
-	 echo "if [ ! -f wget-$(WGET_V).tar.gz ] ; then" >> $(FTPGET) && \
-	 echo "ftp -n << END" >> $(FTPGET) && \
-	 echo "open ftp.gnu.org" >> $(FTPGET) && \
-	 echo "user anonymous" >> $(FTPGET) && \
-	 echo "passive" >> $(FTPGET) && \
-	 echo "binary" >> $(FTPGET) && \
-	 echo "cd gnu/wget" >> $(FTPGET) && \
-	 echo "get wget-$(WGET_V).tar.gz" >> $(FTPGET) && \
-	 echo "bye" >> $(FTPGET) && \
-	 echo "END" >> $(FTPGET) && \
-	 echo "fi" >> $(FTPGET) && \
-	 chmod 755 $(FTPGET) ; fi
+	@if [ ! -f $(WD)/bin/ftpget ] ; then \
+	 install -m755 $(ROOT)/scripts/ftpget $(WD)/bin/ ; fi
 	@$(MAKE) -C $(PKG)/wget prebuild
 
 unamemod:
@@ -155,11 +170,15 @@
 	@install -m 755 uname/uname ${WD}/bin/
 	@touch $@
 
-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 \
-	lfs-gawk-scpt lfs-coreutils-scpt lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt lfs-make-scpt \
-	lfs-grep-scpt lfs-sed-scpt lfs-gettext-scpt lfs-ncurses-scpt lfs-patch-scpt lfs-tar-scpt lfs-texinfo-scpt \
-	lfs-bash-scpt lfs-m4-scpt lfs-bison-scpt lfs-flex-scpt lfs-util-linux-scpt lfs-perl-scpt lfs-strip-scpt
+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 lfs-gawk-scpt lfs-coreutils-scpt \
+	lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt \
+	lfs-make-scpt lfs-grep-scpt lfs-sed-scpt lfs-gettext-scpt \
+	lfs-ncurses-scpt lfs-patch-scpt lfs-tar-scpt lfs-texinfo-scpt \
+	lfs-bash-scpt lfs-m4-scpt lfs-bison-scpt lfs-flex-scpt \
+	lfs-util-linux-scpt lfs-perl-scpt lfs-strip-scpt
 	@cp /etc/resolv.conf $(WD)/etc
 
 prep-chroot:
@@ -171,24 +190,33 @@
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
 	@touch $@
 
-pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
-	ch-binutils ch-gcc ch-redhat-patches ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
-	ch-readline ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
-	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
+pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages \
+	ch-glibc ch-re-adjust-toolchain ch-binutils ch-gcc ch-redhat-patches \
+	ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk \
+	ch-sharutils ch-gpm ch-ncurses ch-readline ch-m4 ch-bison ch-less \
+	ch-groff ch-sed ch-flex ch-gettext ch-inetutils 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 \
+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-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
 
-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe ch-screen ch-curl ch-zip \
-	ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion stop-here ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
-	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype ch-fontconfig ch-Xorg ch-freefont ch-inputattach \
-	ch-fonts-dejavu ch-update-fontsdir ch-libjpeg ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 \
-	ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
-	ch-nfs-utils ch-traceroute ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd \
-	ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn \
-	ch-raidtools ch-eject ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux
+blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
+	ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
+	ch-subversion stop-here ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
+	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
+	ch-fontconfig ch-Xorg ch-freefont ch-inputattach ch-fonts-dejavu \
+	ch-update-fontsdir ch-libjpeg ch-libtiff ch-links ch-openssh \
+	ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
+	ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
+	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi \
+	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
+	ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
+	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
+	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-raidtools ch-eject \
+	ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools \
+	ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -343,7 +371,8 @@
 popdev:
 	@if [ ! -c /dev/console ] ; then mknod -m 600 /dev/console c 5 1 && \
 	 mknod -m 666 /dev/null c 1 3 ; fi
-	@if ! tail -n 3 /proc/mounts | grep -q "dev ramfs" ; then mount -n -t ramfs none /dev && \
+	@if ! tail -n 3 /proc/mounts | grep -q "dev ramfs" ; then \
+	 mount -n -t ramfs none /dev && \
 	 mknod -m 662 /dev/console c 5 1 && \
 	 mknod -m 666 /dev/null c 1 3 && \
 	 mknod -m 666 /dev/zero c 1 5 && \
@@ -1432,11 +1461,11 @@
 	make -C $(PKG)/unionfs stage2
 
 ch-strip: popdev
-	@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f -exec $(WD)/bin/strip --strip-debug '{}' ';'
+	@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f \
+	 -exec $(WD)/bin/strip --strip-debug '{}' ';'
 
-##################################
-# Rules to create the iso
-#----------------------------------
+# Targets to create the iso
+#==============================================================================
 
 prepiso: unmount
 	@-rm $(MP)/etc/rc.d/rc{2,3,5}.d/{K,S}21xprint

Modified: x86/branches/utf8/packages/wget/Makefile
===================================================================
--- x86/branches/utf8/packages/wget/Makefile	2005-07-18 05:58:48 UTC (rev 364)
+++ x86/branches/utf8/packages/wget/Makefile	2005-07-18 06:07:36 UTC (rev 365)
@@ -12,7 +12,7 @@
 include $(ROOT)/scripts/functions
 
 $(FILE):
-	@cd $(SRC) ; ftpget
+	@cd $(SRC) ; ftpget $(VRS)
 	@ln -s $(SRC)/$(FILE) .
 	
 




More information about the livecd mailing list