r1249 - in branches/6.1.1-newmake: doc packages/lfs-bootscripts packages/nALFS-profile packages/shadow packages/subversion packages/sudo

justin at linuxfromscratch.org justin at linuxfromscratch.org
Wed Dec 7 07:50:59 PST 2005


Author: justin
Date: 2005-12-07 08:50:57 -0700 (Wed, 07 Dec 2005)
New Revision: 1249

Modified:
   branches/6.1.1-newmake/doc/README
   branches/6.1.1-newmake/packages/lfs-bootscripts/clkconf
   branches/6.1.1-newmake/packages/nALFS-profile/Makefile
   branches/6.1.1-newmake/packages/shadow/Makefile
   branches/6.1.1-newmake/packages/subversion/Makefile
   branches/6.1.1-newmake/packages/sudo/Makefile
Log:
[6.1.1-newmake] Fixed 6.1 occurances with 6.1.1 in doc/README, removed sed from clkconf to edit login.defs, fixed subversion and sudo install by removing environment variables, commented out ENV_TZ in shadow install, removed old comment from nALFS-profile.

Modified: branches/6.1.1-newmake/doc/README
===================================================================
--- branches/6.1.1-newmake/doc/README	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/doc/README	2005-12-07 15:50:57 UTC (rev 1249)
@@ -64,12 +64,12 @@
 * xlockmore
 * sudo
 
-nALFS & ALFS profile for LFS 6.1
+nALFS & ALFS profile for LFS 6.1.1
 (A tool for automating a Linux From Scratch installation)
 
 jhalfs
-(A tool for extracting commands from the Linux From Scratch book and creating
-Makefiles that can download, check and build each LFS package for you.)
+(A tool to extract commands from the Linux From Scratch book and create a
+Makefile that can download, check and build each LFS package.)
 
 CONFIGURING X
 ===========================
@@ -108,7 +108,7 @@
     cd ..
 
 * Make an image contatining those files:
-    mkisofs -M lfslivecd-x86-6.1-1-[version].iso \
+    mkisofs -M lfslivecd-x86-6.1.1-1-[version].iso \
         -C `cdrecord -msinfo dev=/dev/cdrom` \
 	-R -o second-session.iso second-session
 

Modified: branches/6.1.1-newmake/packages/lfs-bootscripts/clkconf
===================================================================
--- branches/6.1.1-newmake/packages/lfs-bootscripts/clkconf	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/packages/lfs-bootscripts/clkconf	2005-12-07 15:50:57 UTC (rev 1249)
@@ -25,7 +25,6 @@
 echo "TZ=$TZ_SELECTED" >>/etc/environment
 echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/sysconfig/rc
 echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/profile
-sed -i "s at CST6CDT@/etc/localtime at g" /etc/login.defs
 
 dialog --yes-label "Localtime" --no-label "GMT" \
 	--title 'Configure system clock' \

Modified: branches/6.1.1-newmake/packages/nALFS-profile/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/nALFS-profile/Makefile	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/packages/nALFS-profile/Makefile	2005-12-07 15:50:57 UTC (rev 1249)
@@ -21,7 +21,6 @@
 
 compile-stage2:
 	sed -i 's@/your/LFS-6.1/packages@/lfs-sources at g' config/general.ent
-	# Temporary fix for LFS-6.1 profile
 	cp -rav . /root/nALFS-profile-$(DIR)
 
 clean:

Modified: branches/6.1.1-newmake/packages/shadow/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/shadow/Makefile	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/packages/shadow/Makefile	2005-12-07 15:50:57 UTC (rev 1249)
@@ -30,6 +30,7 @@
 	sed -e 's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
 	     -e 's@/var/spool/mail@/var/mail@' \
 	     -e 's at MAIL_CHECK_ENAB..yes@MAIL_CHECK_ENAB no@' \
+	     -e 's@^ENV_TZ@# &@' \
 	     etc/login.defs > /etc/login.defs
 	mv /usr/bin/passwd /bin
 	mv /lib/libshadow.*a /usr/lib

Modified: branches/6.1.1-newmake/packages/subversion/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/subversion/Makefile	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/packages/subversion/Makefile	2005-12-07 15:50:57 UTC (rev 1249)
@@ -20,14 +20,9 @@
 	$(std_build)
 
 compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
-	CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
-	 --libdir=/usr/lib64
-else
 	./configure --prefix=/usr
-endif
 	make $(PM)
-	make install
+	env -i PATH=$$PATH make install
 	install -v -d -m755 /usr/share/doc/$(DIR)
 	cp -v -R doc/* /usr/share/doc/$(DIR)
 

Modified: branches/6.1.1-newmake/packages/sudo/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/sudo/Makefile	2005-12-07 14:54:23 UTC (rev 1248)
+++ branches/6.1.1-newmake/packages/sudo/Makefile	2005-12-07 15:50:57 UTC (rev 1249)
@@ -23,7 +23,7 @@
 	./configure --prefix=/usr --libexecdir=/usr/lib \
 	 --enable-noargs-shell --with-ignore-dot --with-all-insults
 	make
-	make install
+	env -i PATH=$$PATH make install
 
 clean:
 	-rm -rf $(DIR)




More information about the livecd mailing list