Author: alexander
Date: 2006-04-20 21:26:18 -0600 (Thu, 20 Apr 2006)
New Revision: 1487
Modified:
branches/udev_update/etc/profile
branches/udev_update/packages/LFS-BOOK/Makefile
branches/udev_update/packages/bash/Makefile
branches/udev_update/packages/glibc/Makefile
branches/udev_update/packages/tar/Makefile
branches/udev_update/root/.mozilla/default/79exklwh.slt/prefs.js
Log:
Updated bash patch.
Copied new tar and glibc patches to /lfs-sources.
Updated book.
Modified: branches/udev_update/etc/profile
===================================================================
--- branches/udev_update/etc/profile 2006-04-20 12:38:15 UTC (rev 1486)
+++ branches/udev_update/etc/profile 2006-04-21 03:26:18 UTC (rev 1487)
@@ -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-udev_update-HTML/index.html"
+WWW_HOME="/usr/share/LFS-BOOK-trunk-HTML/index.html"
NNTPSERVER=news.gmane.org
Modified: branches/udev_update/packages/LFS-BOOK/Makefile
===================================================================
--- branches/udev_update/packages/LFS-BOOK/Makefile 2006-04-20 12:38:15 UTC
(rev 1486)
+++ branches/udev_update/packages/LFS-BOOK/Makefile 2006-04-21 03:26:18 UTC
(rev 1487)
@@ -1,13 +1,13 @@
# LFS Book Makefile
NM= LFS-BOOK
-VRS= udev_update
+VRS= trunk
DIR= $(NM)-$(VRS)-HTML
-REV= 7484
+REV= 7553
REVPARM= -r $(REV)
-URL= svn://svn.linuxfromscratch.org/LFS/branches/udev_update/BOOK
+URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
FIREFOX_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js
# Targets
Modified: branches/udev_update/packages/bash/Makefile
===================================================================
--- branches/udev_update/packages/bash/Makefile 2006-04-20 12:38:15 UTC (rev
1486)
+++ branches/udev_update/packages/bash/Makefile 2006-04-21 03:26:18 UTC (rev
1487)
@@ -8,9 +8,9 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 35e8f7eadded3be38df2eb8ac8db094109339d5e
-PATCH1= $(DIR)-fixes-6.patch
+PATCH1= $(DIR)-fixes-7.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 4ea7c1761e720413d4a49a2964cdd3aa30cc560e
+SHA-$(PATCH1)= 2699c7c6f0ee68f4b26d1e0ffbe2c4430388d6e2
FILE1 = $(NM)-doc-$(VRS).tar.bz2
URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
@@ -32,8 +32,8 @@
sed "[EMAIL PROTECTED] \$$(Program)@$(LFS_TARGET)-&@g"
Makefile.in.orig > Makefile.in
echo "ac_cv_func_setvbuf_reversed=no" >> config.cache
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
- ./configure --prefix=$(WD) \
- --without-bash-malloc --host=$(LFS_TARGET) \
+ ./configure --prefix=$(WD) \
+ --without-bash-malloc --host=$(LFS_TARGET) \
--cache-file=config.cache
endif
make
@@ -58,8 +58,8 @@
--with-installed-readline
else
CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline
+ ./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline
endif
make $(PM)
make install
Modified: branches/udev_update/packages/glibc/Makefile
===================================================================
--- branches/udev_update/packages/glibc/Makefile 2006-04-20 12:38:15 UTC
(rev 1486)
+++ branches/udev_update/packages/glibc/Makefile 2006-04-21 03:26:18 UTC
(rev 1487)
@@ -128,6 +128,7 @@
ifndef CROSS
stage2: $(FILE) $(FILE2) $(PATCH1)
$(sep_dir_build)
+ cp $(SRC)/$(PATCH1) $(LFSSRC)/
touch $@
compile-stage2:
@@ -175,9 +176,9 @@
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)
echo "slibdir=/lib64" >> configparms
CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ../$(DIR)/configure --prefix=/usr \
- --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
- --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64
+ ../$(DIR)/configure --prefix=/usr \
+ --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+ --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64
PARALLELMFLAGS="$(PM)" make
touch /etc/ld.so.conf
make install_root=/ install
Modified: branches/udev_update/packages/tar/Makefile
===================================================================
--- branches/udev_update/packages/tar/Makefile 2006-04-20 12:38:15 UTC (rev
1486)
+++ branches/udev_update/packages/tar/Makefile 2006-04-21 03:26:18 UTC (rev
1487)
@@ -46,7 +46,7 @@
stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
$(std_build)
- cp $(SRC)/$(PATCH2) $(LFSSRC)
+ cp $(SRC)/{$(PATCH2),$(PATCH3)} $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
Modified: branches/udev_update/root/.mozilla/default/79exklwh.slt/prefs.js
===================================================================
--- branches/udev_update/root/.mozilla/default/79exklwh.slt/prefs.js
2006-04-20 12:38:15 UTC (rev 1486)
+++ branches/udev_update/root/.mozilla/default/79exklwh.slt/prefs.js
2006-04-21 03:26:18 UTC (rev 1487)
@@ -11,7 +11,7 @@
user_pref("browser.preferences.lastpanel", 0);
user_pref("browser.search.defaultengine",
"engine:///usr/lib/seamonkey-1.0/searchplugins/google.src");
-user_pref("browser.startup.homepage",
"file:///usr/share/LFS-BOOK-udev_update-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.8.0.1");
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
