r103 - in trunk: . etc linux packages/LVM2 packages/blfs-bootscripts packages/device-mapper packages/dhcpcd packages/firefox packages/html_tidy packages/ion packages/linux packages/lua packages/ncftp packages/ncurses packages/openssh packages/pciutils packages/postfix packages/rp-pppoe packages/samba packages/xfce scripts

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Wed Apr 20 05:04:25 PDT 2005


Author: jhuntwork
Date: 2005-04-20 06:04:23 -0600 (Wed, 20 Apr 2005)
New Revision: 103

Added:
   trunk/etc/syslog.conf
   trunk/packages/firefox/.mozconfig
Removed:
   trunk/etc/syslog-ng/
Modified:
   trunk/Makefile
   trunk/linux/config
   trunk/packages/LVM2/Makefile
   trunk/packages/blfs-bootscripts/Makefile
   trunk/packages/device-mapper/Makefile
   trunk/packages/dhcpcd/Makefile
   trunk/packages/firefox/Makefile
   trunk/packages/firefox/firstrun
   trunk/packages/html_tidy/Makefile
   trunk/packages/ion/Makefile
   trunk/packages/linux/Makefile
   trunk/packages/lua/Makefile
   trunk/packages/ncftp/Makefile
   trunk/packages/ncurses/Makefile
   trunk/packages/openssh/Makefile
   trunk/packages/pciutils/Makefile
   trunk/packages/postfix/Makefile
   trunk/packages/rp-pppoe/Makefile
   trunk/packages/samba/Makefile
   trunk/packages/xfce/Makefile
   trunk/scripts/net-setup
Log:
Series of fixes from latest test build

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -39,15 +39,15 @@
 export CFLAGS := -Os -s -march=i486
 export CXXFLAGS := -Os -s -march=i486
 export CHOST := i486-pc-linux-gnu
-export lfsenv := exec env -i CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c
+export lfsenv := exec env -i HOME=$$HOME CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c
 
 export lfsbash := set +h && umask 022 && cd $(MKTREE)
 
-export chenv1 := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
+export chenv1 := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
 
-export chenv2 := $(WD)/bin/env -i HOME=/root CFLGAS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
+export chenv2 := $(WD)/bin/env -i HOME=/root CFLGAS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
 
-export chenv3 := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CHOST='$(CHOST)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.68.1/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c
+export chenv3 := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.68.1/catalog.xml /etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c
 
 export chenvstrip := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin $(WD)/bin/bash -c
 
@@ -104,7 +104,7 @@
 	@touch $(PKG)/wget/.pass2
 	@make prep-chroot
 	@-mkdir $(MP)/bin
-	@ln -sf ${WD}/bin/bash ${MP}/bin/bash
+	@if [ ! -f $(MP)/bin/bash ] ; then if [ ! -d $(MP) ] ; then mkdir $(MP)/bin ; fi ; ln -s ${WD}/bin/bash ${MP}/bin/bash ; fi
 	@chroot "$(MP)" $(chenv1) 'set +h && chown -R 0:0 $(WD) $(SRC) $(ROOT) && cd $(ROOT) && make pre-bash $(chbash1)'
 	@chroot "$(MP)" $(chenv2) 'set +h && cd $(ROOT) && make post-bash $(chbash2)'
 
@@ -1353,7 +1353,7 @@
 	@install -m755 scripts/{net-setup,greeting,ll} $(MP)/usr/bin/
 	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
 	@-mkdir $(MP)/iso
-	@-rm /etc/X11/xorg.conf
+	@-rm $(MP)/etc/X11/xorg.conf
 	@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 && \
@@ -1363,7 +1363,7 @@
 	@touch prepiso
 
 iso: prepiso
-	cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/livecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
+	cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "LFS_CD" ./
 
 # Rules to clean your tree. 
@@ -1382,13 +1382,14 @@
 	@-var=`find packages -name ".pass2"` && for i in $$var ; do rm -rf $$i ; done
 
 scrub: clean
-	@-rm -rf $(SRC) $(MP)$(SRC)
-	@-rm -rf uname/*.ko uname/*mod.c uname/*.o uname/.uname* uname/.tmp*
 	@-for i in bin boot dev etc home iso lib media mnt opt proc root sbin srv sys tmp \
 	 usr var ; do rm -rf $(MP)/$$i ; done
 	@-rm $(MP)/{etc,root}.tar.bz2
+	@-rm lfslivecd-$(VERSION).iso
+
+clean_sources:
+	@-rm -rf $(SRC) $(MP)$(SRC)
 	@-for i in `ls $(PKG)` ; do rm -rf $(PKG)/$$i/{*.gz,*.bz2,*.zip,*.tgz} ; done
-	@-rm livecd-$(VERSION).iso
 
 unloadmodule:
 	@-rmmod uname_i486

Added: trunk/etc/syslog.conf
===================================================================
--- trunk/etc/syslog.conf	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/etc/syslog.conf	2005-04-20 12:04:23 UTC (rev 103)
@@ -0,0 +1,14 @@
+# Begin /etc/syslog.conf
+
+auth,authpriv.* -/var/log/auth.log
+*.*;auth,authpriv.none -/var/log/sys.log
+daemon.* -/var/log/daemon.log
+kern.* -/var/log/kern.log
+mail.* -/var/log/mail.log
+user.* -/var/log/user.log
+*.emerg *
+
+# log the bootscript output:
+local2.* -/var/log/boot.log
+
+# End /etc/syslog.conf

Modified: trunk/linux/config
===================================================================
--- trunk/linux/config	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/linux/config	2005-04-20 12:04:23 UTC (rev 103)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10
-# Wed Jan 26 12:22:38 2005
+# Linux kernel version: 2.6.11.6
+# Mon Apr 18 16:50:55 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -96,6 +96,7 @@
 CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_WP_WORKS_OK=y
@@ -109,6 +110,7 @@
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
@@ -170,6 +172,7 @@
 CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_X86_PM_TIMER is not set
+CONFIG_ACPI_CONTAINER=m
 
 #
 # APM (Advanced Power Management) BIOS Support
@@ -192,6 +195,7 @@
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCIEPORTBUS=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
@@ -205,7 +209,6 @@
 #
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_OBSOLETE is not set
 CONFIG_PCMCIA=m
 CONFIG_CARDBUS=y
 
@@ -218,6 +221,7 @@
 CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=m
 
 #
 # PCI Hotplug Support
@@ -284,6 +288,7 @@
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
@@ -302,6 +307,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
+CONFIG_ATA_OVER_ETH=m
 
 #
 # ATA/ATAPI/MFM/RLL support
@@ -401,6 +407,7 @@
 #
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_FC_ATTRS=y
+# CONFIG_SCSI_ISCSI_ATTRS is not set
 
 #
 # SCSI low-level drivers
@@ -438,6 +445,7 @@
 CONFIG_SCSI_ATA_PIIX=y
 CONFIG_SCSI_SATA_NV=y
 CONFIG_SCSI_SATA_PROMISE=y
+CONFIG_SCSI_SATA_QSTOR=y
 CONFIG_SCSI_SATA_SX4=y
 CONFIG_SCSI_SATA_SIL=y
 CONFIG_SCSI_SATA_SIS=y
@@ -490,7 +498,6 @@
 CONFIG_SCSI_QLA2300=y
 CONFIG_SCSI_QLA2322=y
 CONFIG_SCSI_QLA6312=y
-CONFIG_SCSI_QLA6322=y
 CONFIG_SCSI_SEAGATE=y
 CONFIG_SCSI_SYM53C416=y
 CONFIG_SCSI_DC395x=y
@@ -660,7 +667,6 @@
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_SAME=y
-# CONFIG_IP_NF_NAT_LOCAL is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 CONFIG_IP_NF_MANGLE=y
 CONFIG_IP_NF_TARGET_TOS=y
@@ -775,7 +781,6 @@
 CONFIG_CS89x0=m
 CONFIG_DGRS=m
 CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
 CONFIG_E100=m
 # CONFIG_E100_NAPI is not set
 CONFIG_FEALNX=m
@@ -820,6 +825,7 @@
 # CONFIG_IXGB_NAPI is not set
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
+# CONFIG_2BUFF_MODE is not set
 
 #
 # Token Ring devices
@@ -941,6 +947,7 @@
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 
 #
@@ -1020,7 +1027,7 @@
 CONFIG_AGP_ATI=m
 CONFIG_AGP_AMD=m
 CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
+CONFIG_AGP_INTEL=y
 CONFIG_AGP_INTEL_MCH=m
 CONFIG_AGP_NVIDIA=m
 CONFIG_AGP_SIS=m
@@ -1071,7 +1078,7 @@
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
-# CONFIG_I2C_ISA is not set
+CONFIG_I2C_ISA=m
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -1091,7 +1098,7 @@
 #
 # Hardware Sensors Chip support
 #
-# CONFIG_I2C_SENSOR is not set
+CONFIG_I2C_SENSOR=m
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1112,6 +1119,7 @@
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_SMSC47B397=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_W83781D is not set
@@ -1202,6 +1210,7 @@
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -1292,13 +1301,37 @@
 #
 # USB Network Adapters
 #
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
 
 #
+# USB Host-to-Host Cables
+#
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_GENESYS=y
+CONFIG_USB_NET1080=y
+CONFIG_USB_PL2301=y
+CONFIG_USB_KC2190=y
+
+#
+# Intelligent USB Devices/Gadgets
+#
+# CONFIG_USB_ARMLINUX is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ZAURUS is not set
+CONFIG_USB_CDCETHER=y
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_AX8817X=y
+
+#
 # USB port drivers
 #
 # CONFIG_USB_USS720 is not set
@@ -1313,7 +1346,6 @@
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
-# CONFIG_USB_TIGL is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -1322,6 +1354,7 @@
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_PHIDGETKIT is not set
 # CONFIG_USB_PHIDGETSERVO is not set
+CONFIG_USB_IDMOUSE=m
 # CONFIG_USB_TEST is not set
 
 #
@@ -1339,6 +1372,15 @@
 # CONFIG_MMC is not set
 
 #
+# InfiniBand support
+#
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1351,17 +1393,23 @@
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_REISER4_FS=m
-# CONFIG_REISER4_CHECK is not set
+# CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_PROC_INFO=y
 # CONFIG_REISERFS_FS_XATTR is not set
 CONFIG_JFS_FS=m
 # CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_FS_POSIX_ACL=y
+
+#
+# XFS support
+#
 CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
 # CONFIG_XFS_RT is not set
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_SECURITY is not set
@@ -1515,6 +1563,8 @@
 # Kernel hacking
 #
 # CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_4KSTACKS is not set
@@ -1556,6 +1606,12 @@
 # CONFIG_CRYPTO_TEST is not set
 
 #
+# Hardware crypto devices
+#
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=y
+
+#
 # Library routines
 #
 CONFIG_CRC_CCITT=m

Modified: trunk/packages/LVM2/Makefile
===================================================================
--- trunk/packages/LVM2/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/LVM2/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= LVM2
-VRS= 2.01.08
+VRS= 2.01.09
 DIR= $(NM).$(VRS)
 FILE= $(DIR).tgz
 URL= ftp://sources.redhat.com/pub/lvm2/$(FILE)

Modified: trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- trunk/packages/blfs-bootscripts/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/blfs-bootscripts/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -20,8 +20,8 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@tar xjvf $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) &&
+	@if [ ! -f /etc/rc.d/init.d/nfs-client ] ; then tar -xjvf $(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
 	 make install-service-dhcpcd && \
 	 make install-service-pppoe && \
 	 make install-gpm && \
@@ -30,7 +30,7 @@
 	 install -m754 blfs/init.d/random /etc/rc.d/init.d/ && \
 	 install -m754 blfs/init.d/portmap /etc/rc.d/init.d/ && \
 	 install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/ && \
-	 install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/
+	 install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d ; fi
 	@make clean
 
 clean:

Modified: trunk/packages/device-mapper/Makefile
===================================================================
--- trunk/packages/device-mapper/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/device-mapper/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= device-mapper
-VRS= 1.01.00
+VRS= 1.01.01
 DIR= $(NM).$(VRS)
 FILE= $(DIR).tgz
 URL= ftp://sources.redhat.com/pub/dm/$(FILE)

Modified: trunk/packages/dhcpcd/Makefile
===================================================================
--- trunk/packages/dhcpcd/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/dhcpcd/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -22,7 +22,7 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -f /usr/sbin/dhcpcd ] ; then tar xzvf $(FILE) && cd $(DIR) && \
+	@if [ ! -f /sbin/dhcpcd ] ; then tar xzvf $(FILE) && cd $(DIR) && \
 	 patch -Np1 -i ../$(PATCH) && \
 	 ./configure --prefix="" --sysconfdir=/var/lib --mandir=/usr/share/man && \
 	 make -j3 && \

Added: trunk/packages/firefox/.mozconfig
===================================================================
--- trunk/packages/firefox/.mozconfig	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/firefox/.mozconfig	2005-04-20 12:04:23 UTC (rev 103)
@@ -0,0 +1,22 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i486-pc-linux-gnu
+mk_add_options MOZ_MAKE_FLAGS=-j3
+mk_add_options MOZ_CO_PROJECT=browser
+
+. @TOPSRCDIR@/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-tests
+ac_add_options --with-system-jpeg=/usr
+ac_add_options --with-system-zlib=/usr
+ac_add_options --with-system-png=/usr
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-application=browser
+ac_add_options --with-user-appdir=.firefox
+ac_add_options --disable-freetype2
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-xinerama

Modified: trunk/packages/firefox/Makefile
===================================================================
--- trunk/packages/firefox/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/firefox/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -20,19 +20,8 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/firefox ] ; then tar xjvf $(FILE) && cd $(DIR) && \
-	 export MOZILLA_OFFICIAL="1" && \
-	 export BUILD_OFFICIAL="1" && \
-	 export MOZ_PHOENIX="1" && \
-	 ./configure --prefix=/usr --with-default-mozilla-five-home=/usr/lib/firefox-$(VRS) \
-	 --with-user-appdir=.firefox --with-system-zlib --with-system-jpeg --with-system-png \
-	 --enable-application=browser --enable-default-toolkit=gtk2 --enable-extensions=all,-typeaheadfind \
-	 --enable-crypto --enable-xft --enable-xinerama --enable-optimize --enable-reorder --enable-strip \
-	 --enable-cpp-rtti --enable-single-profile --disable-freetype2 --disable-accessibility --disable-debug \
-	 --disable-tests --disable-logging --disable-pedantic --disable-installer --disable-mailnews \
-	 --disable-ldap --disable-composer --disable-profilesharing && \
-	 make -j3 && make install && \
-	 install -d /usr/include/firefox-$(VRS)/nss && \
-	 cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/firefox-$(VRS)/nss && \
+	 cp ../.mozconfig . && \
+	 make -f client.mk && make -f client.mk install && \
 	 cd $(ROOT)/$(PKG)/$(NM) && ./firstrun ; fi
 	#@cp -ra $(ROOT)/root/.firefox /root
 	#@cp -ra $(ROOT)/root/.mozilla /root

Modified: trunk/packages/firefox/firstrun
===================================================================
--- trunk/packages/firefox/firstrun	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/firefox/firstrun	2005-04-20 12:04:23 UTC (rev 103)
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-if [ ! -f /etc/X11/xorg.conf ]
+CONF="/etc/X11/xorg.conf"
+
+if [ ! -f $CONF ]
 then
 	Xorg -configure &&
 	sed -i 's@/dev/mouse@/dev/input/mice@' ~/xorg.conf.new &&
-	mv ~/xorg.conf.new /etc/X11/xorg.conf
+	mv ~/xorg.conf.new $CONF
 fi
 
-firefox --display=:3
+/usr/bin/firefox --display=:3 &
 echo "Sleeping for 90 seconds to allow Firefox's firstrun to complete"
 sleep 90
 PID=`pidof Xorg`
@@ -15,3 +17,8 @@
 then
 	kill $PID
 fi
+if [ -f $CONF ]
+then
+	rm $CONF
+fi
+return 0

Modified: trunk/packages/html_tidy/Makefile
===================================================================
--- trunk/packages/html_tidy/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/html_tidy/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -7,7 +7,7 @@
 FILE= $(NM)_src.tgz
 FILE1= $(NM)_docs.tgz
 URL= http://tidy.sourceforge.net/src/$(FILE)
-URL1= http://tidy.sourceforge.net/docs/$(FILE2)
+URL1= http://tidy.sourceforge.net/docs/$(FILE1)
 
 
 
@@ -23,7 +23,7 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(FILE2) ] ; then $(WGET) $(URL1) ; fi
+	@if [ ! -f $(FILE1) ] ; then $(WGET) $(URL1) ; fi
 	@if [ ! -f /usr/bin/tidy ] ; then tar xzvf $(FILE) && \
 	 tar xzvf $(FILE1) && cd $(DIR) && \
 	 sh build/gnuauto/setup.sh && \

Modified: trunk/packages/ion/Makefile
===================================================================
--- trunk/packages/ion/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/ion/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,7 +19,7 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/sbin/pppd ] ; then tar -xzvf $(FILE) && cd $(DIR) && \
+	@if [ ! -f /usr/bin/ion ] ; then tar -xzvf $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr && \
 	 make -j3 && make install ; fi
 	@make clean

Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/linux/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -24,10 +24,9 @@
 	@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).1/serie && \
-	 for i in `cat serie` ; do $(WGET) $(URL1).2/$i && \
-	 mv $i ../ && patch -Np1 -i ../$i ; done && \
+	 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) && \
-	 patch -Np1 -i ../$(PATCH2) && \
 	 make mrproper && \
 	 cp $(ROOT)/linux/config .config && \
 	 make -j3 && \

Modified: trunk/packages/lua/Makefile
===================================================================
--- trunk/packages/lua/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/lua/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,9 +19,9 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/sbin/pppd ] ; then tar -xzvf $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
+	@if [ ! -f /usr/bin/lua ] ; then tar -xzvf $(FILE) && cd $(DIR) && \
+	 sed -i 's@/usr/local@/usr@' config && \
+	 make -j3 && make install && ldconfig ; fi
 	@make clean
 
 clean:

Modified: trunk/packages/ncftp/Makefile
===================================================================
--- trunk/packages/ncftp/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/ncftp/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,9 +19,9 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/sbin/pppd ] ; then tar -xjvf $(FILE) && cd $(DIR) && \
+	@if [ ! -f /usr/bin/$(NM) ] ; then tar -xjvf $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr && \
-	 make -C libncftp shared && make -C libncftp soinstall &&
+	 make -C libncftp shared && make -C libncftp soinstall && \
 	 make -j3 && make install ; fi
 	@make clean
 

Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/ncurses/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -33,9 +33,8 @@
 	@echo ""
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -f /usr/bin/clear ] ; then tar xjvf $(SRC)/$(FILE) && \
-	 bunzip2 $(PATCH).bz2 && cd $(DIR) && \
+	@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 && \
 	 make sources && make -j3 && make install && chmod 755 /usr/lib/*.5.4 && \

Modified: trunk/packages/openssh/Makefile
===================================================================
--- trunk/packages/openssh/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/openssh/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,13 +19,13 @@
 	@echo ""
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
+	@-install -v -d -m700 /var/lib/sshd
+	@chown root:sys /var/lib/sshd
+	@-groupadd sshd
+	@-useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@hostname $(HOSTNAME)
 	@if [ ! -f /usr/bin/ssh ] ; then tar xzvf $(FILE) && cd $(DIR) && \
-	 install -v -d -m700 /var/lib/sshd && \
-	 chown root:sys /var/lib/sshd && \
-	 groupadd sshd && \
-	 useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false sshd && \
 	 sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure && \
 	 ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin --with-md5-passwords \
 	 --with-privsep-path=/var/lib/sshd && \

Modified: trunk/packages/pciutils/Makefile
===================================================================
--- trunk/packages/pciutils/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/pciutils/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,7 +19,7 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/lib/libaal.so ] ; then tar xzvf $(FILE) && cd $(DIR) && \
+	@if [ ! -f /usr/sbin/lspci ] ; then tar -xjvf $(FILE) && cd $(DIR) && \
 	 make PREFIX=/usr && \
 	 make PREFIX=/usr install && \
 	 update-pciids ; fi

Modified: trunk/packages/postfix/Makefile
===================================================================
--- trunk/packages/postfix/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/postfix/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -19,12 +19,12 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@-groupadd postfix
+	@-groupadd postdrop
+	@-groupadd -g 65534 nogroup
+	@-useradd -c postfix -d /dev/null -g postfix -s /bin/false postfix
+	@-useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody
 	@if [ ! -f /usr/sbin/postfix ] ; then tar xzvf $(FILE) && cd $(DIR) && \
-	 groupadd postfix && \
-	 groupadd postdrop && \
-	 groupadd -g 65534 nogroup && \
-	 useradd -c postfix -d /dev/null -g postfix -s /bin/false postfix && \
-	 useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody && \
 	 chown postfix:postfix /var/mail && \
 	 make -j3 && \
 	 sh postfix-install daemon_directory=/usr/sbin manpage_directory=/usr/share/man \

Modified: trunk/packages/rp-pppoe/Makefile
===================================================================
--- trunk/packages/rp-pppoe/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/rp-pppoe/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -24,7 +24,7 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
 	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -f /sbin/pppoe ] ; then tar xzvf $(SRC)/$(FILE) && cd $(DIR) && \
+	@if [ ! -f /usr/sbin/pppoe ] ; then tar xzvf $(SRC)/$(FILE) && cd $(DIR) && \
 	 patch -Np1 -i $(SRC)/$(PATCH) && cd src && \
 	 ./configure && make && \
 	 make install ; fi

Modified: trunk/packages/samba/Makefile
===================================================================
--- trunk/packages/samba/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/samba/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= samba
-VRS= 3.0.12
+VRS= 3.0.14a
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
 URL= http://us2.samba.org/samba/ftp/$(FILE)

Modified: trunk/packages/xfce/Makefile
===================================================================
--- trunk/packages/xfce/Makefile	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/packages/xfce/Makefile	2005-04-20 12:04:23 UTC (rev 103)
@@ -20,8 +20,7 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/startxfce4 ] ; then tar -xjvf $(FILE) && cd $(DIR)/src-bz2 && \
-	 for i in `cat $(ROOT)/$(PKG)/list` ; do \
-	 tar xjvf $i.tar.bz2 && cd $i && \
+	 for i in `cat ../../list` ; do tar -xjvf $$i.tar.bz2 && cd $$i && \
 	 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug=no --enable-panel --enable-startup-notification && \
 	 make -j3 && make install && cd .. ; done ; fi
 	@make clean

Modified: trunk/scripts/net-setup
===================================================================
--- trunk/scripts/net-setup	2005-04-18 15:50:11 UTC (rev 102)
+++ trunk/scripts/net-setup	2005-04-20 12:04:23 UTC (rev 103)
@@ -104,8 +104,8 @@
 
 choose_service(){
 
-	# Remove all previous configs, so ifup won't get confused.
-	rm -f $DIR/ifconfig.eth0/*
+	# Remove previous config, so ifup won't get confused.
+	rm -f $ETH0CFG
 
 	echo ""
 	echo "What type of service should eth0 use?"




More information about the livecd mailing list