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

package/cups/Makefile

@@ -38,7 +38,9 @@ HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--disable-openssl \
 			--disable-cdsassl \
 			--disable-dbus \
-			--disable-ssl
+			--disable-ssl \
+			--with-components=core \
+			--with-rcdir=$(STAGING_HOST_DIR)/etc
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
 
@@ -57,7 +59,9 @@ CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--disable-openssl \
 			--disable-cdsassl \
 			--disable-dbus \
-			--disable-ssl
+			--disable-ssl \
+			--with-components=core \
+			--with-rcdir=$(STAGING_TARGET_DIR)/etc
 
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
@@ -66,22 +70,9 @@ else
 XAKE_FLAGS+=		OPTIM='-fPIC'
 endif
 
-cups-hostpackage:
-
 cups-install:
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
-	${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon
-	${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/
-	rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/
-	rm -f ${IDIR_CUPS}/usr/bin/cups-config
+	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/cups/daemon/* \
-		${IDIR_CUPS}/usr/lib/cups/daemon/
-	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
-	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openjdk7/Makefile

@@ -27,6 +27,7 @@ GCJ_VER:=		4.7.3
 
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	arm mips ppc sparc x86 x86_64
+PKG_LIBC_DEPENDS:=	uclicb eglibc glibc
 PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
 
 PKG_SUBPKGS:=		OPENJDK7

target/linux/kernel.config

@@ -13,6 +13,8 @@ CONFIG_XFRM=y
 CONFIG_INET=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_BLOCK=y
+CONFIG_FILE_LOCKING=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_NLS=y