diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-28 15:02:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-28 15:02:26 +0100 |
| commit | abf9133a1ccc45a695d567cea9d94c19fc1c2b5d (patch) | |
| tree | 91039e421491878ed6e20031199a562c90c97b0e /mk | |
| parent | cd770ba2f42f437d8edcdc7ba282b51e513cdd1d (diff) | |
| parent | e854608326adaff87d17214aa5815ce339c503df (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-build.mk | 4 | ||||
| -rw-r--r-- | mk/package.mk | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index b7385c272..e746f4a1d 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -19,14 +19,14 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure - for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) + -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config - -rm $(LINUX_DIR)/vmlinux $(MAKE_TRACE) + -rm $(LINUX_DIR)/vmlinux 2>/dev/null $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install diff --git a/mk/package.mk b/mk/package.mk index 964763f44..b74e8ec5b 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -263,8 +263,17 @@ endif $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) +ifneq ($(1),UCLIBC) +ifneq ($(1),EGLIBC) +ifneq ($(1),GLIBC) +ifneq ($(1),MUSL) $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV) $(PKG_INSTALL) $$(IPKG_$(1)_DEV) +endif +endif +endif +endif + endef install-targets: |