r107 - in trunk: . initramfs packages/flex packages/gpm packages/lfs-bootscripts packages/linux packages/ncurses packages/util-linux

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Apr 30 07:48:25 PDT 2005


Author: jhuntwork
Date: 2005-04-30 08:48:25 -0600 (Sat, 30 Apr 2005)
New Revision: 107

Modified:
   trunk/Makefile
   trunk/initramfs/Makefile
   trunk/packages/flex/Makefile
   trunk/packages/gpm/Makefile
   trunk/packages/lfs-bootscripts/Makefile
   trunk/packages/linux/Makefile
   trunk/packages/ncurses/Makefile
   trunk/packages/util-linux/Makefile
Log:
Reverted some bogus changes

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -32,7 +32,7 @@
 # Don't edit these!
 export VERSION=x86-6.1-1-pre3
 export HOSTNAME := lfslivecd
-export WD := /cdtools
+export WD := /tools
 export SRC := /sources
 export PKG := packages
 export MKTREE := $(MP)$(ROOT)
@@ -55,7 +55,6 @@
 export chbash2 := SHELL=/bin/bash
 export WHICH= $(WD)/bin/which
 export WGET= wget --passive-ftp
-export KVERS= 2.6.11.6
 
 FTPGET= $(WD)/bin/ftpget
 WGET_V= 1.9.1
@@ -162,7 +161,7 @@
 	@if [ ! -f $(MP)/etc/X11/xorg.conf ] ; then if [ -f /etc/X11/xorg.conf ] ; then cp /etc/X11/xorg.conf $(PKG)/Xorg ; fi ; fi
 
 pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
-	ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
+	ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-ncurses \
 	ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
 
@@ -170,7 +169,7 @@
 	ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
 	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
 
-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe ch-screen ch-curl ch-zip \
+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-cvs \
@@ -856,10 +855,6 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
-klibc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
 strip: prep-chroot
 	@chroot $(MP) $(chenvstrip) 'cd $(ROOT) && make ch-strip'
 	make unmount
@@ -1351,12 +1346,6 @@
 ch-syslinux: popdev
 	make -C $(PKG)/syslinux stage2
 
-ch-klibc: popdev
-	make -C $(PKG)/klibc stage2
-
-ch-unionfs: popdev
-	make -C $(PKG)/unionfs stage2
-
 ch-strip: popdev
 	@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f -exec $(WD)/bin/strip --strip-debug '{}' ';'
 
@@ -1364,7 +1353,7 @@
 # Rules to create the iso
 #----------------------------------
 
-prepiso: unmount
+prepiso:
 	@-rm $(MP)/etc/rc.d/rc{2,3,5}.d/{K,S}21xprint
 	@install -m644 etc/issue $(MP)/etc/issue
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
@@ -1372,12 +1361,12 @@
 	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
 	@-mkdir $(MP)/iso
 	@-rm $(MP)/etc/X11/xorg.conf
-	@cp -rav $(MP)/sources $(MP)/iso && \
-	 cp -rav $(MP)/boot $(MP)/iso && \
-	 rm -f iso/root.sqfs && \
-	 $(WD)/bin/mksquashfs $(MP) $(MP)/iso/root.sqfs -info -e \
-	 boot sources tools iso lfs-livecd lost+found && \
-	 echo "LFS-LIVECD" > $(MP)/iso/LFS
+	@for i in bin boot etc lib sbin sources ; do cp -ra $(MP)/$$i $(MP)/iso ; done && \
+	 cd $(MP) && tar cjvf etc.tar.bz2 etc && cp etc.tar.bz2 iso/ && \
+	 if [ -f root/.bash_history ] ; then rm root/.bash_history ; fi && \
+	 tar cjvf root.tar.bz2 root && cp root.tar.bz2 iso/ && \
+	 $(WD)/bin/mksquashfs usr usr.sqfs && mv usr.sqfs iso/ && \
+	 echo "LFS-LIVECD" > iso/LFS
 	@touch prepiso
 
 iso: prepiso

Modified: trunk/initramfs/Makefile
===================================================================
--- trunk/initramfs/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/initramfs/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -2,20 +2,14 @@
 # Written by Jeremy Huntwork, 2004-12-16
 #
 
-all: initramfs_data.cpio.gz
+CFLAGS = -Os -s -Wall -static
+CC = gcc
+all: init
 MK= mknod
-CP= cp
 WD= temp
-KLIBC= /usr/lib/klibc
 
-initramfs_data.cpio.gz: init
-	@make -C .. ch-klibc
-	@make -C .. ch-unionfs
-	mkdir -p $(WD)/{dev,bin,lib,.cdrom,.sqfs,.tmpfs,.union}
-	$(CP) $(KLIBC)/bin/{insmod,isoinfo,losetup,mount,run-init,sh,sleep} $(WD)/bin
-	$(CP) $(KLIBC)/lib/klibc-*.so $(WD)/lib
-	$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WD)/lib
-	$(CP) init $(WD)
+init: init.c
+	mkdir -p $(WD)/dev
 	$(MK) -m 640 $(WD)/dev/console c 5 1
 	$(MK) -m 660 $(WD)/dev/hda b 3 0
 	$(MK) -m 660 $(WD)/dev/hdb b 3 64
@@ -34,10 +28,11 @@
 	$(MK) -m 660 $(WD)/dev/sr5 b 11 5
 	$(MK) -m 660 $(WD)/dev/sr6 b 11 6
 	$(MK) -m 660 $(WD)/dev/sr7 b 11 7
-	$(MK) -m 660 $(WD)/dev/loop0 b 7 0
+	$(CC) $(CFLAGS) $? -o $(WD)/$@
 	cd $(WD); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
 	rm -rf temp
 
 clean:
+	-rm -f init
 	-rm -rf temp
 	-rm -f initramfs_data*

Modified: trunk/packages/flex/Makefile
===================================================================
--- trunk/packages/flex/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/flex/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -40,11 +40,11 @@
 	@if [ ! -f /usr/bin/flex ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
 	 patch -Z -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \
 	 ./configure --prefix=/usr && make -j3 && make install && \
-	 ln -sf libfl.a /usr/lib/libl.a && \
+	 ln -s libfl.a /usr/lib/libl.a && \
 	 echo "#!/bin/sh" > /usr/bin/lex && \
 	 echo "# Begin /usr/bin/lex" >> /usr/bin/lex && \
 	 echo "" >> /usr/bin/lex && \
-	 echo "exec /usr/bin/flex -l \"\$$@\"" >> /usr/bin/lex && \
+	 echo "exec /usr/bin/flex -l \"$$@\"" >> /usr/bin/lex && \
 	 echo "" >> /usr/bin/lex && \
 	 echo "# End /usr/bin/lex" >> /usr/bin/lex && \
 	 chmod 755 /usr/bin/lex ; fi

Modified: trunk/packages/gpm/Makefile
===================================================================
--- trunk/packages/gpm/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/gpm/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -27,7 +27,7 @@
 	@if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) ; fi
 	@if [ ! -f /usr/sbin/gpm ] ; then tar xjvf $(FILE) && cd $(DIR) && \
 	 patch -Np1 -i ../$(PATCH1) && patch -Np1 -i ../$(PATCH2) && \
-	 CFLAGS="" LDFLAGS="-lm" ./configure --prefix=/usr --sysconfdir=/etc --without-curses && \
+	 CFLAGS="" LDFLAGS="-lm" ./configure --prefix=/usr --sysconfdir=/etc && \
 	 make LDFLAGS="-lm" && make install && \
 	 cp conf/gpm-root.conf /etc && /sbin/ldconfig ; fi
 	@make clean

Modified: trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- trunk/packages/lfs-bootscripts/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/lfs-bootscripts/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -21,12 +21,8 @@
 	@echo ""
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /etc/rc.d/init.d/functions ] ; then tar xjvf ${SRC}/${FILE} && \
-	 cd ${DIR} && make install-livecd && \
-	 install -m 755 lfs/init.d/{mountkernfs,udev} /etc/rc.d/init.d && \
-	 ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernks && \
-	 ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev && \
-	 rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup ; fi
+	@if [ ! -f /etc/rc.d/init.d/mountsqfs ] ; then tar xjvf ${SRC}/${FILE} && \
+	 cd ${DIR} && make install-livecd ; fi
 
 clean:
 	@-rm -rf bootscripts

Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/linux/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= linux
-VRS= $(KVERS)
+VRS= 2.6.11.6
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 PATCH1= squashfs2.1-patch

Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/ncurses/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -36,7 +36,7 @@
 	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) && bunzip2 $(PATCH).bz2 ; fi
 	@if [ ! -f /usr/bin/clear ] ; then tar -xjvf $(SRC)/$(FILE) && cd $(DIR) && \
 	 sh ../$(PATCH) && \
-	 ./configure --prefix=/usr --with-shared --without-debug --with-gpm && \
+	 ./configure --prefix=/usr --with-shared --without-debug && \
 	 make sources && make -j3 && make install && chmod 755 /usr/lib/*.5.4 && \
 	 chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib && \
 	 ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so && \

Modified: trunk/packages/util-linux/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile	2005-04-30 14:22:27 UTC (rev 106)
+++ trunk/packages/util-linux/Makefile	2005-04-30 14:48:25 UTC (rev 107)
@@ -11,7 +11,7 @@
 
 # RULES
 
-.PHONY: stage1 clean chroot stage2 klibc-losetup
+.PHONY: stage1 clean chroot stage2
 
 stage1:
 	@echo ""
@@ -43,15 +43,6 @@
 	 make HAVE_KILL=yes HAVE_SLN=yes install ; fi
 	@make clean
 	
-klibc-losetup:
-	@echo ""
-	@echo "=====> Building losetup with klibc"
-	@echo ""
-	@if [ ! -f /usr/lib/klibc/bin/losetup ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../../klibc/util-linux-2.12q-klibc-1.patch && \
-	 CC="klcc" LDFLAGS="-shared" ./configure && \
-	 make lib/xstrncpy.o lib/getpass.o && make -C mount losetup && \
-	 strip -s mount/losetup && install mount/losetup /usr/lib/klibc/bin ; fi
-	@make clean
+
 clean:
 	@-rm -rf $(DIR)




More information about the livecd mailing list