From c1d1c1c82deb5afc695f2113310c501f80692f5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 19 Sep 2013 14:13:37 +0200 Subject: fix qemu sparc64 build --- mk/image.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index f8e995ce2..57664464e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -60,6 +60,16 @@ ifeq ($(ADK_LINUX_X86_64),y) rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) endif +ifeq ($(ADK_LINUX_SPARC64),y) + # fixup lib dirs + mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/lib/ + ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) +endif ifeq ($(ADK_TARGET_ABI_N32),y) # fixup lib dirs mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} -- cgit v1.2.3 From 068db3f8b13d5e6312a9eda39d2530c68f85bc45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 23 Sep 2013 09:47:39 +0200 Subject: remove -fPIC, fixes compile of x86-eglibc toolchain --- mk/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index e22a46beb..b86c0226d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -99,7 +99,7 @@ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld TARGET_CPPFLAGS:= TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS) -TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) -fPIC +TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -- cgit v1.2.3 From 2f0d4983409f3e92b9d55bde57dc7e79376f6576 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 23 Sep 2013 12:51:59 +0200 Subject: add musl to bulk builds --- mk/build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index e69821db0..83e34ddf8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -590,7 +590,7 @@ bulk: done bulkall: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \ for system in $$systems;do \ @@ -608,7 +608,7 @@ bulkall: done bulkallmod: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \ for system in $$systems;do \ -- cgit v1.2.3 From 7b875ccacb2a588d8af27d83f30ccce62895c44b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 23 Sep 2013 13:22:43 +0200 Subject: disable openjdk7 from autobuild --- mk/build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 83e34ddf8..d6e21fa85 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -32,6 +32,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ ADK_PACKAGE_OPENJDK=n \ + ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GPSD=n \ ADK_PACKAGE_GPSD_CLIENTS=n \ -- cgit v1.2.3 From 993c8fbc80d05e0cd7301a7ec2970963c14f0e5b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Sep 2013 09:33:45 +0200 Subject: fix path to uvcvideo --- mk/modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index ca1bf178c..5722d9800 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1204,7 +1204,7 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\ #,65)) $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ - $(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \ + $(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \ ,70)) $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\ -- cgit v1.2.3 From 021f3710f7a45f8d2a06d65184a58321b12314e1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Sep 2013 08:53:49 +0200 Subject: first step to port openafs --- mk/vars.mk | 3 ++- target/linux/config/Config.in.misc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index e22a46beb..bf98ee13a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -167,7 +167,8 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ CC='$(TARGET_CC)' \ GCC='$(TARGET_CC)' \ CXX='$(TARGET_CXX)' \ - CROSS='$(TARGET_CROSS)' + CROSS='$(TARGET_CROSS)' \ + ARCH=${ARCH} HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 57b64d5e9..ea9bc5e5a 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -1,3 +1,6 @@ +config ADK_KERNEL_KEYS + boolean + config ADK_KERNEL_I2C boolean -- cgit v1.2.3