Author: jhuntwork Date: 2005-07-18 21:18:36 -0600 (Mon, 18 Jul 2005) New Revision: 375
Modified: x86/trunk/Makefile x86/trunk/packages/binutils/Makefile x86/trunk/packages/gcc/Makefile x86/trunk/packages/linux-libc-headers/Makefile Log: Updated linux-libc-headers to new Makefile version Modified: x86/trunk/Makefile =================================================================== --- x86/trunk/Makefile 2005-07-19 02:58:21 UTC (rev 374) +++ x86/trunk/Makefile 2005-07-19 03:18:36 UTC (rev 375) @@ -13,7 +13,12 @@ # Unless otherwise noted, please try to keep all line lengths below 80 chars. # +# LiveCD version and Linux kernel version +#============================================================================== +export VERSION=x86-6.1-1 +export KVERS= 2.6.11.12 + # Edit this line to match the mount-point of the partition you'll be using to # build the cd. #============================================================================== @@ -46,10 +51,8 @@ #============================================================================== export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration -# Version and Directory variables +# Directory variables #============================================================================== -export VERSION=x86-6.1-1 -export KVERS= 2.6.11.12 export HOSTNAME := lfslivecd export WD := /tools export SRC := /sources @@ -113,10 +116,10 @@ @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 -sf $(MP)$(WD) / - @-ln -sf $(MP)$(SRC) / - @-ln -sf $(MP)$(ROOT) / - @-ln -sf $(MP)$(LFSSRC) / + @-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) Modified: x86/trunk/packages/binutils/Makefile =================================================================== --- x86/trunk/packages/binutils/Makefile 2005-07-19 02:58:21 UTC (rev 374) +++ x86/trunk/packages/binutils/Makefile 2005-07-19 03:18:36 UTC (rev 375) @@ -117,7 +117,7 @@ @chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: Makefile $(FILE) +stage2: $(FILE) @$(sep_dir_build) compile-stage2: Modified: x86/trunk/packages/gcc/Makefile =================================================================== --- x86/trunk/packages/gcc/Makefile 2005-07-19 02:58:21 UTC (rev 374) +++ x86/trunk/packages/gcc/Makefile 2005-07-19 03:18:36 UTC (rev 375) @@ -107,7 +107,7 @@ @chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: Makefile $(FILE) $(PATCH1) $(PATCH3) +stage2: $(FILE) $(PATCH1) $(PATCH3) $(sep_dir_build) compile-stage2: Modified: x86/trunk/packages/linux-libc-headers/Makefile =================================================================== --- x86/trunk/packages/linux-libc-headers/Makefile 2005-07-19 02:58:21 UTC (rev 374) +++ x86/trunk/packages/linux-libc-headers/Makefile 2005-07-19 03:18:36 UTC (rev 375) @@ -1,41 +1,58 @@ -# Linux-Libc-Headers Makefile +# Linux-libc-headers Makefile +#============================================================================== -# Package versions NM= linux-libc-headers -VRS= 2.6.11.2 +VRS= 2.6.12.0 DIR= $(NM)-$(VRS) + FILE= $(DIR).tar.bz2 -URL= $(HTTP)/$(NM)/$(FILE) +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) +SHA-$(FILE)= e72c9b260995b269c9fb9248ed468c18fb01f3fd -# RULES +# Targets +# ============================================================================= -.PHONY: stage1 chroot stage2 clean +include $(ROOT)/scripts/functions -stage1: - @echo "" - @echo "=====> Building $(NM)" - @echo "" - @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ - mv $(FILE) $(SRC) ; fi - @if [ ! -d $(WD)/include/asm ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \ - cp -R include/asm-i386 $(WD)/include/asm && cp -R include/linux $(WD)/include ; fi - @make clean +stage1: $(FILE) + @$(std_build) + @cp $(SRC)/$(FILE) $(LFSSRC) +compile-stage1: + @$(call echo_message, Installing) +#============================================================================== +# Install commands below \/ +#============================================================================== + @cp -Rv include/asm-i386 $(WD)/include/asm >../$(DIR)[EMAIL PROTECTED] 2>&1 + @cp -Rv include/linux $(WD)/include >../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages========================================== +# + @$(OK) + chroot: - @chroot "$(MP)" $(chenv-pre-bash) 'cd $(MKTREE) && make ch-linux-libc-headers $(chbash-pre-bash)' + @chroot "$(MP)" $(chenv-pre-bash) \ + 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: - @echo "" - @echo "=====> Building $(NM)" - @echo "" - @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ - mv $(FILE) $(SRC) ; fi - @if [ ! -d /usr/include/asm ] ; then unpack $(SRC)/$(FILE) && \ - cd $(DIR) && cp -R include/asm-i386 /usr/include/asm && cp -R include/linux /usr/include && \ - chown -R root:root /usr/include/{asm,linux} && \ - find /usr/include/{asm,linux} -type d -exec chmod 755 {} \; && \ - find /usr/include/{asm,linux} -type f -exec chmod 644 {} \; ; fi - @make clean +stage2: $(FILE) + @$(std_build) + +compile-stage2: + @$(call echo_message, Installing) +#============================================================================== +# Install commands below \/ +#============================================================================== + @cp -Rv include/asm-i386 /usr/include/asm >../$(DIR)[EMAIL PROTECTED] 2>&1 + @cp -Rv include/linux /usr/include >../$(DIR)[EMAIL PROTECTED] 2>&1 + @chown -R root:root /usr/include/{asm,linux} + @find /usr/include/{asm,linux} -type d -exec chmod 755 {} \; + @find /usr/include/{asm,linux} -type d -exec chmod 644 {} \; +# +#==Status Messages=========================================== +# + @$(OK) + clean: @-rm -rf $(DIR) +.PHONY: compile-stage1 clean chroot compile-stage2 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
