diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 17:49:05 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 17:49:25 +0200 |
commit | 45e52ed75cd90baeab7916086614e998188079df (patch) | |
tree | 2a7ba5b378e6ea6b496af202c0a5b5f559c225fe | |
parent | ea8ec7c246cf8a4e7371cdb4da3fe296e6896796 (diff) |
discussed with phil, do not split kernel patches between kernel-headers and kernel, can make issues
-rw-r--r-- | mk/kernel-build.mk | 8 | ||||
-rw-r--r-- | target/linux/patches/3.10.30/headers_install.patch (renamed from toolchain/kernel-headers/patches/3.10.30/headers_install.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.30/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.30/relocs.patch (renamed from toolchain/kernel-headers/patches/3.10.30/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.30/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.10.30/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.30/sortext.patch (renamed from toolchain/kernel-headers/patches/3.10.30/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.40/headers-install.patch (renamed from toolchain/kernel-headers/patches/3.10.40/headers-install.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.40/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.10.40/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.40/relocs.patch (renamed from toolchain/kernel-headers/patches/3.10.40/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.40/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.10.40/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.10.40/sortext.patch (renamed from toolchain/kernel-headers/patches/3.10.40/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.12.20/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.12.20/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.12.20/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.12.20/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.12.20/relocs.patch (renamed from toolchain/kernel-headers/patches/3.12.20/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.12.20/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.12.20/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.12.20/sortext.patch (renamed from toolchain/kernel-headers/patches/3.12.20/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.11/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.13.11/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.11/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.13.11/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.11/relocs.patch (renamed from toolchain/kernel-headers/patches/3.13.11/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.11/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.13.11/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.11/sortext.patch (renamed from toolchain/kernel-headers/patches/3.13.11/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.14.4/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.14.4/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.14.4/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.14.4/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.14.4/relocs.patch (renamed from toolchain/kernel-headers/patches/3.14.4/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.14.4/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.14.4/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.14.4/sortext.patch (renamed from toolchain/kernel-headers/patches/3.14.4/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.15-rc6/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.15-rc6/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.15-rc6/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.15-rc6/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.15-rc6/relocs.patch (renamed from toolchain/kernel-headers/patches/3.15-rc6/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.15-rc6/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.15-rc6/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.15-rc6/sortext.patch (renamed from toolchain/kernel-headers/patches/3.15-rc6/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.90/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.90/aufs2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.90/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.90/linux-gcc-check.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.90/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.90/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.90/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.90/relocs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/Makefile | 10 |
36 files changed, 9 insertions, 9 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 79c199cf5..88873519d 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -24,14 +24,6 @@ KERNEL_FILE:=vmlinux KERNEL_TARGET:=$(ADK_TARGET_KERNEL) endif -$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: - $(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) - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - ../$(ARCH)/$(ADK_TARGET_SYSTEM)/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/kernel-prepare ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) $(LINUX_DIR) diff --git a/toolchain/kernel-headers/patches/3.10.30/headers_install.patch b/target/linux/patches/3.10.30/headers_install.patch index d4c1a6925..d4c1a6925 100644 --- a/toolchain/kernel-headers/patches/3.10.30/headers_install.patch +++ b/target/linux/patches/3.10.30/headers_install.patch diff --git a/toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch b/target/linux/patches/3.10.30/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch +++ b/target/linux/patches/3.10.30/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.10.30/relocs.patch b/target/linux/patches/3.10.30/relocs.patch index 649b9e73e..649b9e73e 100644 --- a/toolchain/kernel-headers/patches/3.10.30/relocs.patch +++ b/target/linux/patches/3.10.30/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.10.30/sgidefs.patch b/target/linux/patches/3.10.30/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.10.30/sgidefs.patch +++ b/target/linux/patches/3.10.30/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.10.30/sortext.patch b/target/linux/patches/3.10.30/sortext.patch index 65bbbb64b..65bbbb64b 100644 --- a/toolchain/kernel-headers/patches/3.10.30/sortext.patch +++ b/target/linux/patches/3.10.30/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.10.40/headers-install.patch b/target/linux/patches/3.10.40/headers-install.patch index 46dc9fe13..46dc9fe13 100644 --- a/toolchain/kernel-headers/patches/3.10.40/headers-install.patch +++ b/target/linux/patches/3.10.40/headers-install.patch diff --git a/toolchain/kernel-headers/patches/3.10.40/mkpiggy.patch b/target/linux/patches/3.10.40/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.10.40/mkpiggy.patch +++ b/target/linux/patches/3.10.40/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.10.40/relocs.patch b/target/linux/patches/3.10.40/relocs.patch index 649b9e73e..649b9e73e 100644 --- a/toolchain/kernel-headers/patches/3.10.40/relocs.patch +++ b/target/linux/patches/3.10.40/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.10.40/sgidefs.patch b/target/linux/patches/3.10.40/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.10.40/sgidefs.patch +++ b/target/linux/patches/3.10.40/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.10.40/sortext.patch b/target/linux/patches/3.10.40/sortext.patch index 65bbbb64b..65bbbb64b 100644 --- a/toolchain/kernel-headers/patches/3.10.40/sortext.patch +++ b/target/linux/patches/3.10.40/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.12.20/cleankernel.patch b/target/linux/patches/3.12.20/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/toolchain/kernel-headers/patches/3.12.20/cleankernel.patch +++ b/target/linux/patches/3.12.20/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.12.20/mkpiggy.patch b/target/linux/patches/3.12.20/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.12.20/mkpiggy.patch +++ b/target/linux/patches/3.12.20/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.12.20/relocs.patch b/target/linux/patches/3.12.20/relocs.patch index 649b9e73e..649b9e73e 100644 --- a/toolchain/kernel-headers/patches/3.12.20/relocs.patch +++ b/target/linux/patches/3.12.20/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.12.20/sgidefs.patch b/target/linux/patches/3.12.20/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.12.20/sgidefs.patch +++ b/target/linux/patches/3.12.20/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.12.20/sortext.patch b/target/linux/patches/3.12.20/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/toolchain/kernel-headers/patches/3.12.20/sortext.patch +++ b/target/linux/patches/3.12.20/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.13.11/cleankernel.patch b/target/linux/patches/3.13.11/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/toolchain/kernel-headers/patches/3.13.11/cleankernel.patch +++ b/target/linux/patches/3.13.11/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.13.11/mkpiggy.patch b/target/linux/patches/3.13.11/mkpiggy.patch index 751678b74..751678b74 100644 --- a/toolchain/kernel-headers/patches/3.13.11/mkpiggy.patch +++ b/target/linux/patches/3.13.11/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.13.11/relocs.patch b/target/linux/patches/3.13.11/relocs.patch index 69a7c88a9..69a7c88a9 100644 --- a/toolchain/kernel-headers/patches/3.13.11/relocs.patch +++ b/target/linux/patches/3.13.11/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.13.11/sgidefs.patch b/target/linux/patches/3.13.11/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.13.11/sgidefs.patch +++ b/target/linux/patches/3.13.11/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.13.11/sortext.patch b/target/linux/patches/3.13.11/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/toolchain/kernel-headers/patches/3.13.11/sortext.patch +++ b/target/linux/patches/3.13.11/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.14.4/cleankernel.patch b/target/linux/patches/3.14.4/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/toolchain/kernel-headers/patches/3.14.4/cleankernel.patch +++ b/target/linux/patches/3.14.4/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.14.4/mkpiggy.patch b/target/linux/patches/3.14.4/mkpiggy.patch index 751678b74..751678b74 100644 --- a/toolchain/kernel-headers/patches/3.14.4/mkpiggy.patch +++ b/target/linux/patches/3.14.4/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.14.4/relocs.patch b/target/linux/patches/3.14.4/relocs.patch index 69a7c88a9..69a7c88a9 100644 --- a/toolchain/kernel-headers/patches/3.14.4/relocs.patch +++ b/target/linux/patches/3.14.4/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.14.4/sgidefs.patch b/target/linux/patches/3.14.4/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.14.4/sgidefs.patch +++ b/target/linux/patches/3.14.4/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.14.4/sortext.patch b/target/linux/patches/3.14.4/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/toolchain/kernel-headers/patches/3.14.4/sortext.patch +++ b/target/linux/patches/3.14.4/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.15-rc6/cleankernel.patch b/target/linux/patches/3.15-rc6/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/toolchain/kernel-headers/patches/3.15-rc6/cleankernel.patch +++ b/target/linux/patches/3.15-rc6/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.15-rc6/mkpiggy.patch b/target/linux/patches/3.15-rc6/mkpiggy.patch index 751678b74..751678b74 100644 --- a/toolchain/kernel-headers/patches/3.15-rc6/mkpiggy.patch +++ b/target/linux/patches/3.15-rc6/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.15-rc6/relocs.patch b/target/linux/patches/3.15-rc6/relocs.patch index 69a7c88a9..69a7c88a9 100644 --- a/toolchain/kernel-headers/patches/3.15-rc6/relocs.patch +++ b/target/linux/patches/3.15-rc6/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.15-rc6/sgidefs.patch b/target/linux/patches/3.15-rc6/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.15-rc6/sgidefs.patch +++ b/target/linux/patches/3.15-rc6/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.15-rc6/sortext.patch b/target/linux/patches/3.15-rc6/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/toolchain/kernel-headers/patches/3.15-rc6/sortext.patch +++ b/target/linux/patches/3.15-rc6/sortext.patch diff --git a/toolchain/kernel-headers/patches/3.4.90/aufs2.patch b/target/linux/patches/3.4.90/aufs2.patch index d40c9a3fe..d40c9a3fe 100644 --- a/toolchain/kernel-headers/patches/3.4.90/aufs2.patch +++ b/target/linux/patches/3.4.90/aufs2.patch diff --git a/toolchain/kernel-headers/patches/3.4.90/linux-gcc-check.patch b/target/linux/patches/3.4.90/linux-gcc-check.patch index 7cc381845..7cc381845 100644 --- a/toolchain/kernel-headers/patches/3.4.90/linux-gcc-check.patch +++ b/target/linux/patches/3.4.90/linux-gcc-check.patch diff --git a/toolchain/kernel-headers/patches/3.4.90/mkpiggy.patch b/target/linux/patches/3.4.90/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.4.90/mkpiggy.patch +++ b/target/linux/patches/3.4.90/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.4.90/relocs.patch b/target/linux/patches/3.4.90/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.4.90/relocs.patch +++ b/target/linux/patches/3.4.90/relocs.patch diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 36f562dc9..16f126da2 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -7,7 +7,15 @@ include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk include ${TOPDIR}/mk/buildhlp.mk -$(WRKBUILD)/.headers: +$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: + $(TRACE) 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) \ + ../$(ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + touch $@ + +$(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check ${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \ INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ |