Revision: 6741
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6741&view=rev
Author:   gespinasse
Date:     2012-08-05 06:06:20 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Switch to 3.0(.39) kernel headers

Remove ancient sed -i '/scsi/d' include/Kbuild that was use in time of LFS-6.3, 
linux-2.6.22, glibc-2.5 and removed in LFS-6.4
This doesn't change any configure results.

Modified Paths:
--------------
    ipcop/trunk/lfs/linux-headers

Modified: ipcop/trunk/lfs/linux-headers
===================================================================
--- ipcop/trunk/lfs/linux-headers       2012-08-05 06:01:22 UTC (rev 6740)
+++ ipcop/trunk/lfs/linux-headers       2012-08-05 06:06:20 UTC (rev 6741)
@@ -41,14 +41,14 @@
 # you have to recompile _every_ single package in all stages
 # Also keep in mind that once we release ipcop-2.0, there can be
 # NO UPGRADING of this package.  You can still upgrade lfs/linux though
-VER        = 2.6.32
-PATCHLEVEL = 2.6.32.21
+VER        = 3.0
+PATCHLEVEL = 3.0.39
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
 THISAPP    = linux-${VER}
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://ipcop-addons.ath.cx/misc/IPCop
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_KERNEL)/linux/kernel/v3.x
 DIR_APP    = $(DIR_SRC)/$(THISAPP)-headers
 CFLAGS     =
 CXXFLAGS   =
@@ -58,13 +58,13 @@
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects                = $(DL_FILE) patch-$(PATCHLEVEL).bz2
+objects                = $(DL_FILE) patch-$(PATCHLEVEL).xz
 
 $(DL_FILE)                             = $(DL_FROM)/$(DL_FILE)
-patch-$(PATCHLEVEL).bz2                        = 
$(DL_FROM)/patch-$(PATCHLEVEL).bz2
+patch-$(PATCHLEVEL).xz                 = $(DL_FROM)/patch-$(PATCHLEVEL).xz
 
-$(DL_FILE)_MD5                         = 260551284ac224c3a43c4adac7df4879
-patch-$(PATCHLEVEL).bz2_MD5            = 29aa10a231882a6e52908642b572326f
+$(DL_FILE)_MD5                         = ecf932280e2441bdd992423ef3d55f8f
+patch-$(PATCHLEVEL).xz_MD5             = 13b89c534d8d1d54bd9491e4091c62e4
 
 install : $(TARGET)
 
@@ -95,9 +95,9 @@
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/TEMP && mkdir $(DIR_SRC)/TEMP
-       cd $(DIR_SRC)/TEMP && tar --no-same-owner --no-same-permissions -jxf 
$(DIR_DL)/$(DL_FILE)
-       @mv $(DIR_SRC)/TEMP/* $(DIR_APP) && rm -fr $(DIR_SRC)/TEMP
-       cd $(DIR_APP) && bzcat $(DIR_DL)/patch-$(PATCHLEVEL).bz2 | patch -p1
+       cd $(DIR_SRC)/TEMP && tar --no-same-owner --no-same-permissions -xf 
$(DIR_DL)/$(DL_FILE)
+       mv $(DIR_SRC)/TEMP/* $(DIR_APP) && rm -fr $(DIR_SRC)/TEMP
+       cd $(DIR_APP) && xzcat $(DIR_DL)/patch-$(PATCHLEVEL).xz | patch -p1
        # fix parted-3.0 configure big warning
        cd $(DIR_APP) && sed -i -e 's:include <linux/magic.h>:include 
<linux/magic.h>\n#include <linux/fs.h>:' include/linux/ext2_fs.h
 
@@ -112,18 +112,13 @@
 endif
 
 ifeq "$(STAGE)" "base"
-               # 2.6.32 and 3.0 patch are identical, 
-               # We will need to decide to update kernel version in 
linux-headers or keep 2 'versions' of the patch
-               cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/linux-3.0_atm-headers.patch
-
-               cd $(DIR_APP) && sed -i '/scsi/d' include/Kbuild
+               cd $(DIR_APP) && patch -p1 -i 
$(DIR_PATCHES)/linux-3.0_atm-headers.patch
                cd $(DIR_APP) && make mrproper
                cd $(DIR_APP) && make headers_check
                cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install
                # remove unneeded files
                cd $(DIR_APP) && find dest/include \( -name .install -o -name 
..install.cmd \) -delete
                cd $(DIR_APP) && cp -r dest/include/* /usr/include
-               #cd $(DIR_APP) && cp -a include/linux/ufs_fs* /usr/include/linux
 endif
 
        @rm -rf $(DIR_APP)

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to