Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/modules.mk

@@ -926,11 +926,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 ZLIB:=lib/zlib_deflate/zlib_deflate
-ifneq (${ADK_LINUX_NATIVE},y)
-ifneq ($(ADK_TARGET_SYSTEM_IBM_X40),y)
-ZLIB+=lib/zlib_inflate/zlib_inflate
-endif
-endif
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
     $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \

package/conntrack-tools/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		conntrack-tools
-PKG_VERSION:=		0.9.15
+PKG_VERSION:=		1.0.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		caecb479ceb5ff7f646d47e85484d655
+PKG_MD5SUM:=		5add24d4761baf17af630d5627a71752
 PKG_DESCR:=		Connection tracking userspace tools
 PKG_SECTION:=		firewall
 PKG_DEPENDS:=		libnetfilter-conntrack
@@ -22,6 +22,6 @@ $(eval $(call PKG_template,CONNTRACK_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELE
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_CONNTRACK_TOOLS)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdmcp/Makefile

@@ -9,9 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		bd6577d65c66a971ca52ba7c251905a8
 PKG_DESCR:=		X11 display manager control protocol library
 PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		xproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXDMCP LIBXDMCP_DEV
+PKGSB_LIBXDMCP:=	xproto
 PKGSD_LIBXDMCP_DEV:=	XDMCP headers
 PKGSC_LIBXDMCP_DEV:=	x11/devel
 
@@ -24,13 +26,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS}))
 
-post-install:
+libxdmcp-install:
 	${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib
 
 libxdmcp-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11/
+	${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11
 	${CP} ${WRKINST}/usr/include/X11/* \
-		${IDIR_LIBXDMCP_DEV}/usr/include/X11/
+		${IDIR_LIBXDMCP_DEV}/usr/include/X11
 	
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libvorbis/Makefile

@@ -28,14 +28,14 @@ CONFIGURE_ARGS+=	--with-ogg="${STAGING_TARGET_DIR}/usr" \
 			--with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \
 			--with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib"
 
-post-install:
+libvorbis-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib
 
 libvorbisenc-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib
 
 libvorbis-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis

package/libvorbis/patches/autotool.patch

@@ -63514,7 +63514,7 @@ diff -Nur libvorbis-1.2.0.orig/Makefile.am libvorbis-1.2.0/Makefile.am
  AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
  
 -SUBDIRS = lib include doc examples vq
-+SUBDIRS = lib include doc vq
++SUBDIRS = lib include vq
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = vorbis.m4
@@ -63715,7 +63715,7 @@ diff -Nur libvorbis-1.2.0.orig/Makefile.in libvorbis-1.2.0/Makefile.in
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 -SUBDIRS = lib include doc examples vq
-+SUBDIRS = lib include doc vq
++SUBDIRS = lib include vq
  m4datadir = $(datadir)/aclocal
  m4data_DATA = vorbis.m4
  pkgconfigdir = $(libdir)/pkgconfig

target/linux/patches/2.6.37/zlib-inflate.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.37.orig/lib/Kconfig linux-2.6.37/lib/Kconfig
+--- linux-2.6.37.orig/lib/Kconfig	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/lib/Kconfig	2011-03-01 20:10:29.833370667 +0100
+@@ -95,7 +95,7 @@
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	boolean
+ 
+ config ZLIB_DEFLATE
+ 	tristate