Author: jhuntwork
Date: 2005-05-14 08:37:40 -0600 (Sat, 14 May 2005)
New Revision: 155
Added:
trunk/packages/distcc/
trunk/packages/distcc/Makefile
Modified:
trunk/Makefile
trunk/TODO
trunk/packages/template/Makefile
Log:
Added distcc
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-05-14 14:30:29 UTC (rev 154)
+++ trunk/Makefile 2005-05-14 14:37:40 UTC (rev 155)
@@ -173,12 +173,13 @@
blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe
ch-screen ch-curl ch-zip \
ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts
ch-docbook-xml ch-libxslt \
- ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype
ch-fontconfig ch-Xorg ch-freefont ch-fonts-dejavu ch-update-fontsdir ch-libjpeg
\
- ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 ch-libungif
ch-imlib2 ch-pango ch-atk ch-gtk2 ch-cvs \
- ch-libIDL ch-firefox ch-startup-notification ch-xfce ch-lua ch-ion
ch-irssi ch-xchat ch-samba ch-tcpwrappers ch-portmap \
- ch-nfs-utils ch-traceroute ch-ncftp ch-pciutils ch-nALFS
ch-device-mapper ch-LVM2 ch-dhcpcd ch-ppp ch-rp-pppoe ch-libaal \
- ch-reiser4progs ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn
ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
- ch-syslinux
+ ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype
ch-fontconfig ch-Xorg ch-freefont \
+ ch-fonts-dejavu ch-update-fontsdir ch-libjpeg ch-libtiff ch-links
ch-openssh ch-pkgconfig ch-glib2 \
+ ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 ch-cvs ch-libIDL
ch-firefox ch-startup-notification \
+ ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-samba ch-tcpwrappers
ch-portmap ch-nfs-utils ch-traceroute \
+ 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-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn
ch-linux ch-klibc ch-unionfs \
+ ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux
# Rules for building tools/stage1
# These can be called individually, if necessary
@@ -805,6 +806,10 @@
make -C $(PKG)/$@ chroot
make unmount
+distcc: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
ppp: prep-chroot
make -C $(PKG)/$@ chroot
make unmount
@@ -1328,6 +1333,9 @@
ch-dhcpcd: popdev
make -C $(PKG)/dhcpcd stage2
+ch-distcc: popdev
+ make -C $(PKG)/distcc stage2
+
ch-ppp: popdev
make -C $(PKG)/ppp stage2
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-05-14 14:30:29 UTC (rev 154)
+++ trunk/TODO 2005-05-14 14:37:40 UTC (rev 155)
@@ -11,6 +11,5 @@
* Find out exact requirements for Intel framebuffer
* Reduce dhcpcd timeout. The boot process appears to hang when there is no
DHCP server in the network.
* Add raid-tools
-* Add distcc
* Change /etc/issue information to acknowledge work done by the new livecd
team as well.
Should we list team members?
Added: trunk/packages/distcc/Makefile
===================================================================
--- trunk/packages/distcc/Makefile 2005-05-14 14:30:29 UTC (rev 154)
+++ trunk/packages/distcc/Makefile 2005-05-14 14:37:40 UTC (rev 155)
@@ -0,0 +1,28 @@
+# distcc Makefile
+
+# Package versions
+NM= distcc
+VRS= 2.18.3
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://distcc.samba.org/ftp/$(NM)/$(FILE)
+
+# RULES
+
+.PHONY: clean stage2 chroot
+
+chroot:
+ @chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+
+stage2:
+ @echo ""
+ @echo "=====> Building $(NM) in chroot"
+ @echo ""
+ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) ; fi
+ @if [ ! -f /bin/ls ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
+ ./configure --prefix=/usr && \
+ make -j3 && make install ; fi
+ @make clean
+
+clean:
+ @-rm -rf $(DIR)
Modified: trunk/packages/template/Makefile
===================================================================
--- trunk/packages/template/Makefile 2005-05-14 14:30:29 UTC (rev 154)
+++ trunk/packages/template/Makefile 2005-05-14 14:37:40 UTC (rev 155)
@@ -19,7 +19,7 @@
@echo "=====> Building $(NM)"
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
+ mv $(FILE) $(SRC) ; fi # This command, mv file to sources directory,
is only for LFS Core packages and patches
@if [ ! -f $(WD)/bin/ls ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR)
&& \
./configure --prefix=$(WD) && make -j3 && make install ; fi
@make clean
@@ -40,9 +40,9 @@
@echo "=====> Building $(NM) in chroot"
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
+ mv $(FILE) $(SRC) ; fi # This command, mv file to sources directory,
is only for LFS Core packages and patches
@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
- mv $(PATCH1) $(SRC) ; fi
+ mv $(PATCH1) $(SRC) ; fi # This command, mv file to sources directory,
is only for LFS Core packages and patches
@if [ ! -f /bin/ls ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
patch -Np1 -i $(SRC)/$(PATCH1) && \
./configure --prefix=/usr && \
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
