diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2012-10-11 11:05:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-10-11 11:05:05 +0200 |
| commit | 046cf475d64cb44460ac0aeb9e53032efd8185d0 (patch) | |
| tree | 46ddb06b418e42c52c0a02ba2b90f0f4d2b9b93e /mk | |
| parent | 58de4f5caf471cecbaebdb023cd8e2c5f89bfdb3 (diff) | |
| parent | ec67efc42516136adee22d15ef1fb64b32637806 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/image.mk | 9 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 16 | ||||
| -rw-r--r-- | mk/toolchain.mk | 1 | ||||
| -rw-r--r-- | mk/vars.mk | 3 |
5 files changed, 26 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 0ad4ea788..fa2e21fd5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -158,12 +158,12 @@ ifeq ($(ADK_NATIVE),y) else ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install endif else - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif diff --git a/mk/image.mk b/mk/image.mk index 4e1ab94dc..b432a32ce 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -50,6 +50,15 @@ image-prepare-post: sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh +ifeq ($(ADK_TARGET_WITH_MULTILIB),y) + # multilib 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 + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib +endif KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index f52834616..87a861da7 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,17 +1,23 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.5.4 +KERNEL_VERSION:= 3.5.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 95d5c7271ad448bc965bdb29339b6923 endif -ifeq ($(ADK_KERNEL_VERSION_3_5_4),y) -KERNEL_VERSION:= 3.5.4 +ifeq ($(ADK_KERNEL_VERSION_3_6_1),y) +KERNEL_VERSION:= 3.6.1 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 63bdd7d325afae1ac525586d24eb5399 +endif +ifeq ($(ADK_KERNEL_VERSION_3_5_6),y) +KERNEL_VERSION:= 3.5.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 95d5c7271ad448bc965bdb29339b6923 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_9),y) -KERNEL_VERSION:= 3.4.9 +ifeq ($(ADK_KERNEL_VERSION_3_4_13),y) +KERNEL_VERSION:= 3.4.13 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= f9cd4fe763396bf814f3a71de42fde9b diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 6a181a444..80860a0f1 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -2,5 +2,6 @@ prepare: ${WRKDIST}/.prepared $(WRKBUILD)/.headers configure: ${WRKBUILD}/.configured compile: $(WRKBUILD)/.compiled install: $(WRKBUILD)/.installed +fixup: $(WRKBUILD)/.fixup clean: rm -rf $(WRKDIR) diff --git a/mk/vars.mk b/mk/vars.mk index bdfd333ad..6fc2eb192 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -99,7 +99,8 @@ TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts 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 \ - -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib + -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ + $(ADK_TARGET_ABI_LDFLAGS) ifneq ($(ADK_NATIVE),) TARGET_CPPFLAGS:= |