Author: alexander
Date: 2005-05-03 02:54:08 -0600 (Tue, 03 May 2005)
New Revision: 122
Modified:
branches/unionfs/Makefile
branches/unionfs/isolinux/isolinux.cfg
branches/unionfs/linux/config
branches/unionfs/packages/linux/Makefile
Log:
Pass initramfs image as "initrd". This simplifies debugging.
Modified: branches/unionfs/Makefile
===================================================================
--- branches/unionfs/Makefile 2005-05-03 08:30:17 UTC (rev 121)
+++ branches/unionfs/Makefile 2005-05-03 08:54:08 UTC (rev 122)
@@ -177,7 +177,7 @@
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 \
+ ch-reiser4progs ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn
ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
ch-syslinux
# Rules for building tools/stage1
@@ -861,6 +861,14 @@
make -C $(PKG)/$@ chroot
make unmount
+unionfs: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
+initramfs: prep-chroot
+ make -C $@ chroot
+ make unmount
+
strip: prep-chroot
@chroot $(MP) $(chenvstrip) 'cd $(ROOT) && make ch-strip'
make unmount
@@ -1355,6 +1363,9 @@
ch-klibc: popdev
make -C $(PKG)/klibc stage2
+ch-initramfs: popdev
+ make -C initramfs
+
ch-unionfs: popdev
make -C $(PKG)/unionfs stage2
Modified: branches/unionfs/isolinux/isolinux.cfg
===================================================================
--- branches/unionfs/isolinux/isolinux.cfg 2005-05-03 08:30:17 UTC (rev
121)
+++ branches/unionfs/isolinux/isolinux.cfg 2005-05-03 08:54:08 UTC (rev
122)
@@ -7,7 +7,8 @@
label linux
kernel linux
+ append initrd=initramfs_data_cpio.gz
label linux-autosshd
kernel linux
- append autosshd
+ append autosshd initrd=initramfs_data_cpio.gz
Modified: branches/unionfs/linux/config
===================================================================
--- branches/unionfs/linux/config 2005-05-03 08:30:17 UTC (rev 121)
+++ branches/unionfs/linux/config 2005-05-03 08:54:08 UTC (rev 122)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11.6
-# Mon Apr 18 16:50:55 2005
+# Tue May 3 03:20:55 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -294,8 +294,10 @@
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_SX8=m
# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_LBD=y
# CONFIG_CDROM_PKTCDVD is not set
Modified: branches/unionfs/packages/linux/Makefile
===================================================================
--- branches/unionfs/packages/linux/Makefile 2005-05-03 08:30:17 UTC (rev
121)
+++ branches/unionfs/packages/linux/Makefile 2005-05-03 08:54:08 UTC (rev
122)
@@ -21,21 +21,17 @@
@echo ""
@echo "=====> Building $(NM) in chroot"
@echo ""
+ @-mkdir /boot/isolinux
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC)
; fi
@if [ ! -f /boot/isolinux/linux ] ; then tar xjvf $(SRC)/$(FILE) && cd
$(DIR) && \
$(WGET) $(URL1).2/serie && \
- for i in `cat serie` ; do $(WGET) -c $(URL1).2/$$i && \
+ for i in `cat serie` ; do $(WGET) $(URL1).2/$$i && \
mv $$i ../ && patch -Np1 -i ../$$i ; done && \
patch -Np1 -i
$(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH1) && \
make mrproper && \
cp $(ROOT)/linux/config .config && \
make -j3 && \
- make modules_install && \
- cd $(ROOT)/initramfs && make && \
- cp initramfs_data.cpio.gz $(ROOT)/$(PKG)/$(NM)/$(DIR)/usr/ && \
- cd $(ROOT)/$(PKG)/$(NM)/$(DIR) && \
- make ; fi
- @-mkdir /boot/isolinux
+ make modules_install ; fi
@-cp $(DIR)/arch/i386/boot/bzImage /boot/isolinux/linux
clean:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
