update to linux 3.7.3, disable aufs2, multimedia support needs reworking

4 files changed, 1 insertions, 107 deletions

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