Author: justin
Date: 2005-11-26 22:25:24 -0700 (Sat, 26 Nov 2005)
New Revision: 1169
Modified:
branches/dm/packages/findutils/Makefile
branches/dm/packages/module-init-tools/Makefile
branches/dm/packages/shadow/Makefile
branches/utf8-newmake/packages/findutils/Makefile
branches/utf8-newmake/packages/module-init-tools/Makefile
branches/utf8-newmake/packages/shadow/Makefile
Log:
Merged r1168 (update findutils, module-init-tools, fix install of shadow man
pages from trunk to dm and 6.1.1-newmake.
Modified: branches/dm/packages/findutils/Makefile
===================================================================
--- branches/dm/packages/findutils/Makefile 2005-11-27 05:17:06 UTC (rev
1168)
+++ branches/dm/packages/findutils/Makefile 2005-11-27 05:25:24 UTC (rev
1169)
@@ -1,12 +1,12 @@
# Findutils Makefile
NM= findutils
-VRS= 4.2.25
+VRS= 4.2.26
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 233a6615bdbbcebc396cc989abc3e06cb27d9f28
+SHA-$(FILE)= 872184285ddb6ca7cb14e0c4c5c6b0bd0629541b
# Targets
Modified: branches/dm/packages/module-init-tools/Makefile
===================================================================
--- branches/dm/packages/module-init-tools/Makefile 2005-11-27 05:17:06 UTC
(rev 1168)
+++ branches/dm/packages/module-init-tools/Makefile 2005-11-27 05:25:24 UTC
(rev 1169)
@@ -1,17 +1,13 @@
# Module-Init-Tools Makefile
NM= module-init-tools
-VRS= 3.1
+VRS= 3.2.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= f233cab26208aa7d21a8ca24e4a9712af23a5a1d
+SHA-$(FILE)= f982949eaba759b28ec2cccec9a3625b2c58a299
-FILE1= $(NM)-testsuite-$(VRS).tar.bz2
-URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= bc01e741ba7c125e8266a270523721c349b62a84
-
# Targets
include $(ROOT)/scripts/functions
@@ -20,16 +16,15 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
$(std_build)
- cp $(SRC)/{$(FILE),$(FILE1)} $(LFSSRC)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
- touch modprobe.conf.5
ifndef CROSS
- ./configure --prefix="" --enable-zlib
+ ./configure --prefix="" --enable-zlib --mandir=/usr/share/man
else
- CC="gcc $(64FLAGS)" ./configure --prefix="" --enable-zlib
+ CC="gcc $(64FLAGS)" ./configure --prefix=/ --enable-zlib
endif
make $(PM)
make install
Modified: branches/dm/packages/shadow/Makefile
===================================================================
--- branches/dm/packages/shadow/Makefile 2005-11-27 05:17:06 UTC (rev
1168)
+++ branches/dm/packages/shadow/Makefile 2005-11-27 05:25:24 UTC (rev
1169)
@@ -33,7 +33,7 @@
--enable-shared
endif
sed -i 's/groups$$(EXEEXT) //' src/Makefile
- sed -i '/groups/d' man/Makefile
+ find man -name Makefile -exec sed -i '/groups/d' {} \;
make $(PM)
make install
cp etc/{limits,login.access} /etc
Modified: branches/utf8-newmake/packages/findutils/Makefile
===================================================================
--- branches/utf8-newmake/packages/findutils/Makefile 2005-11-27 05:17:06 UTC
(rev 1168)
+++ branches/utf8-newmake/packages/findutils/Makefile 2005-11-27 05:25:24 UTC
(rev 1169)
@@ -1,12 +1,12 @@
# Findutils Makefile
NM= findutils
-VRS= 4.2.25
+VRS= 4.2.26
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 233a6615bdbbcebc396cc989abc3e06cb27d9f28
+SHA-$(FILE)= 872184285ddb6ca7cb14e0c4c5c6b0bd0629541b
# Targets
Modified: branches/utf8-newmake/packages/module-init-tools/Makefile
===================================================================
--- branches/utf8-newmake/packages/module-init-tools/Makefile 2005-11-27
05:17:06 UTC (rev 1168)
+++ branches/utf8-newmake/packages/module-init-tools/Makefile 2005-11-27
05:25:24 UTC (rev 1169)
@@ -1,17 +1,13 @@
# Module-Init-Tools Makefile
NM= module-init-tools
-VRS= 3.1
+VRS= 3.2.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= f233cab26208aa7d21a8ca24e4a9712af23a5a1d
+SHA-$(FILE)= f982949eaba759b28ec2cccec9a3625b2c58a299
-FILE1= $(NM)-testsuite-$(VRS).tar.bz2
-URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= bc01e741ba7c125e8266a270523721c349b62a84
-
# Targets
include $(ROOT)/scripts/functions
@@ -20,16 +16,15 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
$(std_build)
- cp $(SRC)/{$(FILE),$(FILE1)} $(LFSSRC)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
- touch modprobe.conf.5
ifndef CROSS
- ./configure --prefix="" --enable-zlib
+ ./configure --prefix="" --enable-zlib --mandir=/usr/share/man
else
- CC="gcc $(64FLAGS)" ./configure --prefix="" --enable-zlib
+ CC="gcc $(64FLAGS)" ./configure --prefix=/ --enable-zlib
endif
make $(PM)
make install
Modified: branches/utf8-newmake/packages/shadow/Makefile
===================================================================
--- branches/utf8-newmake/packages/shadow/Makefile 2005-11-27 05:17:06 UTC
(rev 1168)
+++ branches/utf8-newmake/packages/shadow/Makefile 2005-11-27 05:25:24 UTC
(rev 1169)
@@ -33,7 +33,7 @@
--enable-shared
endif
sed -i 's/groups$$(EXEEXT) //' src/Makefile
- sed -i '/groups/d' man/Makefile
+ find man -name Makefile -exec sed -i '/groups/d' {} \;
make $(PM)
make install
cp etc/{limits,login.access} /etc
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
