Author: alexander
Date: 2005-11-03 07:50:26 -0700 (Thu, 03 Nov 2005)
New Revision: 1040
Modified:
branches/dm/Makefile
Log:
Replaced minimal BLFS with full one
Modified: branches/dm/Makefile
===================================================================
--- branches/dm/Makefile 2005-11-03 13:23:18 UTC (rev 1039)
+++ branches/dm/Makefile 2005-11-03 14:50:26 UTC (rev 1040)
@@ -232,7 +232,7 @@
@cp $(ROOT)/scripts/unpack $(MP)/bin
ifndef CROSS
@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
- make minimal-blfs $(chbash-post-bash)'
+ make blfs $(chbash-post-bash)'
else
ifeq ($(LFS-ARCH),sparc64)
@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
@@ -336,17 +336,17 @@
ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
- ch-squashfs ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
+ ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
- ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+ ch-ctags ch-initramfs ch-cdrtools ch-zisofs-tools ch-blfs-bootscripts \
ch-bin86 ch-lilo ch-syslinux ch-nALFS-profile
ifeq ($(LFS-ARCH),ppc)
make ch-yaboot
endif
x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen
ch-curl \
- ch-zip ch-unzip ch-lynx ch-lfs-bootscripts ch-squashfs ch-cpio ch-linux
ch-ctags ch-unionfs \
- ch-initramfs ch-cdrtools ch-syslinux
+ ch-zip ch-unzip ch-lynx ch-lfs-bootscripts ch-cpio ch-linux ch-ctags
ch-device-mapper \
+ ch-initramfs ch-cdrtools ch-zisofs-tools ch-syslinux
sparc64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano \
ch-joe ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
@@ -355,9 +355,9 @@
ch-pkgconfig ch-glib2 ch-cvs ch-popt ch-samba ch-tcpwrappers \
ch-portmap ch-nfs-utils ch-traceroute ch-dialog ch-ncftp ch-pciutils \
ch-device-mapper ch-LVM2 ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe \
- ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin \
+ ch-libaal ch-reiser4progs ch-cpio ch-mutt ch-msmtp ch-tin \
ch-mdadm ch-which ch-strace ch-iptables ch-eject ch-hdparm ch-linux \
- ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+ ch-ctags ch-initramfs ch-cdrtools ch-zisofs-tools ch-blfs-bootscripts \
ch-elftoaout ch-silo
wget-list:
@@ -506,8 +506,8 @@
@install -m600 root/.bashrc $(MP)/root/.bashrc
ifneq ($(LFS-ARCH),x86_64)
ifneq ($(LFS-ARCH),sparc64)
-# @install -m644 etc/X11/app-defaults/XTerm
$(MP)/etc/X11/app-defaults/XTerm
-# @install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc
+ @install -m644 etc/X11/app-defaults/XTerm
$(MP)/etc/X11/app-defaults/XTerm
+ @install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc
else
@sed -i "s/Version:.*/Version: $(VERSION)/" $(MP)/boot/boot.msg
endif
@@ -535,9 +535,7 @@
-V "lfslivecd-$(VERSION)" ./
endif
ifeq ($(LFS-ARCH),ppc)
- # Commands below are known wrong
- exit 1
- @cd $(MP) ; ./usr/bin/mkisofs -hfs -part --allow-leading-dots \
+ @cd $(MP) ; ./usr/bin/mkisofs -z -hfs -part --allow-leading-dots \
-map $(MKTREE)/$(PKG)/yaboot/map.hfs -no-desktop \
-hfs-volid "lfslivecd-$(VERSION)" -V "lfslivecd-$(VERSION)" \
-hfs-bless iso/boot -r -v -o $(MKTREE)/lfslivecd-$(VERSION).iso iso \
@@ -546,8 +544,6 @@
echo "Iso incorrectly made! Boot directory not blessed." ; fi
endif
ifeq ($(LFS-ARCH),sparc64)
- # Commands below are known wrong
- exit 1
@cd $(MP) ; ./usr/bin/mkisofs -z -v -R -l -D --allow-leading-dots \
-G iso/boot/isofs.b -B ... -r -V "lfslivecd-$(VERSION)" \
-o $(MKTREE)/lfslivecd-$(VERSION).iso iso >$(MKTREE)/iso.log 2>&1
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
