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

6 files changed, 19 insertions, 18 deletions

diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 0366fa2ef..c9298e15d 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -15,6 +15,8 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -35,5 +37,6 @@ do-build:
 do-install:
 	$(CP) ./files/initramfs_list $(LINUX_DIR)
 	$(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR)
+	@touch ${IDIR_CRYPTINIT}/.empty
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 932871dcf..5c3c76899 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -73,13 +73,13 @@ eglibc-dev-install:
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
 		${EGLIBC_ENV} \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
 			--prefix=$(IDIR_EGLIBC_DEV)/usr \
 			--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
 			${EGLIBC_CONFOPTS} \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index ddda531a9..084a71918 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -57,12 +57,12 @@ glibc-dev-install:
 	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
 		--prefix=/usr \
 		--with-sysroot=$(IDIR_GLIBC_DEV) \
 		${GLIBC_CONFOPTS} \
diff --git a/package/httping/Makefile b/package/httping/Makefile
index 18a97a85b..ca536190f 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -19,6 +19,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-D_GNU_SOURCE
+
 CONFIG_STYLE:=		manual
 
 post-install:
diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
index d7a5582d9..08a86565a 100644
--- a/package/rpcbind/patches/patch-src_security_c
+++ b/package/rpcbind/patches/patch-src_security_c
@@ -1,10 +1,15 @@
 --- rpcbind-0.2.0.orig/src/security.c	2009-05-29 15:38:22.000000000 +0200
-+++ rpcbind-0.2.0/src/security.c	2010-02-06 01:55:37.383094004 +0100
-@@ -20,12 +20,38 @@
++++ rpcbind-0.2.0/src/security.c	2010-02-27 19:57:02.000000000 +0100
+@@ -20,12 +20,28 @@
  /*
   * XXX for special case checks in check_callit.
   */
-+#if defined(__UCLIBC__)
+-#include <rpcsvc/mount.h>
+-#include <rpcsvc/rquota.h>
+-#include <rpcsvc/nfs_prot.h>
+-#include <rpcsvc/yp.h>
+-#include <rpcsvc/ypclnt.h>
+-#include <rpcsvc/yppasswd.h>
 +
 +#define MOUNTPROC_MNT 1
 +#define MOUNTPROC_UMNT 3
@@ -27,15 +32,6 @@
 +#define YPPROC_ALL     8
 +
 +#define YPBINDPROC_SETDOM      2
-+
-+#else 
- #include <rpcsvc/mount.h>
- #include <rpcsvc/rquota.h>
- #include <rpcsvc/nfs_prot.h>
- #include <rpcsvc/yp.h>
- #include <rpcsvc/ypclnt.h>
- #include <rpcsvc/yppasswd.h>
-+#endif
  
  #include "rpcbind.h"
  
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index aeffb3563..787dc4e56 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -41,10 +41,10 @@ uclibc-dev-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \