r104 - in trunk: . isolinux packages/firefox packages/perl

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu Apr 21 05:11:21 PDT 2005


Author: jhuntwork
Date: 2005-04-21 06:11:20 -0600 (Thu, 21 Apr 2005)
New Revision: 104

Modified:
   trunk/Makefile
   trunk/isolinux/isolinux.cfg
   trunk/packages/firefox/Makefile
   trunk/packages/firefox/firstrun
   trunk/packages/perl/Makefile
Log:
Added cvs and some other tweaks to smooth out the build process

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-20 12:04:23 UTC (rev 103)
+++ trunk/Makefile	2005-04-21 12:11:20 UTC (rev 104)
@@ -172,7 +172,7 @@
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe ch-screen ch-curl ch-gpm 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-libjpeg \
-	ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
+	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-cdrtools ch-blfs-bootscripts \
@@ -711,6 +711,10 @@
 	make -C $(PKG)/gtk+2 chroot
 	make unmount
 
+cvs: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 libIDL: prep-chroot
 	make -C $(PKG)/$@ chroot
 	make unmount
@@ -1237,6 +1241,9 @@
 ch-gtk2: popdev
 	make -C $(PKG)/gtk+2 stage2
 
+ch-cvs: popdev
+	make -C $(PKG)/cvs stage2
+
 ch-firefox: popdev
 	make -C $(PKG)/firefox stage2
 

Modified: trunk/isolinux/isolinux.cfg
===================================================================
--- trunk/isolinux/isolinux.cfg	2005-04-20 12:04:23 UTC (rev 103)
+++ trunk/isolinux/isolinux.cfg	2005-04-21 12:11:20 UTC (rev 104)
@@ -9,4 +9,5 @@
   kernel linux
 
 label linux-autosshd
-  kernel linux autosshd
+  kernel linux
+  append autosshd

Modified: trunk/packages/firefox/Makefile
===================================================================
--- trunk/packages/firefox/Makefile	2005-04-20 12:04:23 UTC (rev 103)
+++ trunk/packages/firefox/Makefile	2005-04-21 12:11:20 UTC (rev 104)
@@ -1,4 +1,4 @@
-# Firebox Makefile
+# Firefox Makefile
 
 # Package versions
 NM= firefox
@@ -20,9 +20,9 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/firefox ] ; then tar xjvf $(FILE) && cd $(DIR) && \
-	 cp ../.mozconfig . && \
+	 sed 's!@TOPSRCDIR@!$(ROOT)/$(PKG)/$(NM)/mozilla!' ../.mozconfig > .mozconfig && \
 	 make -f client.mk && make -f client.mk install && \
-	 cd $(ROOT)/$(PKG)/$(NM) && ./firstrun ; fi
+	 cd $(ROOT)/$(PKG)/$(NM) ; fi
 	#@cp -ra $(ROOT)/root/.firefox /root
 	#@cp -ra $(ROOT)/root/.mozilla /root
 	@make clean

Modified: trunk/packages/firefox/firstrun
===================================================================
--- trunk/packages/firefox/firstrun	2005-04-20 12:04:23 UTC (rev 103)
+++ trunk/packages/firefox/firstrun	2005-04-21 12:11:20 UTC (rev 104)
@@ -21,4 +21,3 @@
 then
 	rm $CONF
 fi
-return 0

Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile	2005-04-20 12:04:23 UTC (rev 103)
+++ trunk/packages/perl/Makefile	2005-04-21 12:11:20 UTC (rev 104)
@@ -39,7 +39,7 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f /usr/bin/perl$(VRS) ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
 	 ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" && \
-	 make -j3 && make install ; fi
+	 make && make install ; fi
 	@make clean
 	
 clean:




More information about the livecd mailing list