Author: justin
Date: 2005-11-12 14:45:14 -0700 (Sat, 12 Nov 2005)
New Revision: 1065
Modified:
branches/dm/doc/README
trunk/etc/profile
trunk/packages/LFS-BOOK/Makefile
trunk/packages/device-mapper/Makefile
trunk/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
Log:
Merged last few differences/updates between trunk and dm. Merged firefox and
profile LFS-BOOK directories, synced doc/README, merged LFS-BOOK gen difference
and install devmapper library.
Modified: branches/dm/doc/README
===================================================================
--- branches/dm/doc/README 2005-11-12 20:51:39 UTC (rev 1064)
+++ branches/dm/doc/README 2005-11-12 21:45:14 UTC (rev 1065)
@@ -92,18 +92,17 @@
instructions below.
* Burn the official CD in multi session mode:
- cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-[version].iso
+ cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-x86-1-[version].iso
* Prepare a directory with the files you want to add, delete or change:
mkdir second-session && cd second-session
vim path/to/new-file
vim path/to/file-to-be-changed
- echo path/to/file1-to-be-deleted >.delete
- echo path/to/file2-to-be-deleted >>.delete
+ touch path/to/.wh.file-to-be-deleted
cd ..
* Make an image contatining those files:
- mkisofs -M lfslivecd-[version].iso \
+ mkisofs -M lfslivecd-x86-6.1-1-[version].iso \
-C `cdrecord -msinfo dev=/dev/cdrom` \
-R -o second-session.iso second-session
Modified: trunk/etc/profile
===================================================================
--- trunk/etc/profile 2005-11-12 20:51:39 UTC (rev 1064)
+++ trunk/etc/profile 2005-11-12 21:45:14 UTC (rev 1065)
@@ -8,7 +8,7 @@
PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig
-WWW_HOME="/usr/share/LFS-BOOK-6.1-HTML/index.html"
+WWW_HOME="/usr/share/LFS-BOOK-trunk-HTML/index.html"
NNTPSERVER=news.linuxfromscratch.org
Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile 2005-11-12 20:51:39 UTC (rev 1064)
+++ trunk/packages/LFS-BOOK/Makefile 2005-11-12 21:45:14 UTC (rev 1065)
@@ -17,8 +17,9 @@
stage2: Makefile
@$(call echo_message, Building)
- @svn co -q $(URL) $(DIR)
- @cd $(DIR) ; make BASEDIR=/usr/share/$(DIR)
+ @svn co -q $(URL) $(NM)
+ @cd $(NM) ; make BASEDIR=../$(DIR)
+ cp -av $(DIR) /usr/share
@sed -i \
'[EMAIL PROTECTED]:///[EMAIL
PROTECTED]:///usr/share/$(DIR)/index.html@' \
$(FIREFOX_CONFIG)
@@ -28,6 +29,6 @@
@touch $@
clean:
- -rm -rf $(DIR)
+ -rm -rf $(NM) $(DIR)
.PHONY: clean chroot compile-stage2
Modified: trunk/packages/device-mapper/Makefile
===================================================================
--- trunk/packages/device-mapper/Makefile 2005-11-12 20:51:39 UTC (rev
1064)
+++ trunk/packages/device-mapper/Makefile 2005-11-12 21:45:14 UTC (rev
1065)
@@ -23,6 +23,7 @@
./configure --prefix=/usr
make $(PM)
make install
+ install -m644 lib/ioctl/libdevmapper.a /usr/lib
clean:
-rm -rf $(DIR)
Modified: trunk/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
===================================================================
--- trunk/root/.mozilla/firefox/2qwpcv2u.default/prefs.js 2005-11-12
20:51:39 UTC (rev 1064)
+++ trunk/root/.mozilla/firefox/2qwpcv2u.default/prefs.js 2005-11-12
21:45:14 UTC (rev 1065)
@@ -11,7 +11,7 @@
user_pref("browser.preferences.lastpanel", 0);
user_pref("browser.search.selectedEngine", "Google");
-user_pref("browser.startup.homepage",
"file:///usr/share/LFS-BOOK-6.1-HTML/index.html");
+user_pref("browser.startup.homepage",
"file:///usr/share/LFS-BOOK-trunk-HTML/index.html");
user_pref("browser.startup.homepage_override.mstone", "rv:1.7.7");
user_pref("extensions.disabledObsolete", true);
user_pref("extensions.lastAppVersion", "1.0");
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
