r1357 - in trunk: etc packages/LFS-BOOK

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Jan 11 19:47:01 PST 2006


Author: alexander
Date: 2006-01-11 20:47:00 -0700 (Wed, 11 Jan 2006)
New Revision: 1357

Modified:
   trunk/etc/issue
   trunk/packages/LFS-BOOK/Makefile
Log:
Updated the book revision on the CD.


Modified: trunk/etc/issue
===================================================================
--- trunk/etc/issue	2006-01-12 03:42:52 UTC (rev 1356)
+++ trunk/etc/issue	2006-01-12 03:47:00 UTC (rev 1357)
@@ -12,9 +12,8 @@
 Please read the /root/README file before using this CD.
 
 All the source packages you will need to build an LFS system
-are located in /lfs-sources.  You can find the standard
-LFS book in /usr/share/LFS-BOOK-trunk-HTML and the UTF8
-version in /usr/share/LFS-BOOK-trunk-HTML-UTF8.
+are located in /lfs-sources.  You can find the
+LFS book in /usr/share/LFS-BOOK-trunk-HTML.
 
 Support questions concerning this CD should be directed to
 livecd at linuxfromscratch.org

Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile	2006-01-12 03:42:52 UTC (rev 1356)
+++ trunk/packages/LFS-BOOK/Makefile	2006-01-12 03:47:00 UTC (rev 1357)
@@ -6,17 +6,13 @@
 
 # Ensure sources match LFS book for "trunk".  Update along with LFS packages.
 ifeq ($(VRS),trunk)
-REV= 7225
+REV= 7272
 REVPARM= -r $(REV)
 endif
 
 URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
-FIREFOX_CONFIG= $(ROOT)/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
+FIREFOX_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js
 
-PATCH50= lfs_book-r7225-utf8-1.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
-SHA-$(PATCH50)= 40a0ca2f045f6e750b7cd0310a2225e78b542587
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -35,12 +31,10 @@
 	 $(FIREFOX_CONFIG)
 	@sed -i 's at WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(DIR)/index.html\"@' \
 	 $(ROOT)/etc/profile
-	@cd $(NM) ; patch -Np0 -i ../$(PATCH50) ; make BASEDIR=../$(DIR)-UTF8
-	cp -av $(DIR)-UTF8 /usr/share
 	@make clean >$(DIR)-$@.log 2>&1
 	@touch $@
 
 clean:
-	-rm -rf $(NM) $(DIR) $(DIR)-UTF8
+	-rm -rf $(NM) $(DIR)
 
 .PHONY: clean chroot compile-stage2




More information about the livecd mailing list