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

8 files changed, 19 insertions, 40 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 156555af3..43f209923 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -17,6 +17,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_PYTHON=n \
+			ADK_TOOLCHAIN_GCC_JAVA=n \
+			ADK_TOOLCHAIN_GCC_OBJC=n \
 			ADK_TOOLCHAIN_GCC_USE_SSP=n \
 			ADK_TOOLCHAIN_GCC_USE_LTO=n \
 			BUSYBOX_BBCONFIG=n \
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 0db8b64bc..8ee9e7b97 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		cd0ab148fb0c786fc88be49d19971f50
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		dbus
-PKG_BUILDDEP:=		dbus
+PKG_DEPENDS:=		dbus glib
+PKG_BUILDDEP:=		dbus glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-glib/
 
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index 48b1e3c82..a48137b64 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b93dac50c86db6eba3f72e949f5bed2a
 PKG_DESCR:=		X composite library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		libX11 compositeproto
+PKG_BUILDDEP:=		libX11 compositeproto libXfixes
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXCOMPOSITE LIBXCOMPOSITE_DEV
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 1a62db2f8..ee8d65c20 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -57,11 +57,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.
 
-endmenu
+comment "OpenBSD Cryptographic framework"
 
-menu "OpenBSD Cryptographic framework"
 config ADK_KPACKAGE_KMOD_OCF_HIFN
-	prompt "kmod-ocf-hifn..................... hifn engine"
+	prompt "kmod-ocf-hifn.......................... HIFN crypto engine"
 	tristate
 	default n
 	select ADK_KERNEL_OCF_OCF
@@ -71,36 +70,6 @@ config ADK_KPACKAGE_KMOD_OCF_HIFN
 	  Engine for cryptodev that uses Hifn based accelerators
 	  such as the 7951, 7955, 7956, 7751, 7811.
 
-config ADK_KPACKAGE_KMOD_OCF_SAFE
-	prompt "kmod-ocf-safe..................... safenet engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	help
-	  Engine for cryptodev that uses a number of the safenet Excel
-	  crypto accelerators. Currently for the 1141 and 1741.
-
-config ADK_KPACKAGE_KMOD_OCF_IXP4XX
-	prompt "kmod-ocf-ixp4xx................... IXP4xx engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_arm
-	help
-	  Engine for cryptodev that uses XScale IXP4xx.
-	  Requires the Intel Access library.
-
-config ADK_KPACKAGE_KMOD_OCF_TALITOS
-	prompt "kmod-ocf-talitos.................. talitos engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_ppc
-	help
-	  Engine for cryptodev that uses Freescale's security engine (SEC/talitos).
-
 endmenu
 
 comment "Software cryptography"
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index c5f2a5653..a72141f5a 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -9,6 +9,8 @@ include ${TOPDIR}/mk/buildhlp.mk
 ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=		-O2
 endif
+# ssp partially supported
+TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
 
 EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index b1ce84f98..190cdf689 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -3,6 +3,9 @@
 
 include $(TOPDIR)/rules.mk
 include ../rules.mk
+
+TARGET_CFLAGS:=	$(filter-out -fstack-protector,$(TARGET_CFLAGS))
+
 include Makefile.inc
 
 GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index d492b9837..f466021a7 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -5,11 +5,14 @@ include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 # glibc does not compile with Os
-TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
+TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS))
 ifneq ($(ADK_DEBUG),)
-TARGET_CFLAGS+=-O2
+TARGET_CFLAGS+=	-O2
 endif
 
+# ssp partially supported
+TARGET_CFLAGS:=	$(filter-out -fstack-protector,$(TARGET_CFLAGS))
+
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
diff --git a/tools/adk/pkgrebuild.c b/tools/adk/pkgrebuild.c
index e6497b8c7..0a91834e7 100644
--- a/tools/adk/pkgrebuild.c
+++ b/tools/adk/pkgrebuild.c
@@ -50,7 +50,7 @@ static void iter_disabled(const char *key, const char *value, const void *obj) {
 			//fprintf(stderr, "Symbol is a flavour/choice: %s\n", hvalue);
 			if (snprintf(tfile, 256, ".rebuild.%s", hvalue) < 0)
 				perror("can not create file variable.");
-			fd = open(tfile, O_RDWR | O_CREAT);
+			fd = open(tfile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
 			close(fd);
 		}
 	}
@@ -70,7 +70,7 @@ static void iter_enabled(const char *key, const char *value, const void *obj) {
 			//fprintf(stderr, "Symbol is a flavour/choice\n");
 			if (snprintf(tfile, 256, ".rebuild.%s", hvalue) < 0)
 				perror("can not create file variable.");
-			fd = open(tfile, O_RDWR | O_CREAT);
+			fd = open(tfile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
 			close(fd);
 		}
 	}