Author: justin
Date: 2005-11-16 21:49:47 -0700 (Wed, 16 Nov 2005)
New Revision: 1074
Modified:
branches/6.1.1-1/packages/bash/Makefile
branches/6.1.1-1/packages/binutils/Makefile
branches/6.1.1-1/packages/glibc/Makefile
branches/6.1.1-1/packages/module-init-tools/Makefile
branches/6.1.1-1/packages/udev/Makefile
Log:
Updated 6.1.1-1 LiveCD branch to trunk LFS commands and versions.
Modified: branches/6.1.1-1/packages/bash/Makefile
===================================================================
--- branches/6.1.1-1/packages/bash/Makefile 2005-11-15 04:17:08 UTC (rev
1073)
+++ branches/6.1.1-1/packages/bash/Makefile 2005-11-17 04:49:47 UTC (rev
1074)
@@ -5,11 +5,13 @@
VRS= 3.0
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
+FILE2= $(NM)-doc-$(VRS).tar.bz2
PATCH1= $(DIR)-avoid_WCONTINUED-1.patch
PATCH2= $(DIR)-fixes-3.patch
URL= $(HTTP)/$(NM)/$(FILE)
URL1= $(HTTP)/$(NM)/$(PATCH1)
URL2= $(HTTP)/$(NM)/$(PATCH2)
+URL3= $(HTTP)/$(NM)/$(FILE2)
# RULES
@@ -23,6 +25,8 @@
mv $(FILE) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
mv $(PATCH1) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL3) && \
+ mv $(FILE2) $(SRC) ; fi
@if [ ! -f $(WD)/bin/bash ] ; then unpack $(SRC)/$(FILE) && cd $(DIR)
&& \
patch -Np1 -i $(SRC)/$(PATCH1) && \
./configure --prefix=$(WD) --without-bash-malloc && make && make
install && \
@@ -43,6 +47,8 @@
@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
mv $(PATCH2) $(SRC) ; fi
@if [ ! -f /bin/bashbug ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+ tar -xfv $(SRC)/$(FILE2) && \
+ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" && \
patch -Np1 -i $(SRC)/$(PATCH2) && patch -Np1 -i $(SRC)/$(PATCH1) && \
./configure --prefix=/usr --bindir=/bin --without-bash-malloc
--with-installed-readline && \
make && rm /bin/bash && make install ; fi
Modified: branches/6.1.1-1/packages/binutils/Makefile
===================================================================
--- branches/6.1.1-1/packages/binutils/Makefile 2005-11-15 04:17:08 UTC (rev
1073)
+++ branches/6.1.1-1/packages/binutils/Makefile 2005-11-17 04:49:47 UTC (rev
1074)
@@ -6,6 +6,8 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(HTTP)/$(NM)/$(FILE)
+PATCH1= $(DIR)-gcc4-1.patch
+URL1= $(HTTP)/$(NM)/$(PATCH1)
# RULES
@@ -17,8 +19,11 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
+ mv $(PATCH1) $(SRC) ; fi
@if [ ! -f $(WD)/bin/ld ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
+ patch -Np1 -i $(SRC)/$(PATCH1) && \
../$(DIR)/configure --prefix=$(WD) --disable-nls && make && \
make install && \
make -C ld clean && \
Modified: branches/6.1.1-1/packages/glibc/Makefile
===================================================================
--- branches/6.1.1-1/packages/glibc/Makefile 2005-11-15 04:17:08 UTC (rev
1073)
+++ branches/6.1.1-1/packages/glibc/Makefile 2005-11-17 04:49:47 UTC (rev
1074)
@@ -7,9 +7,11 @@
FILE= $(DIR).tar.bz2
FILE1= $(NM)-linuxthreads-$(VRS).tar.bz2
PATCH= $(DIR)-fix_test-1.patch
+PATCH2= $(DIR)-rtld_search_dirs-1.patch
URL= $(HTTP)/$(NM)/$(FILE)
URL1= $(HTTP)/$(NM)/$(FILE1)
-URL2= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH)
+URL2= $(HTTP)/$(NM)/$(PATCH)
+URL3= $(HTTP)/$(NM)/$(PATCH2)
# RULES
@@ -23,6 +25,8 @@
mv $(FILE) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL2) && \
mv $(PATCH) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL3) && \
+ mv $(PATCH2) $(SRC) ; fi
@if [ ! -f $(WD)/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) &&
\
patch -Np1 -i $(SRC)/$(PATCH) && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
@@ -48,6 +52,7 @@
@if [ ! -f /usr/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
unpack $(SRC)/$(FILE1) && \
patch -Np1 -i $(SRC)/$(PATCH) && \
+ patch -Np1 -i $(SRC)/$(PATCH2) && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
../$(DIR)/configure --prefix=/usr --disable-profile --enable-add-ons
--enable-kernel=2.6.0 \
--without-cvs --libexecdir=/usr/lib/glibc && PARALLELMFLAGS=-j3 make
&& \
Modified: branches/6.1.1-1/packages/module-init-tools/Makefile
===================================================================
--- branches/6.1.1-1/packages/module-init-tools/Makefile 2005-11-15
04:17:08 UTC (rev 1073)
+++ branches/6.1.1-1/packages/module-init-tools/Makefile 2005-11-17
04:49:47 UTC (rev 1074)
@@ -6,7 +6,8 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+FILE2= $(NM)-testsuite-$(VRS).tar.bz2
+URL1= $(HTTP)/$(NM)/$(FILE2)
# RULES
@@ -21,12 +22,13 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL1) && \
+ mv $(FILE2) $(SRC) ; fi
@if [ ! -f /sbin/modprobe ] ; then unpack $(SRC)/$(FILE) && cd $(DIR)
&& \
touch modprobe.conf.5 && \
./configure --prefix="" --enable-zlib && \
make -j3 && make install ; fi
@make clean
-
clean:
@-rm -rf $(DIR)
Modified: branches/6.1.1-1/packages/udev/Makefile
===================================================================
--- branches/6.1.1-1/packages/udev/Makefile 2005-11-15 04:17:08 UTC (rev
1073)
+++ branches/6.1.1-1/packages/udev/Makefile 2005-11-17 04:49:47 UTC (rev
1074)
@@ -5,7 +5,7 @@
VRS= 056
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-FILE1= $(NM)-config-4.rules
+FILE1= $(NM)-config-5.rules
URL= $(HTTP)/$(NM)/$(FILE)
URL1= $(HTTP)/$(NM)/$(FILE1)
@@ -25,7 +25,7 @@
@if [ ! -f $(SRC)/$(FILE1) ] ; then $(WGET) $(URL1) && \
mv $(FILE1) $(SRC) ; fi
@if [ ! -f /sbin/udevstart ] ; then unpack $(SRC)/$(FILE) && cd $(DIR)
&& \
- make udevdir=/dev && make udevdir=/dev install && \
+ make udevdir=/dev && make DESTDIR=/ udevdir=/dev install && \
cp $(SRC)/$(FILE1) /etc/udev/rules.d/25-lfs.rules && \
/sbin/udevstart ; fi
@make clean
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
