[pisa-src] r974 - trunk/openwrt/trunk/patches

From: Thomas Jansen <mithi@xxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Fri, 18 Sep 2009 12:39:13 +0200
Author: tjansen
Date: Fri Sep 18 12:39:12 2009
New Revision: 974

Log:
OpenWRT kernel packaging fixes. Track them, until they are merged upstream.

Added:
   trunk/openwrt/trunk/patches/
   trunk/openwrt/trunk/patches/crypto.patch
   trunk/openwrt/trunk/patches/netdevices.patch
   trunk/openwrt/trunk/patches/netsupport.patch
   trunk/openwrt/trunk/patches/readme

Added: trunk/openwrt/trunk/patches/crypto.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/openwrt/trunk/patches/crypto.patch    Fri Sep 18 12:39:12 2009        
(r974)
@@ -0,0 +1,31 @@
+Index: package/kernel/modules/crypto.mk
+===================================================================
+--- openwrt-orig/package/kernel/modules/crypto.mk 2009-09-16 
15:11:43.000000000 +0200
++++ openwrt-mod/package/kernel/modules/crypto.mk 2009-09-16 13:51:28.000000000 
+0200
+@@ -31,12 +31,14 @@
+ AEAD_CONF:=AEAD
+ MANAGER_CONF:=MANAGER
+ BLKCIPHER_CONF:=BLKCIPHER
++RNG_CONF:=RNG
+ HASH_CONF:=HASH
+ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
+   CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
+   AEAD_CONF:=AEAD2
+   MANAGER_CONF:=MANAGER2
+   BLKCIPHER_CONF:=BLKCIPHER2
++  RNG_CONF:=RNG2
+   HASH_CONF:=HASH2
+ endif
+ 
+@@ -44,7 +46,11 @@
+       ALGAPI=crypto_algapi \
+       $(AEAD_CONF)=aead \
+       $(CRYPTO_MODULE_PCOMPRESS) \
++      $(RNG_CONF)=rng \
++      $(RNG_CONF)=krng \
+       $(BLKCIPHER_CONF)=$(BLKCIPHER_PREFIX)blkcipher \
++      $(BLKCIPHER_CONF)=eseqiv \
++      $(BLKCIPHER_CONF)=chainiv \
+       $(HASH_CONF)=crypto_hash \
+       $(MANAGER_CONF)=cryptomgr \
+       CBC=cbc \

Added: trunk/openwrt/trunk/patches/netdevices.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/openwrt/trunk/patches/netdevices.patch        Fri Sep 18 12:39:12 
2009        (r974)
@@ -0,0 +1,25 @@
+Index: package/kernel/modules/netdevices.mk
+===================================================================
+--- openwrt-orig/package/kernel/modules/netdevices.mk 2009-09-16 
15:11:43.000000000 +0200
++++ openwrt-mod/package/kernel/modules/netdevices.mk 2009-09-15 
14:56:25.000000000 +0200
+@@ -7,6 +7,20 @@
+ 
+ NETWORK_DEVICES_MENU:=Network Devices
+ 
++define KernelPackage/dummy
++  SUBMENU:=$(NETWORK_DEVICES_MENU)
++  TITLE:=Dummy network device
++  KCONFIG:=CONFIG_DUMMY
++  FILES:=$(LINUX_DIR)/drivers/net/dummy.$(LINUX_KMOD_SUFFIX)
++  AUTOLOAD:=$(call AutoLoad,34,dummy)
++endef
++
++define KernelPackage/dummy/description
++  The dummy network device
++endef
++
++$(eval $(call KernelPackage,dummy))
++
+ define KernelPackage/libphy
+   SUBMENU:=$(NETWORK_DEVICES_MENU)
+   TITLE:=PHY library

Added: trunk/openwrt/trunk/patches/netsupport.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/openwrt/trunk/patches/netsupport.patch        Fri Sep 18 12:39:12 
2009        (r974)
@@ -0,0 +1,24 @@
+Index: package/kernel/modules/netsupport.mk
+===================================================================
+--- openwrt-orig/package/kernel/modules/netsupport.mk 2009-09-16 
15:11:43.000000000 +0200
++++ openwrt-mod/package/kernel/modules/netsupport.mk 2009-09-15 
15:05:23.000000000 +0200
+@@ -194,9 +194,11 @@
+   DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac 
+kmod-crypto-md5 +kmod-crypto-sha1
+   KCONFIG:= \
+       CONFIG_NET_KEY \
++      CONFIG_XFRM_IPCOMP \
+       CONFIG_XFRM_USER
+   FILES:= \
+       $(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
++      $(LINUX_DIR)/net/xfrm/xfrm_ipcomp.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
+ endef
+ 
+@@ -204,6 +206,7 @@
+  Kernel modules for IPsec support in both IPv4 and IPv6.
+  Includes:
+  - af_key
++ - xfrm_ipcomp
+  - xfrm_user
+ endef
+ 

Added: trunk/openwrt/trunk/patches/readme
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/openwrt/trunk/patches/readme  Fri Sep 18 12:39:12 2009        (r974)
@@ -0,0 +1,10 @@
+Those files patch the kernel packaging of OpenWRT. Some kernel modules are not
+packaged at all (dummy network device), others incorrectly (ipcomp, various
+crypto modules).
+
+The patches have been submitted to the OpenWRT bug tracker and can be found at
+https://dev.openwrt.org/ticket/5849
+
+Once they are accepted, they can be removed from our own repository. Be sure
+to update our build instructions accordingly:
+https://plain.ds-group.info/projects/pisa/cgi-bin/trac.cgi/wiki/CompileHipWrtWL500Wtrunk
[pisa-src] r974 - trunk/openwrt/trunk/patches

Other related posts:
