Author: alexander
Date: 2006-12-06 21:29:11 -0700 (Wed, 06 Dec 2006)
New Revision: 1769
Added:
trunk/packages/libusb/
trunk/packages/libusb/Makefile
trunk/packages/usbutils/
trunk/packages/usbutils/Makefile
Modified:
trunk/Makefile
trunk/isolinux/isolinux.cfg
trunk/isolinux/options.msg
trunk/packages/BRLTTY/Makefile
trunk/packages/binutils64/Makefile
trunk/packages/eject/Makefile
trunk/packages/gcc64/Makefile
trunk/packages/linux/Makefile
trunk/packages/linux64/Makefile
trunk/packages/strace/Makefile
Log:
Built all packages before the kernel
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -265,7 +265,8 @@
ch-Terminal ch-mousepad ch-irssi ch-gaim \
ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc \
- ch-dialog ch-ncftp ch-pciutils ch-device-mapper ch-LVM2 ch-dmraid \
+ ch-dialog ch-ncftp ch-pciutils ch-libusb ch-usbutils \
+ ch-device-mapper ch-LVM2 ch-dmraid \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \
ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm stop-here
ch-linux \
Modified: trunk/isolinux/isolinux.cfg
===================================================================
--- trunk/isolinux/isolinux.cfg 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/isolinux/isolinux.cfg 2006-12-07 04:29:11 UTC (rev 1769)
@@ -11,11 +11,3 @@
label linux64
kernel linux64
append initrd=initramfs_data_cpio.gz
-
-label linux.ata
- kernel linux.ata
- append initrd=initramfs_data_cpio.gz
-
-label linux64.ata
- kernel linux.ata
- append initrd=initramfs_data_cpio.gz
Modified: trunk/isolinux/options.msg
===================================================================
--- trunk/isolinux/options.msg 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/isolinux/options.msg 2006-12-07 04:29:11 UTC (rev 1769)
@@ -9,10 +9,7 @@
792 = 1024x768x24 791 = 1024x768x16
789 = 800x600x24 788 = 800x600x16
-There is also an alternative kernel image available that supports
-booting from SATA CD-ROMs. To use it, type "linux.ata". Note:
-it will rename your IDE disks from /dev/hdX to /dev/sdY. 64-bit
-kernels for use with CLFS are available as "linux64" and "linux64.ata"
+A 64-bit kernel for use with CLFS is available as "linux64"
To set your timezone, add TZ=your_timezone anywhere
after "linux" or "linux.ata". For example, TZ=EDT+4 means that the
Modified: trunk/packages/BRLTTY/Makefile
===================================================================
--- trunk/packages/BRLTTY/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/BRLTTY/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -20,6 +20,7 @@
$(std_build)
compile-stage2:
+ sed -i '/linux\/compiler\.h/d' Programs/usb_linux.c
./configure --prefix=/usr --sysconfdir=/etc --disable-speech-support \
--disable-api
make $(PM)
Modified: trunk/packages/binutils64/Makefile
===================================================================
--- trunk/packages/binutils64/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/binutils64/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -1,11 +1,11 @@
# Binutils Makefile
NM= binutils
-VRS= 2.16.1
+VRS= 2.17
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 5c80fd5657da47efc16a63fdd93ef7395319fbbf
+SHA-$(FILE)= a557686eef68362ea31a3aa41ce274e3eeae1ef0
# Targets
Modified: trunk/packages/eject/Makefile
===================================================================
--- trunk/packages/eject/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/eject/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- ./bootstrap
+ autoreconf --force --install --verbose
./configure --prefix=/usr
make $(PM)
make install
Modified: trunk/packages/gcc64/Makefile
===================================================================
--- trunk/packages/gcc64/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/gcc64/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -1,12 +1,12 @@
# Gcc Makefile
NM= gcc
-VRS= 4.0.3
+VRS= 4.1.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 5a94943d9ab823cf8d080cc7f9e8a4a91797afea
+SHA-$(FILE)= a398b95d38b6e35f4c4e02c34c0a3bff79811f8f
# Targets
Added: trunk/packages/libusb/Makefile
===================================================================
--- trunk/packages/libusb/Makefile (rev 0)
+++ trunk/packages/libusb/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -0,0 +1,30 @@
+# libusb Makefile
+
+NM= libusb
+VRS= 0.1.12
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://easynews.dl.sourceforge.net/libusb/$(FILE)
+SHA-$(FILE)= 599a5168590f66bc6f1f9a299579fd8500614807
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr --disable-build-docs
+ make
+ make install
+
+clean:
+ -rm -rf $(NM)
+
+.PHONY: clean chroot compile-stage2
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/linux/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -1,12 +1,12 @@
# Linux Kernel Makefile
NM= linux
-VRS= 2.6.16.27
+VRS= 2.6.18.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 8a7df3c58179c8a23a36767de2354baa778d3a50
DIR1= loop-AES-v3.1d
FILE1= $(DIR1).tar.bz2
@@ -20,32 +20,14 @@
# URL_REISER4=
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/
-PATCH028= patch-2.6.16.27-28.bz2
-URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028)
-SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f
+PATCH1= reiser4-for-2.6.18-3.patch.gz
+URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.18/$(PATCH1)
+SHA-$(PATCH1)= e35fae6d15631f29594076cbc692baeab81d4f69
-PATCH029= patch-2.6.16.28-29.bz2
-URL-$(PATCH029)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH029)
-SHA-$(PATCH029)= afdbe88bafec3d2820a00b85e85a6ea2e71ec97b
-
-PATCH1= reiser4-for-2.6.16-1.patch.gz
-URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1)
-SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98
-
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
-PATCH4= patch-2.6.16-ide1.gz
-URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4)
-SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819
-
-PATCH5= sym2-claim-only-Storage-class.patch
-
-PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50)
-SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5
-
-DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) $(PATCH029)
-DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50)
+DEPS= $(FILE) $(FILE1) $(FILE2)
+DEPS+= $(PATCH1) $(PATCH3)
# Targets
include $(ROOT)/scripts/functions
@@ -62,46 +44,34 @@
stage2: Makefile $(DEPS)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH028),$(PATCH029),$(PATCH50)} $(LFSSRC)/
compile-stage2:
ifeq ($(LFS-ARCH),x86)
mkdir -p /boot/isolinux
endif
-ifndef LIBATA_SUFFIX
unpack ../$(FILE1)
unpack ../$(FILE2)
rm -f drivers/block/loop.c include/linux/loop.h
patch -Np1 -i $(DIR1)/kernel-2.6.16.diff
- bzcat ../$(PATCH028) | patch -Np1
- bzcat ../$(PATCH029) | patch -Np1
zcat ../$(PATCH1) | patch -Np1
# for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i
../reiser4/$$a ; done
# echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c
patch -Np1 -i ../$(PATCH3)
- zcat ../$(PATCH4) | patch -Np1
- patch -Np1 -i ../$(PATCH5)
- patch -Np1 -i ../$(PATCH50)
-endif
make mrproper
- cp ../config.$(LFS-ARCH)$(LIBATA_SUFFIX) .config
-ifndef LIBATA_SUFFIX
+ exit 1
+ cp ../config.$(LFS-ARCH) .config
make $(PM)
make modules_install
cd $(DIR2) ; unset VERSION ; make LINUX_SOURCE=..
-endif
ifeq ($(LFS-ARCH),x86)
make $(PM) bzImage
- cp -v arch/i386/boot/bzImage /boot/isolinux/linux$(LIBATA_SUFFIX)
+ cp -v arch/i386/boot/bzImage /boot/isolinux/linux
endif
ifeq ($(LFS-ARCH),ppc)
make $(PM) vmlinux
- cp -v vmlinux /boot/linux$(LIBATA_SUFFIX)
+ cp -v vmlinux /boot/linux
endif
-ifndef LIBATA_SUFFIX
cd .. ; ./debian-style-headers.sh $(DIR)
- make -f ../Makefile compile-stage2 LIBATA_SUFFIX=.ata
-endif
clean:
-rm -rf $(DIR)
Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/linux64/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -1,12 +1,12 @@
# Linux Kernel Makefile
NM= linux
-VRS= 2.6.16.27
+VRS= 2.6.18.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176
+SHA-$(FILE)= 8a7df3c58179c8a23a36767de2354baa778d3a50
DIR1= loop-AES-v3.1d
FILE1= $(DIR1).tar.bz2
@@ -20,32 +20,14 @@
# URL_REISER4=
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/
-PATCH028= patch-2.6.16.27-28.bz2
-URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028)
-SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f
+PATCH1= reiser4-for-2.6.18-3.patch.gz
+URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.18/$(PATCH1)
+SHA-$(PATCH1)= e35fae6d15631f29594076cbc692baeab81d4f69
-PATCH029= patch-2.6.16.28-29.bz2
-URL-$(PATCH029)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH029)
-SHA-$(PATCH029)= afdbe88bafec3d2820a00b85e85a6ea2e71ec97b
-
-PATCH1= reiser4-for-2.6.16-1.patch.gz
-URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1)
-SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98
-
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
-PATCH4= patch-2.6.16-ide1.gz
-URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4)
-SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819
-
-PATCH5= sym2-claim-only-Storage-class.patch
-
-PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50)
-SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5
-
-DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) $(PATCH029)
-DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50)
+DEPS= $(FILE) $(FILE1) $(FILE2)
+DEPS+= $(PATCH1) $(PATCH3)
# Targets
include $(ROOT)/scripts/functions
@@ -64,34 +46,23 @@
$(std_build)
compile-stage2:
-ifndef LIBATA_SUFFIX
unpack ../$(FILE1)
unpack ../$(FILE2)
rm -f drivers/block/loop.c include/linux/loop.h
patch -Np1 -i $(DIR1)/kernel-2.6.16.diff
- bzcat ../$(PATCH028) | patch -Np1
- bzcat ../$(PATCH029) | patch -Np1
zcat ../$(PATCH1) | patch -Np1
# for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i
../reiser4/$$a ; done
# echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c
patch -Np1 -i ../$(PATCH3)
- zcat ../$(PATCH4) | patch -Np1
- patch -Np1 -i ../$(PATCH5)
- patch -Np1 -i ../$(PATCH50)
-endif
make mrproper
- cp ../config.x86_64$(LIBATA_SUFFIX) .config
-ifndef LIBATA_SUFFIX
+ exit 1
+ cp ../config.x86_64 .config
PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
cd $(DIR2) ; unset VERSION ; PATH=$$PATH:$(WD)/bin make LINUX_SOURCE=..
ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu-
rm /lib/modules/*-64bit/{source,build}
-endif
PATH=$$PATH:$(WD)/bin make bzImage ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
- cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64$(LIBATA_SUFFIX)
-ifndef LIBATA_SUFFIX
- make -f ../Makefile compile-stage2 LIBATA_SUFFIX=.ata
-endif
+ cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64
clean:
-rm -rf $(DIR)
Modified: trunk/packages/strace/Makefile
===================================================================
--- trunk/packages/strace/Makefile 2006-12-07 03:28:58 UTC (rev 1768)
+++ trunk/packages/strace/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -20,6 +20,8 @@
$(std_build)
compile-stage2:
+ sed -i 's/ifdef PT_GETSIGINFO/if 0/' strace.c
+ sed -i '/CTL_PROC/d' system.c
./configure --prefix=/usr
make $(PM)
make install
Added: trunk/packages/usbutils/Makefile
===================================================================
--- trunk/packages/usbutils/Makefile (rev 0)
+++ trunk/packages/usbutils/Makefile 2006-12-07 04:29:11 UTC (rev 1769)
@@ -0,0 +1,32 @@
+# usbutils Makefile
+
+NM= usbutils
+VRS= 0.72
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://easynews.dl.sourceforge.net/linux-usb/$(FILE)
+SHA-$(FILE)= 891b8825d964880146d5c980e52bb9e23d92fe2b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ sed -i 's|DEST=|&/usr/share/|' update-usbids.sh
+ ./configure --prefix=/usr
+ make
+ make install
+ install -v -m755 update-usbids.sh /usr/sbin/update-usbids
+
+clean:
+ -rm -rf $(NM)
+
+.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
