diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-26 14:44:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-26 14:44:05 +0200 |
| commit | 5ae441d42ae9d1b33793a3ca19a7c929344337f7 (patch) | |
| tree | 74fde0e28f77fc9627149148231391b311961bfe /mk | |
| parent | d871140e95bd81cf9ee4998d7199cff292241681 (diff) | |
| parent | d0cedd6214f7c35b73a22464c8688dbf9eb79f62 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | mk/image.mk | 10 | ||||
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 5 |
4 files changed, 17 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index e69821db0..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 \ @@ -590,7 +591,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 +609,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 \ 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} 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,\ diff --git a/mk/vars.mk b/mk/vars.mk index e22a46beb..5c291f604 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 \ @@ -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}' \ |