diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
| commit | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch) | |
| tree | 406f65eea71fabd8cf66c2bd1108ec63f8c349ee /mk/kernel-build.mk | |
| parent | 38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff) | |
rework architecture / embedded systems concept
Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs
I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'mk/kernel-build.mk')
| -rw-r--r-- | mk/kernel-build.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 2eaf1ada1..ba3259b16 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -6,25 +6,19 @@ include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: - $(TRACE) target/$(ADK_TARGET)-kernel-patch - $(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) -ifeq ($(ADK_NATIVE),y) - if [ -f /etc/adktarget ];then \ - target=$$(cat /etc/adktarget); \ - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$$target/patches *.patch $(MAKE_TRACE); \ - fi -endif + $(TRACE) target/kernel-patch + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ + ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) touch $@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched - $(TRACE) target/$(ADK_TARGET)-kernel-prepare + $(TRACE) target/kernel-prepare 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 $@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk - $(TRACE) target/$(ADK_TARGET)-kernel-configure + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) @@ -32,15 +26,15 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config - $(TRACE) target/$(ADK_TARGET)-kernel-compile + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) - $(TRACE) target/$(ADK_TARGET)-kernel-modules-install + $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ modules_install $(MAKE_TRACE) - $(TRACE) target/$(ADK_TARGET)-create-packages + $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif @@ -50,7 +44,7 @@ prepare: compile: $(LINUX_DIR)/vmlinux install: compile ifneq ($(strip $(INSTALL_TARGETS)),) - $(TRACE) target/${ADK_TARGET}-modules-install + $(TRACE) target/${ADK_TARGET_ARCH}-modules-install ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) else |