Author: alexander Date: 2006-08-02 10:08:57 -0600 (Wed, 02 Aug 2006) New Revision: 1687
Modified: trunk/etc/profile trunk/packages/LFS-BOOK/Makefile trunk/packages/gaim/Makefile trunk/packages/irssi/Makefile trunk/packages/lfs-bootscripts/Makefile trunk/packages/ppp/Makefile trunk/packages/seamonkey/Makefile trunk/packages/sysklogd/Makefile trunk/packages/xchat/Makefile trunk/root/.mozilla/default/79exklwh.slt/prefs.js Log: Removed stray .svn directories, updated the book and the bootscripts. Modified: trunk/etc/profile =================================================================== --- trunk/etc/profile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/etc/profile 2006-08-02 16:08:57 UTC (rev 1687) @@ -6,7 +6,7 @@ XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog" -WWW_HOME="/usr/share/LFS-BOOK-trunk-HTML/index.html" +WWW_HOME="/usr/share/LFS-BOOK-6.2-HTML/index.html" NNTPSERVER=news.gmane.org Modified: trunk/packages/LFS-BOOK/Makefile =================================================================== --- trunk/packages/LFS-BOOK/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/LFS-BOOK/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -1,13 +1,20 @@ # LFS Book Makefile NM= LFS-BOOK -VRS= trunk -DIR= $(NM)-$(VRS) +VRS= 6.2 +DIRBASE= $(NM)-$(VRS) +DIR= $(DIRBASE)-XML +HTMLDIR= $(DIRBASE)-HTML -REV= 7646 -REVPARM= -r $(REV) +FILE= $(DIR).tar.bz2 +URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) +SHA-$(FILE)= 8bb0076dc9979184f8d03972112cf6baffc98b4c -URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK +#REV= 7646 +#REVPARM= -r $(REV) +# +#URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK + SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js # Targets @@ -18,20 +25,21 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(PATCH50) +stage2: Makefile @$(call echo_message, Building) - @svn co -q $(REVPARM) $(URL) $(DIR)-XML - @cd $(DIR)-XML ; make BASEDIR=../$(DIR)-HTML - cp -av $(DIR)-{XML,HTML} /usr/share + [EMAIL PROTECTED] co -q $(REVPARM) $(URL) $(DIR)-XML + tar xf $(FILE) + @cd $(DIR) ; make BASEDIR=../$(HTMLDIR) + cp -av $(DIR) $(HTMLDIR) /usr/share @sed -i \ - '[EMAIL PROTECTED]:///[EMAIL PROTECTED]:///usr/share/$(DIR)-HTML/index.html@' \ + '[EMAIL PROTECTED]:///[EMAIL PROTECTED]:///usr/share/$(HTMLDIR)/index.html@' \ $(SEAMONKEY_CONFIG) - @sed -i '[EMAIL PROTECTED]".*\"@WWW_HOME=\"/usr/share/$(DIR)-HTML/index.html\"@' \ + @sed -i '[EMAIL PROTECTED]".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \ $(ROOT)/etc/profile @make clean >$(DIR)[EMAIL PROTECTED] 2>&1 @touch $@ clean: - -rm -rf $(NM) $(DIR)-{XML,HTML} + -rm -rf $(NM) $(DIR) $(HTMLDIR) .PHONY: clean chroot compile-stage2 Modified: trunk/packages/gaim/Makefile =================================================================== --- trunk/packages/gaim/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/gaim/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -25,7 +25,7 @@ ./configure --prefix=/usr make make install - cp -rv $(ROOT)/root/.gaim /root + svn export --force $(ROOT)/root/.gaim /root/.gaim clean: -rm -rf $(DIR) Modified: trunk/packages/irssi/Makefile =================================================================== --- trunk/packages/irssi/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/irssi/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -30,7 +30,7 @@ ./configure --prefix=/usr --sysconfdir=/etc --enable-static make $(PM) make install - cp -ra $(ROOT)/root/.irssi /root + svn export --force $(ROOT)/root/.irssi /root/.irssi clean: -rm -rf $(DIR) Modified: trunk/packages/lfs-bootscripts/Makefile =================================================================== --- trunk/packages/lfs-bootscripts/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/lfs-bootscripts/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -1,12 +1,12 @@ # LFS-Bootscripts Makefile NM= lfs-bootscripts -VRS= 20060712 +VRS= 6.2 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 -URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE) -SHA-$(FILE)= 8fb18a0738d5efb67c2cc8bfba85c978036b6d11 +URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) +SHA-$(FILE)= 616ece5d67a79169e62547141f481ea5150e348c PATCH1= $(DIR)-livecd-1.patch Modified: trunk/packages/ppp/Makefile =================================================================== --- trunk/packages/ppp/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/ppp/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -23,8 +23,9 @@ ./configure --prefix=/usr make $(PM) make install - cp -a $(ROOT)/etc/ppp /etc + svn export --force $(ROOT)/etc/ppp /etc/ppp chown -R 0:0 /etc/ppp + chmod 600 /etc/ppp/pap-secrets clean: -rm -rf $(DIR) Modified: trunk/packages/seamonkey/Makefile =================================================================== --- trunk/packages/seamonkey/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/seamonkey/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -30,7 +30,7 @@ patch -Np1 -i ../$(PATCH1) make -f client.mk build make -f client.mk install - cp -ra $(ROOT)/root/.mozilla /root + svn export --force $(ROOT)/root/.mozilla /root/.mozilla ln -sf seamonkey /usr/bin/mozilla clean: Modified: trunk/packages/sysklogd/Makefile =================================================================== --- trunk/packages/sysklogd/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/sysklogd/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -33,7 +33,7 @@ patch -Np1 -i ../$(PATCH50) make $(PM) make install - cp -ra $(ROOT)/etc/syslog.conf /etc + install -m644 $(ROOT)/etc/syslog.conf /etc clean: -rm -rf $(DIR) Modified: trunk/packages/xchat/Makefile =================================================================== --- trunk/packages/xchat/Makefile 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/packages/xchat/Makefile 2006-08-02 16:08:57 UTC (rev 1687) @@ -23,7 +23,7 @@ ./configure --prefix=/usr make $(PM) make install - cp -ra $(ROOT)/root/.xchat2 /root + svn export --force $(ROOT)/root/.xchat2 /root/.xchat2 clean: -rm -rf $(DIR) Modified: trunk/root/.mozilla/default/79exklwh.slt/prefs.js =================================================================== --- trunk/root/.mozilla/default/79exklwh.slt/prefs.js 2006-08-02 09:42:14 UTC (rev 1686) +++ trunk/root/.mozilla/default/79exklwh.slt/prefs.js 2006-08-02 16:08:57 UTC (rev 1687) @@ -11,7 +11,7 @@ user_pref("browser.preferences.lastpanel", 0); user_pref("browser.search.defaultengine", "engine:///usr/lib/seamonkey-1.0.2/searchplugins/google.src"); -user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-trunk-HTML/index.html"); +user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-6.2-HTML/index.html"); user_pref("browser.startup.homepage_override.mstone", "rv:1.8.0.4"); user_pref("dom.disable_open_during_load", true); user_pref("extensions.disabledObsolete", true); -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
