Changeset 2003

Show
Ignore:
Timestamp:
08/01/07 11:58:53 (1 year ago)
Author:
jhuntwork
Message:

Merged r1997 and r1999 to minimal branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2001 r2003  
    279279        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \ 
    280280        ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 
    281         ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-lilo ch-syslinux \ 
    282         ch-scsi-firmware ch-net-firmware ch-initramfs 
     281        ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \ 
     282        ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-initramfs 
    283283ifeq ($(CD_ARCH),x86) 
    284284        make ch-grub 

  • branches/minimal/packages/initramfs/Makefile

    r1994 r2003  
    4545        cp /usr/sbin/dmsetup $(WDIR)/sbin 
    4646        find /lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,ieee1394,firewire,hid,message,scsi,pcmcia,usb/{core,host,storage}} \ 
    47             /lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,reiserfs,xfs,fat,vfat,ntfs,isofs,udf,nls} \ 
     47            /lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,jbd2,reiserfs,reiser4,xfs,fat,vfat,ntfs,isofs,udf,nls} \ 
    4848            /lib/modules/*/kernel/lib -type f | cpio --make-directories -p $(WDIR) 
    4949        for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ; done 

  • branches/minimal/packages/linux/Makefile

    r2001 r2003  
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    99SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef 
     10 
     11PATCH1= reiser4-for-2.6.22-2.patch.gz 
     12URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1) 
     13SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7 
    1014 
    1115PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch 
    …… 
    1923        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    2024 
    21 stage2: Makefile $(FILE) 
     25stage2: Makefile $(FILE) $(PATCH1) 
    2226        $(std_build) 
    2327 
    2428compile-stage2: 
     29        zcat ../$(PATCH1) | patch -Np1 
    2530        patch -Np1 -i ../$(PATCH3) 
    2631        install -d /boot/isolinux 

  • branches/minimal/packages/linux/config.x86

    r1973 r2003  
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.22.1 
    4 # Sat Jul 21 15:07:32 2007 
     4# Wed Aug  1 18:31:58 2007 
    55# 
    66CONFIG_X86_32=y 
    …… 
    19671967# CONFIG_JBD2_DEBUG is not set 
    19681968CONFIG_FS_MBCACHE=m 
     1969CONFIG_REISER4_FS=m 
     1970# CONFIG_REISER4_DEBUG is not set 
    19691971CONFIG_REISERFS_FS=m 
    19701972# CONFIG_REISERFS_CHECK is not set