diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-27 12:19:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-27 12:19:57 +0100 |
| commit | 50beebab01a244a27e45ffd766377fa3fa91229a (patch) | |
| tree | 04aaefe68f1836138a116249c55283fb301efbda /mk | |
| parent | c7f2f4bba73e53d9b5d1926b220205884bd26d4a (diff) | |
fix checksum check of toolchain archives after download
and update alix/wrap targets to 2.6.33
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/buildhlp.mk | 4 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 12 |
3 files changed, 7 insertions, 11 deletions
diff --git a/mk/build.mk b/mk/build.mk index a4ef86035..881acca62 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -196,7 +196,7 @@ clean: cleankernel: @$(TRACE) cleankernel - rm -rf $(TOOLCHAIN_BUILD_DIR)/linux* $(BUILD_DIR)/linux + rm -rf $(TOOLCHAIN_BUILD_DIR)/w-linux* $(BUILD_DIR)/linux cleandir: @$(TRACE) cleandir diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index e45504697..0b7a71f12 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -18,11 +18,7 @@ WRKBUILD?= ${WRKSRC} # This is where make install (fake) writes to WRKINST?= ${WRKDIR}/fake-${CPU_ARCH}/root -ifeq ($(strip ${NO_CHECKSUM}),) _CHECKSUM_COOKIE= ${WRKDIR}/.checksum_done -else -_CHECKSUM_COOKIE= -endif post-extract: diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 79cb7f9cc..11b5a4890 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -3,20 +3,20 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/linux.mk -include ${TOPDIR}/mk/buildhlp.mk +#include ${TOPDIR}/mk/buildhlp.mk include ${TOPDIR}/mk/kernel-vars.mk KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg -$(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched: +$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: $(TRACE) target/$(ADK_TARGET)-kernel-patch - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE) touch $@ -$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched +$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched $(TRACE) target/$(ADK_TARGET)-kernel-prepare - ln -sf $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) $(LINUX_DIR) + ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) $(LINUX_DIR) mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ |