Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Browse Source

discussed with phil, do not split kernel patches between kernel-headers and kernel, can make issues

Waldemar Brodkorb 10 years ago
parent
ea8ec7c246
commit
45e52ed75c
36 changed files with 9 additions and 9 deletions
Split View Show Diff Stats
  1. 0 8
      mk/kernel-build.mk
  2. 0 0
      target/linux/patches/3.10.30/headers_install.patch
  3. 0 0
      target/linux/patches/3.10.30/mkpiggy.patch
  4. 0 0
      target/linux/patches/3.10.30/relocs.patch
  5. 0 0
      target/linux/patches/3.10.30/sgidefs.patch
  6. 0 0
      target/linux/patches/3.10.30/sortext.patch
  7. 0 0
      target/linux/patches/3.10.40/headers-install.patch
  8. 0 0
      target/linux/patches/3.10.40/mkpiggy.patch
  9. 0 0
      target/linux/patches/3.10.40/relocs.patch
  10. 0 0
      target/linux/patches/3.10.40/sgidefs.patch
  11. 0 0
      target/linux/patches/3.10.40/sortext.patch
  12. 0 0
      target/linux/patches/3.12.20/cleankernel.patch
  13. 0 0
      target/linux/patches/3.12.20/mkpiggy.patch
  14. 0 0
      target/linux/patches/3.12.20/relocs.patch
  15. 0 0
      target/linux/patches/3.12.20/sgidefs.patch
  16. 0 0
      target/linux/patches/3.12.20/sortext.patch
  17. 0 0
      target/linux/patches/3.13.11/cleankernel.patch
  18. 0 0
      target/linux/patches/3.13.11/mkpiggy.patch
  19. 0 0
      target/linux/patches/3.13.11/relocs.patch
  20. 0 0
      target/linux/patches/3.13.11/sgidefs.patch
  21. 0 0
      target/linux/patches/3.13.11/sortext.patch
  22. 0 0
      target/linux/patches/3.14.4/cleankernel.patch
  23. 0 0
      target/linux/patches/3.14.4/mkpiggy.patch
  24. 0 0
      target/linux/patches/3.14.4/relocs.patch
  25. 0 0
      target/linux/patches/3.14.4/sgidefs.patch
  26. 0 0
      target/linux/patches/3.14.4/sortext.patch
  27. 0 0
      target/linux/patches/3.15-rc6/cleankernel.patch
  28. 0 0
      target/linux/patches/3.15-rc6/mkpiggy.patch
  29. 0 0
      target/linux/patches/3.15-rc6/relocs.patch
  30. 0 0
      target/linux/patches/3.15-rc6/sgidefs.patch
  31. 0 0
      target/linux/patches/3.15-rc6/sortext.patch
  32. 0 0
      target/linux/patches/3.4.90/aufs2.patch
  33. 0 0
      target/linux/patches/3.4.90/linux-gcc-check.patch
  34. 0 0
      target/linux/patches/3.4.90/mkpiggy.patch
  35. 0 0
      target/linux/patches/3.4.90/relocs.patch
  36. 9 1
      toolchain/kernel-headers/Makefile

+ 0 - 8
mk/kernel-build.mk
View File 

@@ -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)

+ 0 - 0
toolchain/kernel-headers/patches/3.10.30/headers_install.patch → target/linux/patches/3.10.30/headers_install.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch → target/linux/patches/3.10.30/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.30/relocs.patch → target/linux/patches/3.10.30/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.30/sgidefs.patch → target/linux/patches/3.10.30/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.30/sortext.patch → target/linux/patches/3.10.30/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.40/headers-install.patch → target/linux/patches/3.10.40/headers-install.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.40/mkpiggy.patch → target/linux/patches/3.10.40/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.40/relocs.patch → target/linux/patches/3.10.40/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.40/sgidefs.patch → target/linux/patches/3.10.40/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.10.40/sortext.patch → target/linux/patches/3.10.40/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.12.20/cleankernel.patch → target/linux/patches/3.12.20/cleankernel.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.12.20/mkpiggy.patch → target/linux/patches/3.12.20/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.12.20/relocs.patch → target/linux/patches/3.12.20/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.12.20/sgidefs.patch → target/linux/patches/3.12.20/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.12.20/sortext.patch → target/linux/patches/3.12.20/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.13.11/cleankernel.patch → target/linux/patches/3.13.11/cleankernel.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.13.11/mkpiggy.patch → target/linux/patches/3.13.11/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.13.11/relocs.patch → target/linux/patches/3.13.11/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.13.11/sgidefs.patch → target/linux/patches/3.13.11/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.13.11/sortext.patch → target/linux/patches/3.13.11/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.14.4/cleankernel.patch → target/linux/patches/3.14.4/cleankernel.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.14.4/mkpiggy.patch → target/linux/patches/3.14.4/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.14.4/relocs.patch → target/linux/patches/3.14.4/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.14.4/sgidefs.patch → target/linux/patches/3.14.4/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.14.4/sortext.patch → target/linux/patches/3.14.4/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.15-rc6/cleankernel.patch → target/linux/patches/3.15-rc6/cleankernel.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.15-rc6/mkpiggy.patch → target/linux/patches/3.15-rc6/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.15-rc6/relocs.patch → target/linux/patches/3.15-rc6/relocs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.15-rc6/sgidefs.patch → target/linux/patches/3.15-rc6/sgidefs.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.15-rc6/sortext.patch → target/linux/patches/3.15-rc6/sortext.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.4.90/aufs2.patch → target/linux/patches/3.4.90/aufs2.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.4.90/linux-gcc-check.patch → target/linux/patches/3.4.90/linux-gcc-check.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.4.90/mkpiggy.patch → target/linux/patches/3.4.90/mkpiggy.patch
View File


+ 0 - 0
toolchain/kernel-headers/patches/3.4.90/relocs.patch → target/linux/patches/3.4.90/relocs.patch
View File


+ 9 - 1
toolchain/kernel-headers/Makefile
View File 

@@ -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 \