r1954 - in branches/minimal: . packages

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Jul 16 09:29:36 PDT 2007


Author: jhuntwork
Date: 2007-07-16 10:29:36 -0600 (Mon, 16 Jul 2007)
New Revision: 1954

Removed:
   branches/minimal/packages/Mesa/
   branches/minimal/packages/URI/
   branches/minimal/packages/XML-Parser/
   branches/minimal/packages/Xorg-app/
   branches/minimal/packages/Xorg-base/
   branches/minimal/packages/Xorg-driver/
   branches/minimal/packages/Xorg-font/
   branches/minimal/packages/Xorg-lib/
   branches/minimal/packages/Xorg-proto/
   branches/minimal/packages/Xorg-util/
   branches/minimal/packages/alsa-firmware/
   branches/minimal/packages/alsa-lib/
   branches/minimal/packages/alsa-oss/
   branches/minimal/packages/alsa-utils/
   branches/minimal/packages/anthy/
   branches/minimal/packages/atk/
   branches/minimal/packages/cairo/
   branches/minimal/packages/dbus-glib/
   branches/minimal/packages/dbus/
   branches/minimal/packages/ddccontrol-db/
   branches/minimal/packages/ddccontrol/
   branches/minimal/packages/flac/
   branches/minimal/packages/fontconfig/
   branches/minimal/packages/fonts-baekmuk/
   branches/minimal/packages/fonts-dejavu/
   branches/minimal/packages/fonts-firefly/
   branches/minimal/packages/fonts-kochi/
   branches/minimal/packages/fonts-thai/
   branches/minimal/packages/freefont/
   branches/minimal/packages/freetype/
   branches/minimal/packages/gcc33/
   branches/minimal/packages/giflib/
   branches/minimal/packages/gtk2/
   branches/minimal/packages/hal-info/
   branches/minimal/packages/hal/
   branches/minimal/packages/hicolor-icon-theme/
   branches/minimal/packages/imlib/
   branches/minimal/packages/imlib2/
   branches/minimal/packages/libIDL/
   branches/minimal/packages/libaal/
   branches/minimal/packages/libchewing/
   branches/minimal/packages/libdrm/
   branches/minimal/packages/libdvdcss/
   branches/minimal/packages/libhangul/
   branches/minimal/packages/libjpeg/
   branches/minimal/packages/libnotify/
   branches/minimal/packages/libogg/
   branches/minimal/packages/libpng/
   branches/minimal/packages/librcc/
   branches/minimal/packages/librcd/
   branches/minimal/packages/librsvg/
   branches/minimal/packages/libsexy/
   branches/minimal/packages/libtheora/
   branches/minimal/packages/libtiff/
   branches/minimal/packages/libvorbis/
   branches/minimal/packages/man-fr/
   branches/minimal/packages/man-pages-es/
   branches/minimal/packages/man-pages-it/
   branches/minimal/packages/manpages-de/
   branches/minimal/packages/manpages-ru/
   branches/minimal/packages/notification-daemon-xfce/
   branches/minimal/packages/pango/
   branches/minimal/packages/reiser4progs/
   branches/minimal/packages/scim-anthy/
   branches/minimal/packages/scim-chewing/
   branches/minimal/packages/scim-hangul/
   branches/minimal/packages/scim-input-pad/
   branches/minimal/packages/scim-pinyin/
   branches/minimal/packages/scim-tables/
   branches/minimal/packages/scim/
   branches/minimal/packages/seamonkey/
   branches/minimal/packages/speex/
   branches/minimal/packages/startup-notification/
   branches/minimal/packages/synaptics/
   branches/minimal/packages/taglib/
   branches/minimal/packages/vbetool/
   branches/minimal/packages/vte/
   branches/minimal/packages/xbitmaps/
   branches/minimal/packages/xchat/
   branches/minimal/packages/xcursor-themes/
   branches/minimal/packages/xfce/
   branches/minimal/packages/xfmedia/
   branches/minimal/packages/xine-lib/
   branches/minimal/packages/xkeyboard-config/
   branches/minimal/packages/xlockmore/
   branches/minimal/packages/xorg-server/
   branches/minimal/packages/xorg-udev-rules/
Modified:
   branches/minimal/Makefile
Log:
Initial removal of Xorg and dependent software on the minimal CD

Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile	2007-07-12 16:01:53 UTC (rev 1953)
+++ branches/minimal/Makefile	2007-07-16 16:29:36 UTC (rev 1954)
@@ -205,7 +205,19 @@
 
 maybe-tools:
 	@if [ -f tools.tar.bz2 ] ; then \
+	    echo "Found existing tools archive." ; \
+	    echo "Extracting tools..." ; \
 	    tar -C .. -jxpf tools.tar.bz2 ; \
+	    if [ ! -f $(WD)/etc/resolv.conf ] ; then \
+		cp /etc/resolv.conf $(WD)/etc ; \
+	    fi ; \
+	    if [ ! -f $(WD)/bin/wget ] ; then \
+		chown -R lfs $(MP)$(WD) ; \
+		su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-wget-scpt'" ; \
+	    fi ; \
+	    if [ ! -f $(WD)/bin/which ] ; then \
+		make pre-which ; \
+	    fi ; \
 	else \
 	    su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" && \
 	    tar -C .. -jcpf tools.tar.bz2 tools ; \
@@ -241,39 +253,20 @@
 	ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \
 	ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
-	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng \
-	ch-freetype ch-fontconfig \
-	ch-Xorg-base ch-Xorg-util ch-Xorg-proto ch-Xorg-lib ch-libdrm ch-Mesa \
-	ch-xbitmaps ch-Xorg-app ch-xcursor-themes ch-xorg-server \
-	ch-Xorg-font ch-Xorg-driver ch-xorg-udev-rules ch-XML-Parser ch-xkeyboard-config \
-	ch-synaptics ch-inputattach ch-fonts-thai \
-	ch-freefont ch-fonts-dejavu ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk \
-	ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib ch-imlib ch-imlib2 \
-	ch-gc ch-w3m ch-lftp ch-cairo ch-hicolor-icon-theme \
-	ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-seamonkey \
-	ch-alsa-lib ch-alsa-utils ch-alsa-firmware ch-alsa-oss \
-	ch-libogg ch-libvorbis ch-speex ch-flac ch-libdvdcss \
-	ch-libtheora ch-librcd ch-librcc ch-taglib ch-xine-lib \
-	ch-pciutils ch-libusb ch-usbutils ch-dbus ch-dbus-glib ch-parted \
-	ch-librsvg ch-startup-notification chroot-gvim ch-vte ch-URI ch-xfce \
-	ch-xfmedia ch-irssi ch-pidgin ch-net-tools \
-	ch-xchat ch-wireless_tools ch-wpa_supplicant \
+	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK \
+	ch-inputattach ch-openssh ch-glib2 ch-w3m ch-lftp \
+	ch-cvs ch-popt ch-samba ch-pciutils ch-libusb ch-usbutils ch-parted \
+	ch-irssi ch-pidgin ch-net-tools ch-wireless_tools ch-wpa_supplicant \
 	ch-tcpwrappers ch-portmap ch-nfs-utils \
 	ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc ch-dialog ch-ncftp  \
-	ch-device-mapper ch-LVM2 ch-dmraid \
-	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \
+	ch-device-mapper ch-LVM2 ch-dmraid ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \
 	ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty  \
-	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
-	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \
-	ch-blfs-bootscripts ch-oui-data \
-	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
-	ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-libhangul ch-scim-hangul \
-	ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \
-	ch-hibernate-script ch-slang ch-mc \
-	ch-fuse ch-dosfstools ch-ntfsprogs \
-	ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \
+	ch-strace ch-iptables ch-eject ch-hdparm ch-linux \
+	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
+	ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \
+	ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-grub ch-lilo ch-syslinux \
 	ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \
-	ch-initramfs ch-gcc33
+	ch-initramfs
 	make update-caches
 
 wget-list:




More information about the livecd mailing list