r793 - in x86/trunk: initramfs packages/tcl

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Sep 26 11:56:38 PDT 2005


Author: justin
Date: 2005-09-26 12:56:37 -0600 (Mon, 26 Sep 2005)
New Revision: 793

Modified:
   x86/trunk/initramfs/init.h
   x86/trunk/packages/tcl/Makefile
Log:
Fixed init.h to use right VOLUME_ID, fixed tcl build instructions.

Modified: x86/trunk/initramfs/init.h
===================================================================
--- x86/trunk/initramfs/init.h	2005-09-26 14:44:01 UTC (rev 792)
+++ x86/trunk/initramfs/init.h	2005-09-26 18:56:37 UTC (rev 793)
@@ -29,7 +29,7 @@
 #define	ISO_BLOCK_SIZE	2048
 #define	ISO_PD_BLOCK	0x10
 
-#define VOLUME_ID	""			/* Volume ID of CD.
+#define VOLUME_ID	"lfslivecd-$(VERSION)"		/* Volume ID of CD.
 						   This string is automatically set during the
 						   livecd build and needs to match the string passed
 						   to 'mkisofs -V' */

Modified: x86/trunk/packages/tcl/Makefile
===================================================================
--- x86/trunk/packages/tcl/Makefile	2005-09-26 14:44:01 UTC (rev 792)
+++ x86/trunk/packages/tcl/Makefile	2005-09-26 18:56:37 UTC (rev 793)
@@ -13,10 +13,8 @@
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE)
-	unpack $(FILE)
-	make -C $(DIR) -f ../Makefile compile-$@
-	touch $@
-	cp $(SRC)/$(FILE) $(LFSSRC)
+	$(std_build_noclean)
+	cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage1:
 	cd unix ; ./configure --prefix=$(WD)




More information about the livecd mailing list