Author: alexander
Date: 2007-08-01 09:05:11 -0600 (Wed, 01 Aug 2007)
New Revision: 1999
Modified:
trunk/Makefile
trunk/packages/initramfs/Makefile
trunk/packages/libaal/Makefile
trunk/packages/linux/Makefile
trunk/packages/linux/config.x86
trunk/packages/linux64/Makefile
trunk/packages/linux64/config.x86_64
trunk/packages/reiser4progs/Makefile
Log:
Added reiser4 - sorry for the linux64 part
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/Makefile 2007-08-01 15:05:11 UTC (rev 1999)
@@ -270,7 +270,7 @@
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-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \
ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \
ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \
ch-initramfs ch-gcc33
Modified: trunk/packages/initramfs/Makefile
===================================================================
--- trunk/packages/initramfs/Makefile 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/packages/initramfs/Makefile 2007-08-01 15:05:11 UTC (rev 1999)
@@ -41,7 +41,7 @@
cp /usr/bin/stat $(WDIR)/bin
cp /usr/sbin/dmsetup $(WDIR)/sbin
find
/lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,ieee1394,firewire,hid,message,scsi,pcmcia,usb/{core,host,storage}}
\
-
/lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,jbd2,reiserfs,xfs,fat,vfat,ntfs,isofs,udf,nls}
\
+
/lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,jbd2,reiserfs,reiser4,xfs,fat,vfat,ntfs,isofs,udf,nls}
\
/lib/modules/*/kernel/lib -type f | cpio --make-directories -p
$(WDIR)
for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ;
done
cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data.cpio.gz
Modified: trunk/packages/libaal/Makefile
===================================================================
--- trunk/packages/libaal/Makefile 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/packages/libaal/Makefile 2007-08-01 15:05:11 UTC (rev 1999)
@@ -20,8 +20,7 @@
$(std_build)
compile-stage2:
-# --enable-static overrides unsuitable default from config.site
- ./configure --prefix=/usr --enable-static
+ ./configure --prefix=/usr
make
make install
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/packages/linux/Makefile 2007-08-01 15:05:11 UTC (rev 1999)
@@ -8,6 +8,10 @@
URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef
+PATCH1= reiser4-for-2.6.22-2.patch.gz
+URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1)
+SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7
+
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
FILE1= ati-driver-installer-8.38.6-x86.x86_64.run
@@ -37,10 +41,11 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(PATCH1)
$(std_build)
compile-stage2:
+ zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
mkdir -p /boot/isolinux
make mrproper
Modified: trunk/packages/linux/config.x86
===================================================================
--- trunk/packages/linux/config.x86 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/packages/linux/config.x86 2007-08-01 15:05:11 UTC (rev 1999)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.1
-# Sat Jul 21 15:07:32 2007
+# Wed Aug 1 18:31:58 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -1966,6 +1966,8 @@
CONFIG_JBD2=m
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=m
+CONFIG_REISER4_FS=m
+# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile 2007-08-01 13:08:21 UTC (rev 1998)
+++ trunk/packages/linux64/Makefile 2007-08-01 15:05:11 UTC (rev 1999)
@@ -8,6 +8,10 @@
URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef
+PATCH1= reiser4-for-2.6.22-2.patch.gz
+URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1)
+SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7
+
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
FILE1= ati-driver-installer-8.38.6-x86.x86_64.run
@@ -37,10 +41,11 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(PATCH1)
$(std_build)
compile-stage2:
+ zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
make mrproper
cp ../config.x86_64 .config
Modified: trunk/packages/linux64/config.x86_64
===================================================================
--- trunk/packages/linux64/config.x86_64 2007-08-01 13:08:21 UTC (rev
1998)
+++ trunk/packages/linux64/config.x86_64 2007-08-01 15:05:11 UTC (rev
1999)
@@ -1821,6 +1821,8 @@
# CONFIG_JBD_DEBUG is not set
CONFIG_JBD2=m
# CONFIG_JBD2_DEBUG is not set
+CONFIG_REISER4_FS=m
+# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
Modified: trunk/packages/reiser4progs/Makefile
===================================================================
--- trunk/packages/reiser4progs/Makefile 2007-08-01 13:08:21 UTC (rev
1998)
+++ trunk/packages/reiser4progs/Makefile 2007-08-01 15:05:11 UTC (rev
1999)
@@ -1,12 +1,12 @@
# Reiser4progs Makefile
NM= reiser4progs
-VRS= 1.0.5
+VRS= 1.0.6
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= http://ftp.namesys.com/pub/reiser4progs/$(FILE)
-SHA-$(FILE)= c2a173d34a87776da79a13c85b17cd3a14fb3abc
+SHA-$(FILE)= 9acc4f829c5760ee159cb3f507e58478e578990d
# Targets
@@ -20,8 +20,7 @@
$(std_build)
compile-stage2:
- # GRUB doesn't like shared libreiser4_minimal
- ./configure --prefix=/usr --sbindir=/sbin --enable-static
+ ./configure --prefix=/usr --sbindir=/sbin
make
make install
ln -sf mkfs.reiser4 /sbin/mkreiser4fs
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
