diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-01-19 18:09:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-01-19 18:09:53 +0100 |
| commit | efcef25da20cd67933fb6086366d28e76f51da85 (patch) | |
| tree | 31cb11986078f8c43dcd8fbb7954b04f51acc00b | |
| parent | 5cf1c57687baa76f08e0f399a8028d1074d4cc70 (diff) | |
update to linux 3.7.3, disable aufs2, multimedia support needs reworking
32 files changed, 6694 insertions, 359 deletions
@@ -95,7 +95,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.6.3" + prompt "3.7.3" boolean depends on ADK_TOOLCHAIN_ONLY @@ -106,25 +106,15 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_6_3 - prompt "3.6.3" - boolean - -config ADK_KERNEL_VERSION_3_5_7 - prompt "3.5.7" - boolean - -config ADK_KERNEL_VERSION_3_4_15 - prompt "3.4.15" +config ADK_KERNEL_VERSION_3_7_3 + prompt "3.7.3" boolean endchoice config ADK_KERNEL_VERSION string - default "3.4.15" if ADK_KERNEL_VERSION_3_4_15 - default "3.5.7" if ADK_KERNEL_VERSION_3_5_7 - default "3.6.3" if ADK_KERNEL_VERSION_3_6_3 + default "3.7.3" if ADK_KERNEL_VERSION_3_7_3 help choice diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 87d8d77a4..6852fbf61 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,24 +1,12 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.6.3 +KERNEL_VERSION:= 3.7.3 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= d4892b696956e5ce7b84464d721b6565 +KERNEL_MD5SUM:= 8fb7330345d0e0e3681e928ab334a942 endif -ifeq ($(ADK_KERNEL_VERSION_3_6_3),y) -KERNEL_VERSION:= 3.6.3 +ifeq ($(ADK_KERNEL_VERSION_3_7_3),y) +KERNEL_VERSION:= 3.7.3 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= d4892b696956e5ce7b84464d721b6565 -endif -ifeq ($(ADK_KERNEL_VERSION_3_5_7),y) -KERNEL_VERSION:= 3.5.7 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 636d19c8686623776764227b6d3b911d -endif -ifeq ($(ADK_KERNEL_VERSION_3_4_15),y) -KERNEL_VERSION:= 3.4.15 -KERNEL_MOD_VERSION:= $(KERNEL_VERSION) -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 8b526c3451b755ddfad7e9a1f40d9b16 +KERNEL_MD5SUM:= 8fb7330345d0e0e3681e928ab334a942 endif diff --git a/mk/modules.mk b/mk/modules.mk index 1d882d0c2..1e1370212 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -74,7 +74,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(MODULES_DIR)/kernel/net/wireless/lib80211 \ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ -,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) +,15, kmod-crypto-arc4 kmod-crypto-ecb)) $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ @@ -444,19 +444,20 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,50)) -$(eval $(call KMOD_template,NF_NAT,nf-nat,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ +$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ftp \ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat_ftp \ ,55)) $(eval $(call KMOD_template,NF_CONNTRACK_IRC,nf-conntrack-irc,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_irc \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_irc \ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat_irc \ ,55)) $(eval $(call KMOD_template,NF_CONNTRACK_NETBIOS_NS,nf-conntrack-netbios-ns,\ @@ -466,7 +467,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_NETBIOS_NS,nf-conntrack-netbios-ns,\ $(eval $(call KMOD_template,NF_CONNTRACK_TFTP,nf-conntrack-tftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_tftp \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_tftp \ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat_tftp \ ,55)) #$(eval $(call KMOD_template,NF_CONNTRACK_RTSP,nf-conntrack-rtsp,\ @@ -494,7 +495,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_H323,nf-conntrack-h323,\ $(eval $(call KMOD_template,NF_CONNTRACK_SIP,nf-conntrack-sip,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_sip \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_sip \ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat_sip \ ,55)) $(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\ @@ -571,11 +572,11 @@ $(eval $(call KMOD_template,IP_NF_TARGET_MASQUERADE,ip-nf-target-masquerade,\ ,65)) $(eval $(call KMOD_template,IP_NF_TARGET_REDIRECT,ip-nf-target-redirect,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REDIRECT \ + $(MODULES_DIR)/kernel/net/netfilter/xt_REDIRECT \ ,65)) $(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,ip-nf-target-netmap,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_NETMAP \ + $(MODULES_DIR)/kernel/net/netfilter/xt_NETMAP \ ,65)) # @@ -805,37 +806,37 @@ $(eval $(call KMOD_template,CRYPTO_DEV_HIFN_795X,crypto-dev-hifn-795x,\ $(MODULES_DIR)/kernel/drivers/crypto/hifn_795x \ ,20, crypto-manager2)) -$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\ - $(MODULES_DIR)/kernel/crypto/crypto_algapi \ -,02)) +#$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\ +# $(MODULES_DIR)/kernel/crypto/crypto_algapi \ +#,02)) -$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\ - $(MODULES_DIR)/kernel/crypto/pcompress \ -,03)) +#$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\ +# $(MODULES_DIR)/kernel/crypto/pcompress \ +#,03)) -$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\ - $(MODULES_DIR)/kernel/crypto/aead \ -,03)) +#$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\ +# $(MODULES_DIR)/kernel/crypto/aead \ +#,03)) -$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\ - $(MODULES_DIR)/kernel/crypto/crypto_hash \ -,04)) +#$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\ +# $(MODULES_DIR)/kernel/crypto/crypto_hash \ +#,04)) -$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\ - $(MODULES_DIR)/kernel/crypto/crypto_wq \ - $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ -,05)) +#$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\ +# $(MODULES_DIR)/kernel/crypto/crypto_wq \ +# $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ +#,05)) -$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\ - $(MODULES_DIR)/kernel/crypto/rng \ - $(MODULES_DIR)/kernel/crypto/krng \ -,06)) +#$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\ +# $(MODULES_DIR)/kernel/crypto/rng \ +# $(MODULES_DIR)/kernel/crypto/krng \ +#,06)) -$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\ - $(MODULES_DIR)/kernel/crypto/cryptomgr \ - $(MODULES_DIR)/kernel/crypto/eseqiv \ - $(MODULES_DIR)/kernel/crypto/chainiv \ -,07)) +#$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\ +# $(MODULES_DIR)/kernel/crypto/cryptomgr \ +# $(MODULES_DIR)/kernel/crypto/eseqiv \ +# $(MODULES_DIR)/kernel/crypto/chainiv \ +#,07)) $(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\ $(MODULES_DIR)/kernel/crypto/authenc \ @@ -931,20 +932,20 @@ $(eval $(call KMOD_template,CRYPTO_SERPENT,crypto-serpent,\ $(MODULES_DIR)/kernel/crypto/serpent_generic \ ,11)) -$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\ - $(MODULES_DIR)/kernel/crypto/aes_generic \ -,10)) +#$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\ +# $(MODULES_DIR)/kernel/crypto/aes_generic \ +#,10)) $(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-586,\ $(MODULES_DIR)/kernel/arch/x86/crypto/aes-i586 \ ,11)) $(eval $(call KMOD_template,CRYPTO_CAST5,crypto-cast5,\ - $(MODULES_DIR)/kernel/crypto/cast5 \ + $(MODULES_DIR)/kernel/crypto/cast5_generic \ ,11)) $(eval $(call KMOD_template,CRYPTO_CAST6,crypto-cast6,\ - $(MODULES_DIR)/kernel/crypto/cast6 \ + $(MODULES_DIR)/kernel/crypto/cast6_generic \ ,11)) $(eval $(call KMOD_template,CRYPTO_TEA,crypto-tea,\ @@ -986,9 +987,9 @@ $(eval $(call KMOD_template,CRYPTO_MICHAEL_MIC,crypto-michael-mic,\ $(MODULES_DIR)/kernel/crypto/michael_mic \ ,11)) -$(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\ - $(MODULES_DIR)/kernel/crypto/crc32c \ -,11)) +#$(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\ +# $(MODULES_DIR)/kernel/crypto/crc32c \ +#,11)) $(eval $(call KMOD_template,OCF_CRYPTOSOFT,ocf-cryptosoft,\ ${MODULES_DIR}/kernel/crypto/ocf/cryptosoft \ @@ -1172,14 +1173,14 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \ ,55)) -ifeq ($(ADK_LINUX_64),y) -V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32 -endif +#ifeq ($(ADK_LINUX_64),y) +#V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32 +#endif -$(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ - $(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \ - $(MODULES_DIR)/kernel/drivers/media/video/videodev \ -,65)) +#$(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ +# $(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \ +# $(MODULES_DIR)/kernel/drivers/media/video/videodev \ +#,65)) $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ $(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \ diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile deleted file mode 100644 index 62166e2b9..000000000 --- a/package/aufs2-util/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= aufs2-util -PKG_VERSION:= 2-100111 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 1854f5ab560dd375b22f6e2b747cb412 -PKG_DESCR:= aufs2 utilities -PKG_SECTION:= fs -PKG_URL:= http://aufs.sf.net/ - -# created from git via: -# $ git archive --format tar aufs2.1 | \ -# gzip -9 -c >../aufs2-util-2-$(date +%d%m%g).tar.gz - -PKG_SITES:= http://nwl.cc/~n0-1/ -WRKDIST= ${WRKDIR} - -PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd - -PKG_SUBPKGS:= AUFS2_UTIL LIBAU -PKGSD_LIBAU:= aufs2 userspace library -PKGSC_LIBAU:= libs - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKGSC_LIBAU})) - -CONFIG_STYLE:= manual -XAKE_FLAGS+= Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include" - -post-install: - $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin - $(INSTALL_BIN) ${WRKINST}/sbin/{{u,}mount.aufs,auplink} \ - $(IDIR_AUFS2_UTIL)/sbin - $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/usr/bin - $(INSTALL_BIN) ${WRKINST}/usr/bin/au{brsync,chk} \ - $(IDIR_AUFS2_UTIL)/usr/bin - $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/etc/default - $(INSTALL_DATA) ${WRKINST}/etc/default/aufs \ - $(IDIR_AUFS2_UTIL)/etc/default - $(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib - ${CP} ${WRKINST}/usr/lib/libau* ${IDIR_LIBAU}/usr/lib - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile deleted file mode 100644 index 6a8f74806..000000000 --- a/package/aufs2-util/patches/patch-Makefile +++ /dev/null @@ -1,47 +0,0 @@ ---- w-aufs2-util-2-100111-1.orig/Makefile 2011-01-07 05:00:54.000000000 +0100 -+++ w-aufs2-util-2-100111-1/Makefile 2011-01-10 23:43:23.000000000 +0100 -@@ -15,6 +15,11 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -+c2sh c2tmac: CC = ${CC_FOR_BUILD} -+c2sh c2tmac: CFLAGS= ${CFLAGS_FOR_BUILD} -+c2sh c2tmac: LDFLAGS= ${LDFLAGS_FOR_BUILD} -+c2sh c2tmac: CPPFLAGS= ${CPPFLAGS_FOR_BUILD} -I./libau -I${LINUX_HEADER_DIR}/include -+ - CFLAGS += -I./libau - CFLAGS += -O -Wall - -@@ -28,13 +33,10 @@ LibUtilObj = proc_mnt.o br.o plink.o mta - LibUtilHdr = au_util.h - export - --all: ver_test ${Man} ${Bin} ${Etc} -+all: ${Man} ${Bin} ${Etc} - ${MAKE} -C libau $@ - ln -sf ./libau/libau*.so . - --ver_test: ver -- ./ver -- - ${Bin}: LDFLAGS += -static -s - ${Bin}: LDLIBS = -L. -lautil - ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} -@@ -63,7 +65,7 @@ aufs.5: aufs.in.5 c2tmac - }' aufs.in.5 >> $@ - chmod a-w $@ - --.INTERMEDIATE: c2sh c2tmac ver -+.INTERMEDIATE: c2sh c2tmac - - Install = install -o root -g root -p - install_sbin: File = mount.aufs umount.aufs auplink -@@ -77,7 +79,7 @@ install_etc: File = etc_default_aufs - install_etc: Tgt = ${DESTDIR}/etc/default/aufs - install_etc: ${File} - install -d $(dir ${Tgt}) -- ${Install} -m 644 -T ${File} ${Tgt} -+ ${Install} -m 644 ${File} ${Tgt} - install_man: File = aufs.5 - install_man: Tgt = ${DESTDIR}/usr/share/man/man5 - install_man: ${File} diff --git a/package/aufs2-util/patches/patch-libau_Makefile b/package/aufs2-util/patches/patch-libau_Makefile deleted file mode 100644 index e454c9dc3..000000000 --- a/package/aufs2-util/patches/patch-libau_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- w-aufs2-util-2-100111-1.orig/libau/Makefile 2011-01-07 05:00:54.000000000 +0100 -+++ w-aufs2-util-2-100111-1/libau/Makefile 2011-01-25 17:02:09.835243119 +0100 -@@ -45,7 +45,7 @@ install_ulib: File = ${LibSo}.${LibSoMaj - install_ulib: Tgt = ${DESTDIR}/usr/lib - install_ulib: ${File} - install -d ${Tgt} -- ${Install} -m 644 -s ${File} ${Tgt} -+ ${Install} -m 644 ${File} ${Tgt} - # -m 6755 - ln -sf ${File} ${Tgt}/${LibSo}.${LibSoMajor} - ln -sf ${LibSo}.${LibSoMajor} ${Tgt}/${LibSo} diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 1366aa496..82a17f36b 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 6dd40c12fb8f4c4312a0f8434369fbcd PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack -PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat +PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat-ipv4 PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index b50fd47f7..4083b6d13 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -37,7 +37,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X tristate select ADK_KERNEL_CRYPTO select ADK_KERNEL_CRYPTO_HW - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 + #select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 select ADK_KPACKAGE_KMOD_CRYPTO_DES depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI default n @@ -97,7 +97,7 @@ config ADK_KERNEL_MOD_CRYPTO_BLKCIPHER config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 tristate - select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 + #select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 select ADK_KERNEL_MOD_CRYPTO_BLKCIPHER default n @@ -109,29 +109,29 @@ config ADK_KERNEL_MOD_CRYPTO_WORKQUEUE config ADK_KERNEL_MOD_CRYPTO_MANAGER tristate -config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 - prompt "kmod-crypto-manager2................. Crypto algorithm manager" - tristate - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 - select ADK_KPACKAGE_KMOD_CRYPTO_AEAD2 - select ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2 - select ADK_KERNEL_MOD_CRYPTO_MANAGER - select ADK_KERNEL_MOD_CRYPTO_WORKQUEUE - default n - help +#config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# prompt "kmod-crypto-manager2................. Crypto algorithm manager" +# tristate +# select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 +# select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_AEAD2 +## select ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2 +# select ADK_KERNEL_MOD_CRYPTO_MANAGER +## select ADK_KERNEL_MOD_CRYPTO_WORKQUEUE +# default n +# help config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC prompt "kmod-crypto-authenc.................. AuthENC (IPsec)" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 + #select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 default n help config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 + #select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 help This IV generator generates an IV based on a sequence number by @@ -141,7 +141,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTS prompt "kmod-crypto-cts...................... CTS support" tristate select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 default n help CTS: Cipher Text Stealing @@ -156,7 +156,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC tristate depends on !ADK_KERNEL_CRYPTO_CBC select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 default n help CBC: Cipher Block Chaining mode @@ -165,7 +165,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC config ADK_KPACKAGE_KMOD_CRYPTO_CCM prompt "kmod-crypto-ccm...................... CCM support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 select ADK_KPACKAGE_KMOD_CRYPTO_CTR default n help @@ -174,7 +174,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CCM config ADK_KPACKAGE_KMOD_CRYPTO_GCM prompt "kmod-crypto-gcm...................... GCM support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 select ADK_KPACKAGE_KMOD_CRYPTO_CTR default n help @@ -184,7 +184,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_GCM config ADK_KPACKAGE_KMOD_CRYPTO_CTR prompt "kmod-crypto-ctr...................... CTR support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV default n help @@ -195,7 +195,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ECB prompt "kmod-crypto-ecb...................... ECB support" tristate select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 default n help ECB: Electronic CodeBook mode @@ -206,7 +206,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_HMAC prompt "kmod-crypto-hmac..................... HMAC support" tristate select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 default n help HMAC: Keyed-Hashing for Message Authentication (RFC2104). @@ -217,20 +217,20 @@ config ADK_KPACKAGE_KMOD_CRYPTO_XCBC tristate default n select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 - select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 +# select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2 help XCBC: Keyed-Hashing with encryption algorithm config ADK_KERNEL_MOD_CRYPTO_RNG tristate -config ADK_KPACKAGE_KMOD_CRYPTO_RNG2 - prompt "kmod-crypto-rng2..................... RNG support" - tristate - select ADK_KERNEL_MOD_CRYPTO_RNG - default n - help - Random number generator +#config ADK_KPACKAGE_KMOD_CRYPTO_RNG2 +# prompt "kmod-crypto-rng2..................... RNG support" +# tristate +# select ADK_KERNEL_MOD_CRYPTO_RNG +# default n +# help +# Random number generator endmenu menu "Digest algorithms" diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 128f42bd3..9e5a91153 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -10,9 +10,6 @@ config ADK_KERNEL_SND_SOC config ADK_KERNEL_SND_PXA2XX_AC97 boolean -config ADK_KERNEL_MEDIA_SUPPORT - boolean - config ADK_KERNEL_SND_TIMER boolean @@ -129,31 +126,17 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ endmenu menu "Video devices support" -config ADK_KPACKAGE_KMOD_VIDEO_DEV - prompt "kmod-video-dev.................. Video (For Linux) kernel support" +config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + prompt "kmod-media-support............... Multimedia support" tristate - select ADK_KERNEL_MEDIA_SUPPORT default n help - Support for audio/video capture and overlay devices and FM radio - cards. The exact capabilities of each device vary. - - This kernel includes support for the new Video for Linux Two API, - (V4L2) as well as the original system. Drivers and applications - need to be rewritten to use V4L2, but drivers for popular cards - and applications for most video capture functions already exist. - - Additional info and docs are available on the web at - <http://linuxtv.org> - - Documentation for V4L2 is also available on the web at - <http://bytesex.org/v4l/>. config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" tristate depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG - select ADK_KPACKAGE_KMOD_VIDEO_DEV + select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT default n help diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index ff3c1515d..e960a22ac 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -34,9 +34,9 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER rules for simple packet filtering at local input, forwarding and local output. See the man page for iptables(8). -config ADK_KPACKAGE_KMOD_NF_NAT +config ADK_KPACKAGE_KMOD_NF_NAT_IPV4 tristate 'Full NAT' - depends on ADK_KPACKAGE_KMOD_NF_IP_IPTABLES + depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by @@ -44,7 +44,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE tristate 'MASQUERADE target support' - depends on ADK_KPACKAGE_KMOD_NF_NAT + depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4 help Masquerading is a special case of NAT: all outgoing connections are changed to seem to come from a particular interface's address, and @@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT tristate 'REDIRECT target support' - depends on ADK_KPACKAGE_KMOD_NF_NAT + depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4 help REDIRECT is a special case of NAT: all incoming connections are mapped onto the incoming interface's address, causing the packets to @@ -87,7 +87,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP tristate 'NETMAP target support' - depends on ADK_KPACKAGE_KMOD_NF_NAT + depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4 help NETMAP is an implementation of static 1:1 NAT mapping of network addresses. It maps the network address part, while keeping the host @@ -96,7 +96,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP config ADK_KPACKAGE_KMOD_IP_NF_MANGLE tristate 'Packet mangling' - depends on ADK_KPACKAGE_KMOD_NF_NAT + depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4 help This option adds a `mangle' table to iptables: see the man page for iptables(8). This table is used for various packet alterations diff --git a/target/linux/patches/3.7.3/bsd-compatibility.patch b/target/linux/patches/3.7.3/bsd-compatibility.patch new file mode 100644 index 000000000..9e55150cc --- /dev/null +++ b/target/linux/patches/3.7.3/bsd-compatibility.patch @@ -0,0 +1,2568 @@ +diff -Nur linux-2.6.36.orig/scripts/Makefile.lib linux-2.6.36/scripts/Makefile.lib +--- linux-2.6.36.orig/scripts/Makefile.lib 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/Makefile.lib 2010-11-28 18:34:22.000000000 +0100 +@@ -216,7 +216,12 @@ + size_append = printf $(shell \ + dec_size=0; \ + for F in $1; do \ +- fsize=$$(stat -c "%s" $$F); \ ++ if stat -qs .>/dev/null 2>&1; then \ ++ statcmd='stat -f %z'; \ ++ else \ ++ statcmd='stat -c %s'; \ ++ fi; \ ++ fsize=$$($$statcmd $$F); \ + dec_size=$$(expr $$dec_size + $$fsize); \ + done; \ + printf "%08x\n" $$dec_size | \ +diff -Nur linux-2.6.36.orig/scripts/mod/mk_elfconfig.c linux-2.6.36/scripts/mod/mk_elfconfig.c +--- linux-2.6.36.orig/scripts/mod/mk_elfconfig.c 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/mod/mk_elfconfig.c 2010-11-28 18:33:24.000000000 +0100 +@@ -1,7 +1,18 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <elf.h> ++ ++#define EI_NIDENT (16) ++#define ELFMAG "\177ELF" ++ ++#define SELFMAG 4 ++#define EI_CLASS 4 ++#define ELFCLASS32 1 /* 32-bit objects */ ++#define ELFCLASS64 2 /* 64-bit objects */ ++ ++#define EI_DATA 5 /* Data encoding byte index */ ++#define ELFDATA2LSB 1 /* 2's complement, little endian */ ++#define ELFDATA2MSB 2 /* 2's complement, big endian */ + + int + main(int argc, char **argv) +diff -Nur linux-2.6.36.orig/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h +--- linux-2.6.36.orig/scripts/mod/modpost.h 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/mod/modpost.h 2010-11-28 18:33:24.000000000 +0100 +@@ -7,7 +7,2453 @@ + #include <sys/mman.h> + #include <fcntl.h> + #include <unistd.h> +-#include <elf.h> ++ ++ ++/* This file defines standard ELF types, structures, and macros. ++ Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _ELF_H ++#define _ELF_H 1 ++ ++__BEGIN_DECLS ++ ++/* Standard ELF types. */ ++ ++#include <stdint.h> ++ ++/* Type for a 16-bit quantity. */ ++typedef uint16_t Elf32_Half; ++typedef uint16_t Elf64_Half; ++ ++/* Types for signed and unsigned 32-bit quantities. */ ++typedef uint32_t Elf32_Word; ++typedef int32_t Elf32_Sword; ++typedef uint32_t Elf64_Word; ++typedef int32_t Elf64_Sword; ++ ++/* Types for signed and unsigned 64-bit quantities. */ ++typedef uint64_t Elf32_Xword; ++typedef int64_t Elf32_Sxword; ++typedef uint64_t Elf64_Xword; ++typedef int64_t Elf64_Sxword; ++ ++/* Type of addresses. */ ++typedef uint32_t Elf32_Addr; ++typedef uint64_t Elf64_Addr; ++ ++/* Type of |