Author: alexander
Date: 2005-11-16 22:06:19 -0700 (Wed, 16 Nov 2005)
New Revision: 1077
Modified:
branches/dm/Makefile
branches/dm/packages/binutils/Makefile
branches/dm/scripts/functions
Log:
Fixed the wget-list target
Merged r1070 from trunk
Added wireless_tools for real
Modified: branches/dm/Makefile
===================================================================
--- branches/dm/Makefile 2005-11-17 05:03:08 UTC (rev 1076)
+++ branches/dm/Makefile 2005-11-17 05:06:19 UTC (rev 1077)
@@ -333,7 +333,8 @@
ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox \
ch-thunderbird ch-librsvg \
ch-startup-notification chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
- ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
+ ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
+ ch-traceroute \
ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
Modified: branches/dm/packages/binutils/Makefile
===================================================================
--- branches/dm/packages/binutils/Makefile 2005-11-17 05:03:08 UTC (rev
1076)
+++ branches/dm/packages/binutils/Makefile 2005-11-17 05:06:19 UTC (rev
1077)
@@ -68,7 +68,7 @@
adjust-toolchain:
echo 'main(){}' > dummy.c && cc dummy.c && \
readelf -l a.out > .specstest
- if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
+ if ! grep -q $(WD) .specstest ; then cd $(NM)-build && \
make -C ld install && \
SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
gcc -dumpspecs > $$SPECFILE && \
@@ -99,7 +99,7 @@
re-adjust-toolchain:
echo 'main(){}' > dummy.c && cc dummy.c && \
readelf -l a.out > .specstest
- if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
+ if grep -q $(WD) .specstest ; then cd $(NM)-build && \
make -C ld INSTALL=$(WD)/bin/install install && \
SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
gcc -dumpspecs > $$SPECFILE && \
Modified: branches/dm/scripts/functions
===================================================================
--- branches/dm/scripts/functions 2005-11-17 05:03:08 UTC (rev 1076)
+++ branches/dm/scripts/functions 2005-11-17 05:06:19 UTC (rev 1077)
@@ -65,17 +65,17 @@
$(call download,$@,$(URL-$@),$(SHA-$@))
wget-list-entry:
- @echo $(URL-$(FILE)) >>$(MKTREE)/wget-list
- @echo $(URL-$(FILE1)) >>$(MKTREE)/wget-list
- @echo $(URL-$(FILE2)) >>$(MKTREE)/wget-list
- @echo $(URL-$(FILE3)) >>$(MKTREE)/wget-list
- @echo $(URL-$(FILE4)) >>$(MKTREE)/wget-list
- @echo $(URL-$(FILE5)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH1)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH2)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH3)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH4)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH5)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH6)) >>$(MKTREE)/wget-list
- @echo $(URL-$(PATCH7)) >>$(MKTREE)/wget-list
+ @echo $(URL-$(FILE)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(FILE1)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(FILE2)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(FILE3)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(FILE4)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(FILE5)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH1)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH2)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH3)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH4)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH5)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH6)) >>$(MPBASE)$(ROOT)/wget-list
+ @echo $(URL-$(PATCH7)) >>$(MPBASE)$(ROOT)/wget-list
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
