r1199 - in tags: . 6.1.1-1 6.1.1-1/initramfs 6.1.1-1/packages/LFS-BOOK 6.1.1-1/packages/jhalfs 6.1.1-1/packages/lfs-bootscripts 6.1.1-1/packages/linux 6.1.1-1/packages/nALFS-profile 6.1.1-1/packages/syslinux 6.1.1-1/vars

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Dec 2 15:34:55 PST 2005


Author: justin
Date: 2005-12-02 16:34:53 -0700 (Fri, 02 Dec 2005)
New Revision: 1199

Added:
   tags/6.1.1-1/
   tags/6.1.1-1/Makefile
   tags/6.1.1-1/initramfs/Makefile
   tags/6.1.1-1/packages/LFS-BOOK/Makefile
   tags/6.1.1-1/packages/jhalfs/Makefile
   tags/6.1.1-1/packages/lfs-bootscripts/langconf
   tags/6.1.1-1/packages/linux/Makefile
   tags/6.1.1-1/packages/nALFS-profile/Makefile
   tags/6.1.1-1/packages/syslinux/Makefile
   tags/6.1.1-1/vars/vars.x86
Removed:
   tags/6.1.1-1/Makefile
   tags/6.1.1-1/initramfs/Makefile
   tags/6.1.1-1/packages/LFS-BOOK/Makefile
   tags/6.1.1-1/packages/jhalfs/Makefile
   tags/6.1.1-1/packages/lfs-bootscripts/langconf
   tags/6.1.1-1/packages/linux/Makefile
   tags/6.1.1-1/packages/nALFS-profile/Makefile
   tags/6.1.1-1/packages/syslinux/Makefile
   tags/6.1.1-1/vars/vars.x86
Log:
Tagged 6.1.1-1.

Copied: tags/6.1.1-1 (from rev 1193, branches/6.1.1-newmake)

Deleted: tags/6.1.1-1/Makefile
===================================================================
--- branches/6.1.1-newmake/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,433 +0,0 @@
-#
-# Makefiles for automating the LFS LiveCD build
-#
-# Written by Jeremy Huntwork | jhuntwork AT linuxfromscratch DOT org
-# Several additions and edits by Alexander Patrakov, Justin Knierim and
-# Thomas Pegg
-#
-# These scripts are published under the GNU General Public License, version 2
-#
-#==============================================================================
-#
-# Unless otherwise noted, please try to keep all line lengths below 80 chars. 
-#
-
-# Machine architecure, LiveCD version, and specific arch variables.
-#==============================================================================
-
-# Place your personal customizations in Makefile.personal
-# instead of editing this Makefile.
-# Makefile.personal is deliberately not in SVN.
-
--include Makefile.personal
-
-# LFS-ARCH: architecture for which the CD should be built.
-# MP:       mount point
-# timezone: default timezone
-# pagesize: paper size for groff.
-#           In utf8-newmake branch, create /etc/papersize instead
-# ROOT:     name of this directory, as seen from chroot
-# PM:       Parallel Build Level
-# HTTP:     Default http server for the lfs-base packages
-# HTTPBLFS: Default http server for the BLFS packages
-
-export LFS-ARCH ?= x86
-export MP ?= /mnt/lfs
-export timezone ?= GMT
-export pagesize ?= letter
-export ROOT ?= /lfs-livecd
-export PM ?= -j3
-export HTTP ?= http://ftp.lfs-matrix.net/pub/lfs/conglomeration
-export HTTPBLFS ?= http://ftp.lfs-matrix.net/pub/blfs/conglomeration
-
-# Directory variables
-#==============================================================================
-export HOSTNAME := lfslivecd
-export WD := /tools
-export SRC := /sources
-export LFSSRC := /lfs-sources
-export PKG := packages
-export MKTREE := $(MP)$(ROOT)
-export KVERS ?= 2.6.12.5
-
-include vars/vars.x86
-
-# 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 chenv-pre-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
-
-export chenv-post-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
-
-export lfsbash := set +h && umask 022 && cd $(MKTREE)
-
-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.69.1/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c
-
-# More Environment Variables
-#==============================================================================
-export CXXFLAGS := $(CFLAGS)
-
-export chbash-pre-bash := SHELL=$(WD)/bin/bash
-export chbash-post-bash := SHELL=/bin/bash
-export WHICH= $(WD)/bin/which
-export WGET= wget
-
-export BRW= ""
-export RED= ""
-export GREEN= ""
-export ORANGE= ""
-export BLUE= ""
-export WHITE= ""
-
-
-# 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. :)
-
-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." && exit 1 ; fi
-
-# This target builds just a base LFS system, minus the kernel and bootscripts
-#==============================================================================
-lfs-base: lfsuser
-	@if [ ! -d $(MP)$(WD)/bin ] ; then mkdir -p $(MP)$(WD)/bin ; fi
-	@if [ ! -d $(MP)$(SRC) ] ; then mkdir $(MP)$(SRC) ; fi
-	@if [ ! -d $(MP)$(LFSSRC) ] ; then mkdir $(MP)$(LFSSRC) ; fi
-	@-ln -nsf $(MP)$(WD) /
-	@-ln -nsf $(MP)$(SRC) /
-	@-ln -nsf $(MP)$(ROOT) /
-	@-ln -nsf $(MP)$(LFSSRC) /
-	@-make unamemod
-	@-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin \
-	 $(LFSSRC) $(MP)$(LFSSRC) $(SRC) $(MP)$(SRC) $(MKTREE)
-	@cp $(ROOT)/scripts/unpack $(WD)/bin
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
-	@touch $(PKG)/wget/.pass2
-	@make prep-chroot
-	@-mkdir $(MP)/etc
-	@install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} $(MP)/etc
-	@-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) && \
-	 cd $(ROOT) && make pre-bash $(chbash-pre-bash)'
-	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
-	 make post-bash $(chbash-post-bash)'
-	@-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
-
-extend-lfs: prep-chroot
-	@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)'
-	@make unmount
-	@touch $@
-
-lfsuser:
-	@-groupadd lfs
-	@-useradd -s /bin/bash -g lfs -m -k /dev/null lfs
-	@touch $@
-
-pre-which:
-	@echo "#!/bin/sh" > $(WHICH)
-	@echo 'type -pa "$$@" | head -n 1 ; exit $${PIPESTATUS[0]}' >> $(WHICH)
-	@chmod 755 $(WHICH)
-
-pre-wget:
-	@make -C $(PKG)/wget prebuild
-	@touch $@
-	
-unamemod:
-	@if [ ! -d ${WD}/bin ] ; then mkdir ${WD}/bin ; fi
-	@install -m 755 uname/uname ${WD}/bin/
-	@touch $@
-
-tools:  pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
-	lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
-	lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \
-	lfs-binutils-pass2 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-wget-scpt lfs-strip
-	@cp /etc/resolv.conf $(WD)/etc
-
-prep-chroot:
-	@-mkdir -p $(MP)/{proc,sys}
-	@-mount -t proc proc $(MP)/proc
-	@-mount -t sysfs sysfs $(MP)/sys
-	@-mount -f -t tmpfs none $(MP)/dev
-	@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
-	@-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 re-adjust-toolchain ch-binutils ch-gcc ch-coreutils \
-	ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk \
-	ch-m4 ch-bison ch-gpm ch-ncurses ch-readline ch-vim 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 \
-	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux final-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 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 \
-	update-fontsdir ch-libjpeg ch-libtiff ch-libart_lgpl ch-links \
-	ch-openssh ch-pkgconfig ch-glib2 ch-libungif ch-imlib ch-imlib2 \
-	ch-gc ch-w3m ch-cairo \
-	ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox \
-	ch-thunderbird ch-librsvg \
-	ch-startup-notification chroot-gvim ch-xfce ch-vte ch-exo \
-	ch-XML-Parser ch-Terminal ch-irssi \
-	ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
-	ch-traceroute ch-rsync ch-jhalfs ch-sudo \
-	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-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
-	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
-	ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
-	ch-bin86 ch-lilo ch-syslinux ch-nALFS-profile ch-parted
-
-wget-list:
-	@>wget-list ; \
-	 for DIR in packages/* ; do \
-	    make -C $${DIR} wget-list-entry || echo Never mind. ; \
-	 done ; \
-	 sed -i '/^$$/d' wget-list
-
-# Targets for building packages individually. Useful for troubleshooting.
-# These do not generally get used as part of the script. They're for manual
-# use only ie, 'make [target]'
-#==============================================================================
-
-# The following takes the form 'make lfs-[package name]-only'	
-lfs-%-only: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-scpt'"
-
-# The following two take the form 'make lfs-[package name]-only-pass#'	
-lfs-%-only-pass1: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass1'"
-
-lfs-%-only-pass2: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass2'"
-
-# The following takes the form 'make [package name]-only-ch'	
-%-only-ch: prep-chroot
-	make -C $(PKG)/$* chroot
-	make unmount
-
-gvim: prep-chroot
-	make -C $(PKG)/vim chroot3
-	make unmount
-
-# The following takes the form 'make [package name]-clean'
-# Cleans the build directory of a single package.
-
-%-clean:
-	make -C $(PKG)/$* clean
-
-# The targets below can be called manually, but are also used by the
-# scripts internally.
-#==============================================================================
-
-createdirs:
-	@-$(WD)/bin/install -d /{bin,boot,dev,etc/opt,home,lib,mnt}
-	@-$(WD)/bin/install -d /{sbin,srv,usr/local,var,opt}
-	@-$(WD)/bin/install -d /root -m 0750
-	@-$(WD)/bin/install -d /tmp /var/tmp -m 1777
-	@-$(WD)/bin/install -d /media/{floppy,cdrom}
-	@-$(WD)/bin/install -d /usr/{bin,include,lib,sbin,share,src}
-	@-$(WD)/bin/ln -s share/{man,doc,info} /usr
-	@-$(WD)/bin/install -d /usr/share/{doc,info,locale,man}
-	@-$(WD)/bin/install -d /usr/share/{misc,terminfo,zoneinfo}
-	@-$(WD)/bin/install -d /usr/share/man/man{1,2,3,4,5,6,7,8}
-	@-$(WD)/bin/install -d /usr/local/{bin,etc,include,lib,sbin,share,src}
-	@-$(WD)/bin/ln -s share/{man,doc,info} /usr/local
-	@-$(WD)/bin/install -d /usr/local/share/{doc,info,locale,man}
-	@-$(WD)/bin/install -d /usr/local/share/{misc,terminfo,zoneinfo}
-	@-$(WD)/bin/install -d /usr/local/share/man/man{1,2,3,4,5,6,7,8}
-	@-$(WD)/bin/install -d /var/{lock,log,mail,run,spool}
-	@-$(WD)/bin/install -d /var/{opt,cache,lib/{misc,locate},local}
-	@-$(WD)/bin/install -d /opt/{bin,doc,include,info}
-	@-$(WD)/bin/install -d /opt/{lib,man/man{1,2,3,4,5,6,7,8}}
-	@-$(WD)/bin/ln -s $(WD)/bin/{bash,cat,pwd,stty} /bin
-	@-$(WD)/bin/ln -s $(WD)/bin/perl /usr/bin
-	@-$(WD)/bin/ln -s $(WD)/lib/libgcc_s.so{,.1} /usr/lib
-	@-$(WD)/bin/ln -s bash /bin/sh
-
-createfiles:
-	@touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-	@chgrp utmp /var/run/utmp /var/log/lastlog
-	@chmod 664 /var/run/utmp /var/log/lastlog
-	@mv $(WD)/etc/resolv.conf /etc
-
-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 tmpfs" ; then \
-	 mount -n -t tmpfs tmpfs /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 ; \
-	 mknod -m 666 /dev/ptmx c 5 2 ; \
-	 mknod -m 666 /dev/tty c 5 0 ; \
-	 mknod -m 444 /dev/random c 1 8 ; \
-	 mknod -m 444 /dev/urandom c 1 9 ; \
- 	 chown root:tty /dev/{console,ptmx,tty} ; \
-	 ln -s /proc/self/fd /dev/fd ; \
-	 ln -s /proc/self/fd/0 /dev/stdin ; \
-	 ln -s /proc/self/fd/1 /dev/stdout ; \
-	 ln -s /proc/self/fd/2 /dev/stderr ; \
-	 ln -s /proc/kcore /dev/core ; \
-	 mkdir /dev/pts && mount -t devpts -o gid=4,mode=620 none /dev/pts ; \
-	 mkdir /dev/shm && mount -t tmpfs none /dev/shm ; fi
-
-# Do not call the targets below manually! They are used internally and must be
-# called by other targets.
-#==============================================================================
-
-lfs-%-scpt:
-	$(MAKE) -C $(PKG)/$* stage1
-
-lfs-%-pass1:
-	$(MAKE) -C $(PKG)/$* pass1
-
-lfs-%-pass2:
-	$(MAKE) -C $(PKG)/$* pass2
-
-lfs-adjust-toolchain:
-	$(MAKE) -C $(PKG)/binutils adjust-toolchain
-
-lfs-strip:
-	@-strip --strip-debug $(WD)/lib/*
-	@-strip --strip-unneeded $(WD)/{,s}bin/*
-	@-rm -rf $(WD)/{doc,info,man}
-	@touch $@
-
-ch-%: popdev
-	make -C $(PKG)/$* stage2
-
-re-adjust-toolchain:
-	make -C $(PKG)/binutils re-adjust-toolchain
-
-adjusting-toolchain:
-	gcc -dumpspecs | \
-	perl -pi -e 's@/tools/lib/ld@/lib/ld at g;' \
-     	 -e 's@/tools/lib64/ld@/lib64/ld at g;' \
-     	 -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
-     	 `dirname $$(gcc --print-libgcc-file-name)`/specs
-	@touch $@ 
-
-final-environment:
-	@cp -ra $(ROOT)/etc/sysconfig /etc
-	@-cp $(ROOT)/etc/inputrc /etc
-	@-cp $(ROOT)/etc/bashrc /etc
-	@-cp $(ROOT)/etc/profile /etc
-	@-dircolors -p > /etc/dircolors
-	@-cp $(ROOT)/etc/hosts /etc
-	@-cp $(ROOT)/etc/fstab /etc
-
-update-fontsdir:
-	cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ; \
-	/usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
-
-chroot-gvim:
-	make -C $(PKG)/vim stage3
-
-# Targets to create the iso
-#==============================================================================
-
-prepiso: unmount
-	@-rm $(MP)/etc/rc.d/rc{2,3,5}.d/{K,S}21xprint
-	@-rm $(MP)/root/.bash_history
-	@>$(MP)/var/log/btmp
-	@>$(MP)/var/log/wtmp
-	@>$(MP)/var/log/lastlog
-	@install -m644 etc/issue $(MP)/etc/issue
-	@install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/
-	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/boot.msg
-	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
-	@install -m644 doc/README $(MP)/root/README
-	@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
-	@install -m600 root/.bashrc $(MP)/root/.bashrc
-	@install -m644 etc/X11/app-defaults/XTerm $(MP)/etc/X11/app-defaults/XTerm
-	@install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc
-	@install -m755 scripts/{net-setup,greeting,livecd-login,ll,shutdown-helper} $(MP)/usr/bin/
-	@cp -ra root $(MP)/etc/skel
-	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
-	@-mkdir $(MP)/iso
-	@cp -rav $(MP)/lfs-sources $(MP)/iso
-	@cp -rav $(MP)/boot $(MP)/iso
-	@touch $@
-
-$(MP)/iso/.root.sqfs:
-	@$(WD)/bin/mksquashfs $(MP) .root.sqfs -info -e \
-	 boot cross-tools sources lfs-sources tools iso lfs-livecd lost+found tmp proc >sqfs.log 2>&1 && \
-	 mv .root.sqfs $@
-
-iso: prepiso $(MP)/iso/.root.sqfs
-	@cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l --allow-leading-dots -D -o \
-	$(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux.bin \
-	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-	-V "lfslivecd-$(VERSION)" ./
-
-# Targets to clean your tree. 
-#==============================================================================
-
-clean: unmount
-	@-rm -rf $(WD) $(MP)$(WD)
-	@-userdel lfs
-	@-groupdel lfs
-	@-rm -rf /home/lfs
-	@-rm {prepiso,lfsuser,unamemod,prep-chroot,lfs-base,extend-lfs,lfs-strip,}
-	@-rm {sqfs.log,lfs-strip,pre-wget}
-	@-rm $(PKG)/binutils/{,re-}adjust-toolchain
-	@-rm $(PKG)/initramfs/stage2
-	@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
-	@find $(PKG) -name "pass*" -exec rm -rf \{} \;
-	@find $(PKG) -name "stage*" -exec rm -rf \{} \;
-	@find $(PKG) -name "*.log" -exec rm -rf \{} \;
-	@find $(PKG)/*/ -type l -exec rm -fr \{} \;
-	@echo find $(PKG)/binutils/* ! -path '$(PKG)/binutils/vars*' -xtype d -exec rm -rf \{} \;
-	@rm -f $(PKG)/wget/prebuild
-	@rm -f $(PKG)/binutils/{a.out,dummy.c,.spectest}
-	@-rm -f $(SRC) $(ROOT) $(LFSSRC)
-
-scrub: clean
-	@-for i in bin boot dev etc home iso lib media mnt opt proc root sbin srv sys tmp \
-	 usr var ; do rm -rf $(MP)/$$i ; done
-	@-rm lfslivecd-$(VERSION).iso
-
-clean_sources:
-	@-rm $(SRC) ; rm -rf $(LFSSRC) $(MP)$(LFSSRC)
-	@find packages/* -xtype l -exec rm -f \{} \;
-
-unmount:
-	@-umount $(MP)/dev/shm
-	@-umount $(MP)/dev/pts
-	@-umount $(MP)/dev
-	@-umount $(MP)/proc
-	@-umount $(MP)/sys
-	@rm -f $(ROOT)/prep-chroot
-
-.PHONY: unmount clean_sources scrub clean iso chroot-gvim update-fontsdir \
-	final-environment re-adjust-toolchain ch-% lfs-adjust-toolchain \
-	lfs-%-scpt lfs-%-pass1 lfs-%-pass2 popdev createfiles createdirs \
-	gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
-	lfs-rm-wget blfs post-bash pre-bash tools pre-which

Copied: tags/6.1.1-1/Makefile (from rev 1195, branches/6.1.1-newmake/Makefile)

Deleted: tags/6.1.1-1/initramfs/Makefile
===================================================================
--- branches/6.1.1-newmake/initramfs/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/initramfs/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,57 +0,0 @@
-# Makefile for initramfs included on the LFS livecd
-
-NM= initramfs
-VRS= 1
-
-MK= mknod
-CP= cp
-WDIR= temp
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile
-	@make compile-$@
-	@make clean
-	@touch $@
-
-compile-stage2: init
-	mkdir -p $(WDIR)/{dev,bin,.tmpfs,.union}
-	$(CP) init $(WDIR)/
-	$(MK) -m 640 $(WDIR)/dev/console c 5 1
-	$(MK) -m 660 $(WDIR)/dev/hda b 3 0
-	$(MK) -m 660 $(WDIR)/dev/hdb b 3 64
-	$(MK) -m 660 $(WDIR)/dev/hdc b 22 0
-	$(MK) -m 660 $(WDIR)/dev/hdd b 22 64
-	$(MK) -m 660 $(WDIR)/dev/hde b 33 0
-	$(MK) -m 660 $(WDIR)/dev/hdf b 33 64
-	$(MK) -m 660 $(WDIR)/dev/hdg b 34 0
-	$(MK) -m 660 $(WDIR)/dev/hdh b 34 64
-	$(MK) -m 664 $(WDIR)/dev/null c 1 3
-	$(MK) -m 660 $(WDIR)/dev/sr0 b 11 0
-	$(MK) -m 660 $(WDIR)/dev/sr1 b 11 1
-	$(MK) -m 660 $(WDIR)/dev/sr2 b 11 2
-	$(MK) -m 660 $(WDIR)/dev/sr3 b 11 3
-	$(MK) -m 660 $(WDIR)/dev/sr4 b 11 4
-	$(MK) -m 660 $(WDIR)/dev/sr5 b 11 5
-	$(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
-	$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
-	$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
-	cd $(WDIR); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
-	$(CP) initramfs_data.cpio.gz /boot/initramfs_data_cpio.gz
-	rm -rf temp
-
-init:
-	gcc $@.c -o $@ -static -Os -s -Wall -DVOLUME_ID=\"lfslivecd-$(VERSION)\"
-
-clean:
-	-rm -rf temp
-	-rm -f initramfs_data*
-	-rm -f init
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/initramfs/Makefile (from rev 1195, branches/6.1.1-newmake/initramfs/Makefile)

Deleted: tags/6.1.1-1/packages/LFS-BOOK/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/LFS-BOOK/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/LFS-BOOK/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,34 +0,0 @@
-# LFS Book Makefile
-
-NM= LFS-BOOK
-VRS= 6.1.1
-DIR= $(NM)-$(VRS)-HTML
-
-URL= svn://svn.linuxfromscratch.org/LFS/branches/$(VRS)/BOOK
-FIREFOX_CONFIG= $(ROOT)/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile
-	@$(call echo_message, Building)
-	@svn co -q $(URL) $(NM)
-	@cd $(NM) ; make BASEDIR=../$(DIR)
-	cp -av $(DIR) /usr/share
-	@sed -i \
-	 's at file:///.*index.html at file:///usr/share/$(DIR)/index.html@' \
-	 $(FIREFOX_CONFIG)
-	@sed -i 's at WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(DIR)/index.html\"@' \
-	 $(ROOT)/etc/profile
-	@make clean >$(DIR)-$@.log 2>&1
-	@touch $@
-
-clean:
-	-rm -rf $(NM) $(DIR)
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/packages/LFS-BOOK/Makefile (from rev 1194, branches/6.1.1-newmake/packages/LFS-BOOK/Makefile)

Deleted: tags/6.1.1-1/packages/jhalfs/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/jhalfs/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/jhalfs/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,28 +0,0 @@
-# jhalfs Makefile
-
-NM= jhalfs
-VRS= 0.2
-DIR= $(NM)-$(VRS)
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile
-	@$(call echo_message, Building)
-	@svn co svn://linuxfromscratch.org/ALFS/jhalfs/branches/$(VRS) $(DIR)
-	@make CROSSVARS=../$(CROSSVARS) -C $(DIR) -f ../Makefile compile-$@ >>$(DIR)-$@.log 2>&1
-	@make clean >>$(DIR)-$@.log 2>&1
-	@touch $@
-
-compile-stage2:
-	make install
-
-clean:
-	-rm -rf $(DIR)
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/packages/jhalfs/Makefile (from rev 1197, branches/6.1.1-newmake/packages/jhalfs/Makefile)

Deleted: tags/6.1.1-1/packages/lfs-bootscripts/langconf
===================================================================
--- branches/6.1.1-newmake/packages/lfs-bootscripts/langconf	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/lfs-bootscripts/langconf	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Get a well-defined sort order
-LC_ALL=C
-export LC_ALL
-
-if [ ! -z "$LANG" ] ; then
-	# Assume that the locale is already configured, and the
-	# keymap is satisfactory
-	exit 0
-fi
-
-LOCALES=`cat /boot/locales*.msg | grep _ | \
-    sed 's, ,\n,g' | grep -v '^$' | sort`
-
-ARGS="C Default "
-for L in $LOCALES ; do
-	ARGS="$ARGS $L \"`LC_ALL=$L locale language`\" "
-done
-
-DLG_COMMAND="dialog --title \"Locale configuration\" --default-item C \
-    --timeout 20 --menu \"Select your locale from the list below\" 0 0 0 \
-    $ARGS"
-
-LANG_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
-
-if [ $? -ne 0 ] ; then
-	exit 0
-fi
-
-echo "LANG=$LANG_SELECTED" >>/etc/environment
-echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/sysconfig/rc
-echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/profile
-
-KEYMAPS=`cat /boot/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
-ARGS="Default \"\" "
-for K in $KEYMAPS ; do
-	ARGS="$ARGS $K \"\" "
-done
-DLG_COMMAND="dialog --title \"Keyboard configuration\" --default-item Default \
-    --menu \"Select your keyboard layout from the list below\" 0 0 0 \
-    $ARGS"
-KEYMAP_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
-
-if [ $? -ne 0 ] ; then
-	exit 0
-fi
-
-if [ "$KEYMAP_SELECTED" = "Default" ] ; then
-	exit 0
-fi
-
-echo "KEYMAP=$KEYMAP_SELECTED" >>/etc/sysconfig/console

Copied: tags/6.1.1-1/packages/lfs-bootscripts/langconf (from rev 1195, branches/6.1.1-newmake/packages/lfs-bootscripts/langconf)

Deleted: tags/6.1.1-1/packages/linux/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/linux/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/linux/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,45 +0,0 @@
-# Linux Kernel Makefile
-
-NM= linux
-VRS= $(KVERS)
-DIR= $(NM)-$(VRS)
-
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= fa23a2508a82d17c414adc00cca4557d331a3393
-
-PATCH1= reiser4-for-2.6.12-3.patch.gz
-URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.12/$(PATCH1)
-SHA-$(PATCH1)= a56513748661db102d75a576d053f6bd78fd2294
-
-PATCH2= squashfs2.2-patch
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile $(FILE) $(PATCH1)
-	$(std_build)
-	cp $(SRC)/$(FILE) $(LFSSRC)/
-
-compile-stage2:
-	zcat ../$(PATCH1) > ../reiser4.patch
-	patch -Np1 -i ../reiser4.patch
-	patch -Np1 -i ../$(PATCH2)
-	cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
-	make mrproper
-	cp ../config.$(LFS-ARCH) .config
-	make $(PM)
-	make modules_install
-	cp -v arch/i386/boot/bzImage /boot/linux
-	cd .. ; ./debian-style-headers.sh linux-$(KVERS)
-
-clean:
-	-rm -rf $(DIR)
-	-rm reiser4.patch
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/packages/linux/Makefile (from rev 1196, branches/6.1.1-newmake/packages/linux/Makefile)

Deleted: tags/6.1.1-1/packages/nALFS-profile/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/nALFS-profile/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/nALFS-profile/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,31 +0,0 @@
-# nALFS profile Makefile
-
-NM= profile
-VRS= LFS-6.1-1
-DIR= $(VRS)
-
-FILE= $(NM)-$(DIR).tar.bz2
-URL-$(FILE)= http://www.linuxfromscratch.org/alfs/downloads/profiles/stable/$(FILE)
-SHA-$(FILE)= a421647b85d0c19ef9888e0e68976f3b1a1264e1
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile $(FILE)
-	$(std_build)
-
-compile-stage2:
-	sed -i 's@/your/$(DIR)/packages@/sources at g' config/general.ent
-	# Temporary fix for LFS-6.1 profile
-	sed -i 's@/usr/local@/usr at g' runit.sh
-	cp -rav . /root/nALFS-profile-$(DIR)
-
-clean:
-	-rm -rf $(DIR)
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/packages/nALFS-profile/Makefile (from rev 1198, branches/6.1.1-newmake/packages/nALFS-profile/Makefile)

Deleted: tags/6.1.1-1/packages/syslinux/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/syslinux/Makefile	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/packages/syslinux/Makefile	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,30 +0,0 @@
-# Syslinux Makefile
-
-NM= syslinux
-VRS= 3.11
-DIR= $(NM)-$(VRS)
-
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/utils/boot/syslinux/$(FILE)
-SHA-$(FILE)= d04e012de1e6fed25083d1ba24d3c096493c2b3a
-
-# Targets
-
-include $(ROOT)/scripts/functions
-
-chroot:
-	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile $(FILE)
-	$(std_build)
-
-compile-stage2:
-	cp -v isolinux.bin /boot/
-	cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
-
-
-clean:
-	-rm -rf $(DIR)
-
-.PHONY: clean chroot compile-stage2

Copied: tags/6.1.1-1/packages/syslinux/Makefile (from rev 1195, branches/6.1.1-newmake/packages/syslinux/Makefile)

Deleted: tags/6.1.1-1/vars/vars.x86
===================================================================
--- branches/6.1.1-newmake/vars/vars.x86	2005-11-30 05:43:08 UTC (rev 1193)
+++ tags/6.1.1-1/vars/vars.x86	2005-12-02 23:34:53 UTC (rev 1199)
@@ -1,4 +0,0 @@
-export VERSION := x86-6.1.1-newmake
-export CFLAGS := -Os -s -march=i486
-export LIB_MAYBE64 := lib
-export KERNEL_ARCH := i386

Copied: tags/6.1.1-1/vars/vars.x86 (from rev 1198, branches/6.1.1-newmake/vars/vars.x86)




More information about the livecd mailing list