wok-current rev 243

Linux: patches compatible with busybox/patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 18 22:54:56 2008 +0100 (2008-02-18)
parents d1ecaea3e7cf
children ab4a92eca531
files linux/stuff/linux-lzma-2.6.24.2.u
line diff
     1.1 --- a/linux/stuff/linux-lzma-2.6.24.2.u	Mon Feb 18 14:40:48 2008 +0100
     1.2 +++ b/linux/stuff/linux-lzma-2.6.24.2.u	Mon Feb 18 22:54:56 2008 +0100
     1.3 @@ -38,6 +38,7 @@
     1.4  +
     1.5  +$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
     1.6   	$(call if_changed,ld)
     1.7 +
     1.8  --- linux-2.6.24.2/arch/x86/boot/compressed/Makefile_64
     1.9  +++ linux-2.6.24.2/arch/x86/boot/compressed/Makefile_64
    1.10  @@ -4,7 +4,7 @@
    1.11 @@ -49,6 +50,7 @@
    1.12   
    1.13   KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \
    1.14   	  -fno-strict-aliasing -fPIC -mcmodel=small \
    1.15 +
    1.16  --- linux-2.6.24.2/arch/x86/boot/compressed/misc_32.c
    1.17  +++ linux-2.6.24.2/arch/x86/boot/compressed/misc_32.c
    1.18  @@ -121,9 +121,12 @@ typedef unsigned long  ulg;
    1.19 @@ -232,6 +234,7 @@
    1.20   	putstr("Ok, booting the kernel.\n");
    1.21   	return;
    1.22   }
    1.23 +
    1.24  --- linux-2.6.24.2/arch/x86/boot/compressed/misc_64.c
    1.25  +++ linux-2.6.24.2/arch/x86/boot/compressed/misc_64.c
    1.26  @@ -121,9 +121,12 @@ typedef unsigned long  ulg;
    1.27 @@ -411,6 +414,7 @@
    1.28   	putstr("done.\nBooting the kernel.\n");
    1.29   	return;
    1.30   }
    1.31 +
    1.32  --- linux-2.6.24.2/drivers/block/Kconfig
    1.33  +++ linux-2.6.24.2/drivers/block/Kconfig
    1.34  @@ -356,6 +356,30 @@ config BLK_DEV_RAM_BLOCKSIZE
    1.35 @@ -444,6 +448,7 @@
    1.36   config CDROM_PKTCDVD
    1.37   	tristate "Packet writing on CD/DVD media"
    1.38   	depends on !UML
    1.39 +
    1.40  --- linux-2.6.24.2/include/linux/decompress_bunzip2.h
    1.41  +++ linux-2.6.24.2/include/linux/decompress_bunzip2.h
    1.42  @@ -0,0 +1,16 @@
    1.43 @@ -463,6 +468,7 @@
    1.44  +		   int *pos);
    1.45  +
    1.46  +#endif
    1.47 +
    1.48  --- linux-2.6.24.2/include/linux/decompress_generic.h
    1.49  +++ linux-2.6.24.2/include/linux/decompress_generic.h
    1.50  @@ -0,0 +1,28 @@
    1.51 @@ -494,6 +500,7 @@
    1.52  + 
    1.53  +
    1.54  +#endif
    1.55 +
    1.56  --- linux-2.6.24.2/include/linux/decompress_unlzma.h
    1.57  +++ linux-2.6.24.2/include/linux/decompress_unlzma.h
    1.58  @@ -0,0 +1,15 @@
    1.59 @@ -512,6 +519,7 @@
    1.60  +		  int *pos);
    1.61  +
    1.62  +#endif
    1.63 +
    1.64  --- linux-2.6.24.2/init/do_mounts_rd.c
    1.65  +++ linux-2.6.24.2/init/do_mounts_rd.c
    1.66  @@ -8,6 +8,16 @@
    1.67 @@ -767,6 +775,7 @@
    1.68  +#endif
    1.69   
    1.70   #endif  /* BUILD_CRAMDISK */
    1.71 +
    1.72  --- linux-2.6.24.2/init/initramfs.c
    1.73  +++ linux-2.6.24.2/init/initramfs.c
    1.74  @@ -7,6 +7,15 @@
    1.75 @@ -903,6 +912,7 @@
    1.76   	free(name_buf);
    1.77   	free(symlink_buf);
    1.78   	free(header_buf);
    1.79 +
    1.80  --- linux-2.6.24.2/init/Kconfig
    1.81  +++ linux-2.6.24.2/init/Kconfig
    1.82  @@ -92,6 +92,56 @@ config LOCALVERSION_AUTO
    1.83 @@ -962,6 +972,7 @@
    1.84   config SWAP
    1.85   	bool "Support for paging of anonymous memory (swap)"
    1.86   	depends on MMU && BLOCK
    1.87 +
    1.88  --- linux-2.6.24.2/lib/decompress_bunzip2.c
    1.89  +++ linux-2.6.24.2/lib/decompress_bunzip2.c
    1.90  @@ -0,0 +1,645 @@
    1.91 @@ -1610,6 +1621,7 @@
    1.92  +	return i;
    1.93  +}
    1.94  +
    1.95 +
    1.96  --- linux-2.6.24.2/lib/decompress_unlzma.c
    1.97  +++ linux-2.6.24.2/lib/decompress_unlzma.c
    1.98  @@ -0,0 +1,605 @@
    1.99 @@ -2218,6 +2230,7 @@
   1.100  +	large_free(buffer);
   1.101  +	return -1;
   1.102  +}
   1.103 +
   1.104  --- linux-2.6.24.2/lib/Makefile
   1.105  +++ linux-2.6.24.2/lib/Makefile
   1.106  @@ -50,6 +50,10 @@ obj-$(CONFIG_CRC7)	+= crc7.o
   1.107 @@ -2231,6 +2244,7 @@
   1.108   obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
   1.109   obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
   1.110   obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
   1.111 +
   1.112  --- linux-2.6.24.2/scripts/Makefile.lib
   1.113  +++ linux-2.6.24.2/scripts/Makefile.lib
   1.114  @@ -166,4 +166,17 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS)