Author: justin Date: 2005-10-01 14:47:43 -0600 (Sat, 01 Oct 2005) New Revision: 817
Added: x86/tags/6.1-3/ Modified: x86/tags/6.1-3/Makefile x86/tags/6.1-3/initramfs/init x86/tags/6.1-3/packages/Xorg/Makefile x86/tags/6.1-3/packages/nALFS-profile/Makefile x86/tags/6.1-3/packages/samba/Makefile Log: Created 6.1-3 tag with fixes for init (scsi cdrom) and nALFS-profile. Copied: x86/tags/6.1-3 (from rev 797, x86/tags/6.1-2) Modified: x86/tags/6.1-3/Makefile =================================================================== --- x86/tags/6.1-2/Makefile 2005-09-28 04:45:31 UTC (rev 797) +++ x86/tags/6.1-3/Makefile 2005-10-01 20:47:43 UTC (rev 817) @@ -30,7 +30,7 @@ export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration # Don't edit these! -export VERSION=x86-6.1-2 +export VERSION=x86-6.1-6 export HOSTNAME := lfslivecd export WD := /tools export SRC := /sources Modified: x86/tags/6.1-3/initramfs/init =================================================================== --- x86/tags/6.1-2/initramfs/init 2005-09-28 04:45:31 UTC (rev 797) +++ x86/tags/6.1-3/initramfs/init 2005-10-01 20:47:43 UTC (rev 817) @@ -1,6 +1,6 @@ #!/bin/sh LABEL="LFS_CD" -DEVS=`echo /dev/hd* /dev/scd*` +DEVS=`echo /dev/hd* /dev/sr*` while [ -z "$CDROM" ] && [ "$TIMEOUT" != "..............." ] ; do for DEV in $DEVS ; do Modified: x86/tags/6.1-3/packages/Xorg/Makefile =================================================================== --- x86/tags/6.1-2/packages/Xorg/Makefile 2005-09-28 04:45:31 UTC (rev 797) +++ x86/tags/6.1-3/packages/Xorg/Makefile 2005-10-01 20:47:43 UTC (rev 817) @@ -6,8 +6,10 @@ DIR= xc FILE= X11R$(VRS)-src.tar.bz2 PATCH= xorg-6.8.1-luit_race-1.patch +PATCH1= xorg-6.8.2-locale_names-1.patch URL= http://xorg.freedesktop.org/X11R$(VRS)/src-single/$(FILE) URL1= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH) +URL2= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH1) @@ -24,8 +26,10 @@ @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi + @if [ ! -f $(PATCH1) ] ; then $(WGET) $(URL2) ; fi @if [ ! -d /usr/include/X11 ] ; then unpack $(FILE) && cd $(DIR) && \ patch -Np1 -i ../$(PATCH) && \ + patch -Np1 -i ../$(PATCH1) && \ sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile && \ pushd config/util && \ make -f Makefile.ini lndir && \ Modified: x86/tags/6.1-3/packages/nALFS-profile/Makefile =================================================================== --- x86/tags/6.1-2/packages/nALFS-profile/Makefile 2005-09-28 04:45:31 UTC (rev 797) +++ x86/tags/6.1-3/packages/nALFS-profile/Makefile 2005-10-01 20:47:43 UTC (rev 817) @@ -21,6 +21,7 @@ @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -d /root/$(DIR) ] ; then unpack $(FILE) && \ sed -i 's@/your/$(DIR)/packages@/[EMAIL PROTECTED]' $(DIR)/config/general.ent && \ + sed -i 's@/usr/local@/[EMAIL PROTECTED]' $(DIR)/runit.sh cp -ra $(DIR) /root/nALFS-profile-$(DIR) ; fi @make clean Modified: x86/tags/6.1-3/packages/samba/Makefile =================================================================== --- x86/tags/6.1-2/packages/samba/Makefile 2005-09-28 04:45:31 UTC (rev 797) +++ x86/tags/6.1-3/packages/samba/Makefile 2005-10-01 20:47:43 UTC (rev 817) @@ -5,7 +5,7 @@ VRS= 3.0.14a DIR= $(NM)-$(VRS) FILE= $(DIR).tar.gz -URL= http://us2.samba.org/samba/ftp/$(FILE) +URL= http://ftp.lfs-matrix.net/pub/BLFS/6.1/Q-S/$(FILE) #RULES -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
