Author: jhuntwork
Date: 2007-08-01 11:58:53 -0600 (Wed, 01 Aug 2007)
New Revision: 2003
Added:
branches/minimal/packages/libaal/
branches/minimal/packages/libaal/Makefile
branches/minimal/packages/reiser4progs/
branches/minimal/packages/reiser4progs/Makefile
Modified:
branches/minimal/Makefile
branches/minimal/packages/initramfs/Makefile
branches/minimal/packages/linux/Makefile
branches/minimal/packages/linux/config.x86
Log:
Merged r1997 and r1999 to minimal branch.
Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile 2007-08-01 17:52:38 UTC (rev 2002)
+++ branches/minimal/Makefile 2007-08-01 17:58:53 UTC (rev 2003)
@@ -278,8 +278,8 @@
ch-strace ch-iptables ch-eject ch-hdparm \
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-lilo ch-syslinux \
- ch-scsi-firmware ch-net-firmware ch-initramfs
+ ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \
+ ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware
ch-initramfs
ifeq ($(CD_ARCH),x86)
make ch-grub
make ch-linux
Modified: branches/minimal/packages/initramfs/Makefile
===================================================================
--- branches/minimal/packages/initramfs/Makefile 2007-08-01 17:52:38 UTC
(rev 2002)
+++ branches/minimal/packages/initramfs/Makefile 2007-08-01 17:58:53 UTC
(rev 2003)
@@ -44,7 +44,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,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
Added: branches/minimal/packages/libaal/Makefile
===================================================================
--- branches/minimal/packages/libaal/Makefile (rev 0)
+++ branches/minimal/packages/libaal/Makefile 2007-08-01 17:58:53 UTC (rev
2003)
@@ -0,0 +1,30 @@
+# libaal Makefile
+
+NM= libaal
+VRS= 1.0.5
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://ftp.namesys.com/pub/reiser4progs/$(FILE)
+SHA-$(FILE)= 542a39dd7cd1b051b2b2ec9c6e5da5ac056210c7
+
+# 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
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: branches/minimal/packages/linux/Makefile
===================================================================
--- branches/minimal/packages/linux/Makefile 2007-08-01 17:52:38 UTC (rev
2002)
+++ branches/minimal/packages/linux/Makefile 2007-08-01 17:58:53 UTC (rev
2003)
@@ -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
# Targets
@@ -18,10 +22,11 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
compile-stage2:
+ zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
install -d /boot/isolinux
make mrproper
Modified: branches/minimal/packages/linux/config.x86
===================================================================
--- branches/minimal/packages/linux/config.x86 2007-08-01 17:52:38 UTC (rev
2002)
+++ branches/minimal/packages/linux/config.x86 2007-08-01 17:58:53 UTC (rev
2003)
@@ -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
Added: branches/minimal/packages/reiser4progs/Makefile
===================================================================
--- branches/minimal/packages/reiser4progs/Makefile
(rev 0)
+++ branches/minimal/packages/reiser4progs/Makefile 2007-08-01 17:58:53 UTC
(rev 2003)
@@ -0,0 +1,31 @@
+# Reiser4progs Makefile
+
+NM= reiser4progs
+VRS= 1.0.6
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://ftp.namesys.com/pub/reiser4progs/$(FILE)
+SHA-$(FILE)= 9acc4f829c5760ee159cb3f507e58478e578990d
+
+# 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 --sbindir=/sbin
+ make
+ make install
+ ln -sf mkfs.reiser4 /sbin/mkreiser4fs
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
