Menu
▾
▴
[Ipcop-svn] SF.net SVN: ipcop:[1654] ipcop/trunk
|
From: <ow...@us...> - 2008-08-08 13:06:08
|
Revision: 1654
http://ipcop.svn.sourceforge.net/ipcop/?rev=1654&view=rev
Author: owes
Date: 2008-08-08 13:06:16 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Change IPCop version to 1.9.3
Update to kernel 2.6.25.15
Modified Paths:
--------------
ipcop/trunk/lfs/initramfs
ipcop/trunk/lfs/linux
ipcop/trunk/lfs/linux-headers
ipcop/trunk/make.sh
Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs 2008-08-08 13:05:13 UTC (rev 1653)
+++ ipcop/trunk/lfs/initramfs 2008-08-08 13:06:16 UTC (rev 1654)
@@ -657,7 +657,7 @@
#mkdir -p /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide
#cp -a /lib/modules/$(KVER)/kernel/drivers/ide/ide-core.ko \
# /lib/modules/$(KVER)/kernel/drivers/ide/ide-generic.ko \
- # /lib/modules/$(KVER)/kernel/drivers/ide/ide-cd.ko \
+ # /lib/modules/$(KVER)/kernel/drivers/ide/ide-cd_mod.ko \
# /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide/
# Copy the cdrom module
@@ -676,7 +676,7 @@
/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/modules.dep
grep "ide/ide-generic.ko:" /lib/modules/$(KVER)/modules.dep >> \
/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/modules.dep
- grep "ide/ide-cd.ko:" /lib/modules/$(KVER)/modules.dep >> \
+ grep "ide/ide-cd_mod.ko:" /lib/modules/$(KVER)/modules.dep >> \
/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/modules.dep
# Finally copy the init script shamelessly stolen from debian-floppy
Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux 2008-08-08 13:05:13 UTC (rev 1653)
+++ ipcop/trunk/lfs/linux 2008-08-08 13:06:16 UTC (rev 1654)
@@ -33,8 +33,8 @@
include Config
PKG_NAME = linux
-VER = 2.6.24
-PATCHLEVEL = 2.6.24.7
+VER = 2.6.25
+PATCHLEVEL = 2.6.25.15
HOST_ARCH = all
OTHER_SRC = yes
@@ -63,8 +63,8 @@
$(OPENSWAN).tar.gz = http://www.openswan.org/download/development/$(OPENSWAN).tar.gz
openswan-2.4.x.kernel-2.6.23-natt.patch = http://www.openswan.org/download/openswan-2.4.x.kernel-2.6.23-natt.patch
-$(DL_FILE)_MD5 = 3f23ad4b69d0a552042d1ed0f4399857
-patch-$(PATCHLEVEL).bz2_MD5 = 0c1c5d6d8cd82e18d62406d2f34d1d38
+$(DL_FILE)_MD5 = db95a49a656a3247d4995a797d333153
+patch-$(PATCHLEVEL).bz2_MD5 = 11eac6cab56d02b5731bc19548356282
grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz_MD5 = 718ccce29ce12064673dbe8eb4752696
# match _MD5, first or second line, after the space
$(OPENSWAN).tar.gz_MD5 = $(shell sed -ne '/_MD5.*/p' openswan | sed -e '1!d' | cut -d ' ' -f 2)
Modified: ipcop/trunk/lfs/linux-headers
===================================================================
--- ipcop/trunk/lfs/linux-headers 2008-08-08 13:05:13 UTC (rev 1653)
+++ ipcop/trunk/lfs/linux-headers 2008-08-08 13:06:16 UTC (rev 1654)
@@ -41,8 +41,8 @@
# 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.24
-PATCHLEVEL = 2.6.24.7
+VER = 2.6.25
+PATCHLEVEL = 2.6.25.15
HOST_ARCH = all
OTHER_SRC = yes
@@ -63,8 +63,8 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
patch-$(PATCHLEVEL).bz2 = $(DL_FROM)/patch-$(PATCHLEVEL).bz2
-$(DL_FILE)_MD5 = 3f23ad4b69d0a552042d1ed0f4399857
-patch-$(PATCHLEVEL).bz2_MD5 = 0c1c5d6d8cd82e18d62406d2f34d1d38
+$(DL_FILE)_MD5 = db95a49a656a3247d4995a797d333153
+patch-$(PATCHLEVEL).bz2_MD5 = 11eac6cab56d02b5731bc19548356282
install : $(TARGET)
@@ -108,12 +108,13 @@
ifeq "$(STAGE)" "base"
cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-2.6-atm-headers.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-2.6.25-fat_valid_media.patch
cd $(DIR_APP) && sed -i '/scsi/d' include/Kbuild
cd $(DIR_APP) && make mrproper
cd $(DIR_APP) && make headers_check
cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install
cd $(DIR_APP) && cp -rv dest/include/* /usr/include
- cd $(DIR_APP) && cp -a include/linux/ufs_fs* /usr/include/linux
+ #cd $(DIR_APP) && cp -a include/linux/ufs_fs* /usr/include/linux
endif
@rm -rf $(DIR_APP)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2008-08-08 13:05:13 UTC (rev 1653)
+++ ipcop/trunk/make.sh 2008-08-08 13:06:16 UTC (rev 1654)
@@ -50,13 +50,13 @@
SNAME="ipcop"
# This is the IPCop internal version number. May or may not be the version released eventually.
-VERSION=1.9.2
+VERSION=1.9.3
# This is the last official IPCop version number. Meaningless in SVN HEAD.
#PREVIOUSTAG=IPCOP_v1_4_4_FINAL
# Just an arbitrary name for the downloadable, prebuilt toolchain (if you want to save time compiling).
-TOOLCHAINVERSION=1.9.2
+TOOLCHAINVERSION=1.9.3
# A collection of all the external software needed to build, install, and run ipcop. This is for GPL compliance.
OTHERSRC=${SNAME}-${VERSION}-othersrc.tar.bz2
@@ -1737,8 +1737,8 @@
chroot_make binary-firmware-all
chroot_make 3cp4218
chroot_make amedyn2
- chroot_make CnxADSL
- chroot_make wanpipe
+ #chroot_make CnxADSL # DEBUG -- broken with kernel 2.6.26
+ #chroot_make wanpipe # DEBUG -- broken with kernel 2.6.25
#chroot_make fcdsl # DEBUG -- what's wrong here?
#chroot_make fcdsl2 # DEBUG -- what's wrong here?
#chroot_make fcdslsl # DEBUG -- what's wrong here?
@@ -1747,7 +1747,7 @@
chroot_make pulsar
#chroot_make unicorn # DEBUG -- broken under gcc-4.1
chroot_make pcmciautils
- chroot_make eciadsl-usermode
+ #chroot_make eciadsl-usermode # DEBUG -- broken with kernel 2.6.25
chroot_make cpio
chroot_make expat
chroot_make gdbm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
