Skip to contentSkip to conversation

Include makefiles from GLOBAL_PATCH_DIR

PATCH Superseded Jérémy Rosen 2 participants 5 messages Nov 9, 2019 – Sep 7, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

v2 cover Include makefiles from GLOBAL_PATCH_DIR

V2:
* fix includes happening multiple times on host+target packages
* change name of included makefiles from .mk to .smk (see commit for details)

Note that the first patch might be usefull independently of the (more controversial) second patch.

I am opened to changing the .smk to any pattern you suggest I am not sure where to fit this in the documentation. suggestions welcomed

J?r?my Rosen (2):
allow .smk files as includes in packages
Include makefiles from GLOBAL_PATCH_DIR

 package/pkg-autotools.mk     |  1 +
 package/pkg-cmake.mk         |  1 +
 package/pkg-generic.mk       |  8 ++++++--
 package/pkg-golang.mk        |  1 +
 package/pkg-kconfig.mk       |  1 +
 package/pkg-kernel-module.mk |  1 +
 package/pkg-luarocks.mk      |  1 +
 package/pkg-meson.mk         |  1 +
 package/pkg-perl.mk          |  1 +
 package/pkg-python.mk        |  1 +
 package/pkg-rebar.mk         |  1 +
 package/pkg-utils.mk         | 21 ++++++++++++++++++++-
 package/pkg-virtual.mk       |  1 +
 package/pkg-waf.mk           |  1 +
 14 files changed, 38 insertions(+), 3 deletions(-)
Signature · 1 line
2.24.0.rc1
#1 lore raw

PATCH v2 1/2 allow .smk files as includes in packages

Currently, when using the include directive in a package's .mk, buildroot will create a new package. It is impossible to include a makefile for the normal inclusion purpose

This is hardwired in many places, both in buildroot-core and in the way makefiles are included in BR2_EXTERNAL. This can't be changed without breaking external code

Instead, use a different extension for "normal" includes and filter them out in pkgdir

---
 package/pkg-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-utils.mk +1 -1
index 63b19e812b..ebab55a0fd 100644
@@ -30,7 +30,7 @@ endef
 # directory from its makefile directory, using the $(MAKEFILE_LIST)
 # variable provided by make. This is used by the *-package macros to
 # automagically find where the package is located.
-pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
+pkgdir = $(dir $(lastword $(filter-out %.smk,$(MAKEFILE_LIST))))
 pkgname = $(lastword $(subst /, ,$(pkgdir)))
 
 # Define extractors for different archive suffixes
Signature · 1 line
2.24.0.rc1
#2 lore raw

PATCH v2 2/2 Include makefiles from GLOBAL_PATCH_DIR

In reply to Jérémy Rosen

Including a file named <pkgname>.mk from the GLOBAL_PATCH_DIR allows a user to tweak a package provided by buildroot to his own need.

* add a function to pkg-utils.mk to include makefiles from GLOBAL_PATCH_DIR
* modify all pkg-* to use it as their first action

---
 package/pkg-autotools.mk     |  1 +
 package/pkg-cmake.mk         |  1 +
 package/pkg-generic.mk       |  8 ++++++--
 package/pkg-golang.mk        |  1 +
 package/pkg-kconfig.mk       |  1 +
 package/pkg-kernel-module.mk |  1 +
 package/pkg-luarocks.mk      |  1 +
 package/pkg-meson.mk         |  1 +
 package/pkg-perl.mk          |  1 +
 package/pkg-python.mk        |  1 +
 package/pkg-rebar.mk         |  1 +
 package/pkg-utils.mk         | 19 +++++++++++++++++++
 package/pkg-virtual.mk       |  1 +
 package/pkg-waf.mk           |  1 +
 14 files changed, 37 insertions(+), 2 deletions(-)
package/pkg-autotools.mk +1 -0
index daa688dab6..b18ee4edf5 100644
@@ -119,6 +119,7 @@ endef
 ################################################################################
 
 define inner-autotools-package
+$(call global-patchdir-include,$(1),$(2))
 
 ifndef $(2)_LIBTOOL_PATCH
  ifdef $(3)_LIBTOOL_PATCH
package/pkg-cmake.mk +1 -0
index 57bfea9be5..beb4af0b67 100644
@@ -50,6 +50,7 @@ endif
 ################################################################################
 
 define inner-cmake-package
+$(call global-patchdir-include,$(1),$(2))
 
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPTS			?=
package/pkg-generic.mk +6 -2
index 7d6fa08418..3de939f087 100644
@@ -414,6 +414,10 @@ endef
 #   undesired behavior occurs with respect to these variables and functions.
 #
 ################################################################################
+define intermediate-generic-package
+$(call global-patchdir-include,$(1),$(2))
+$(call inner-generic-package,$(1),$(2),$(3),$(4)) 
+endef
 
 define inner-generic-package
 
@@ -1126,8 +1130,8 @@ endef # inner-generic-package
 ################################################################################
 
 # In the case of target packages, keep the package name "pkg"
-generic-package = $(call inner-generic-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
+generic-package = $(call intermediate-generic-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
 # In the case of host packages, turn the package name "pkg" into "host-pkg"
-host-generic-package = $(call inner-generic-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)
+host-generic-package = $(call intermediate-generic-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)
 
 # :mode=makefile:
package/pkg-golang.mk +1 -0
index e47de17aba..916645c52d 100644
@@ -55,6 +55,7 @@ GO_HOST_ENV = \
 ################################################################################
 
 define inner-golang-package
+$(call global-patchdir-include,$(1),$(2))
 
 $(2)_WORKSPACE ?= _gopath
 
package/pkg-kconfig.mk +1 -0
index 86d7c14fdb..5e06adaa0d 100644
@@ -77,6 +77,7 @@ endef
 ################################################################################
 
 define inner-kconfig-package
+$(call global-patchdir-include,$(1),$(2))
 
 # Register the kconfig dependencies as regular dependencies, so that
 # they are also accounted for in the generated graphs.
package/pkg-kernel-module.mk +1 -0
index fcd6b8bc29..b9e211aac1 100644
@@ -43,6 +43,7 @@
 ################################################################################
 
 define inner-kernel-module
+$(call global-patchdir-include,$(1),$(2))
 
 # If the package is enabled, ensure the kernel will support modules
 ifeq ($$(BR2_PACKAGE_$(2)),y)
package/pkg-luarocks.mk +1 -0
index 78d6c325f8..9a2b508532 100644
@@ -32,6 +32,7 @@
 ################################################################################
 
 define inner-luarocks-package
+$(call global-patchdir-include,$(1),$(2))
 
 $(2)_BUILD_OPTS		?=
 $(2)_NAME_UPSTREAM	?= $(1)
package/pkg-meson.mk +1 -0
index e7eea2aa58..a6fe8ec71a 100644
@@ -44,6 +44,7 @@ NINJA_OPTS	= $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
 ################################################################################
 
 define inner-meson-package
+$(call global-patchdir-include,$(1),$(2))
 
 $(2)_CONF_ENV		?=
 $(2)_CONF_OPTS		?=
package/pkg-perl.mk +1 -0
index 1ecf31eff9..88cc00c5f6 100644
@@ -38,6 +38,7 @@ PERL_RUN = PERL5LIB= PERL_USE_UNSAFE_INC=1 $(HOST_DIR)/bin/perl
 ################################################################################
 
 define inner-perl-package
+$(call global-patchdir-include,$(1),$(2))
 
 # Target packages need both the perl interpreter on the target (for
 # runtime) and the perl interpreter on the host (for
package/pkg-python.mk +1 -0
index be1ce071df..26391e09ba 100644
@@ -104,6 +104,7 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
 ################################################################################
 
 define inner-python-package
+$(call global-patchdir-include,$(1),$(2))
 
 $(2)_ENV         ?=
 $(2)_BUILD_OPTS   ?=
package/pkg-rebar.mk +1 -0
index e4e3f3bb6c..282f7e600f 100644
@@ -118,6 +118,7 @@ endef
 ################################################################################
 
 define inner-rebar-package
+$(call global-patchdir-include,$(1),$(2))
 
 # Extract just the raw package name, lowercase without the leading
 # erlang- or host- prefix, as this is used by rebar to find the
package/pkg-utils.mk +19 -0
index ebab55a0fd..16128b40a9 100644
@@ -175,3 +175,22 @@ legal-deps = \
         $(filter-out $(if $(1:host-%=),host-%),\
             $(call non-virtual-deps,\
                 $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
+# Include a makefile from GLOBAL_PATCH_DIR
+# This follows the namind and directory layout of GLOBAL_PATCH_DIR
+#  argument 1 is the lowercase package name
+#  argument 2 is the uppercase package name, including a HOST_ prefix
+#             for host packages
+define global-patchdir-include
+$(if $($(patsubst host-%,%,$(1))_EXTRA_PATCH_INCLUDED),,\
+$(foreach dir,$(addsuffix /$(patsubst host-%,%,$(1)),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))),\
+	$(if $(wildcard $(dir)/$($(2)_VERSION)/$(1).smk),\
+		include $(dir)/$($(2)_VERSION)/$(1).smk  \
+	,$(if $(wildcard $(dir)/$(1).smk),\
+		$(info avant $(pkgdir))
+		include $(dir)/$(1).smk \
+		$(info apres $(pkgdir))
+	))\
+)
+$(eval $(patsubst host-%,%,$(1))_EXTRA_PATCH_INCLUDED = true) \
+)
+endef
package/pkg-virtual.mk +1 -0
index 05bd63eb18..c34834c884 100644
@@ -33,6 +33,7 @@
 # so it is not evaluated now, but as part of the generated make code.
 
 define inner-virtual-package
+$(call global-patchdir-include,$(1),$(2))
 
 # Ensure the virtual package has an implementation defined.
 ifeq ($$(BR2_PACKAGE_HAS_$(2)),y)
package/pkg-waf.mk +1 -0
index a32d5dab33..05bd90e463 100644
@@ -35,6 +35,7 @@
 ################################################################################
 
 define inner-waf-package
+$(call global-patchdir-include,$(1),$(2))
 
 # We need host-python to run waf
 $(2)_DEPENDENCIES += host-python
Signature · 1 line
2.24.0.rc1
#3 lore raw

v2 cover Include makefiles from GLOBAL_PATCH_DIR

In reply to Jérémy Rosen

J?r?my, All,

On 2019-11-09 19:55 +0100, J?r?my Rosen spake thusly:

Quoted 11 lines

V2:
* fix includes happening multiple times on host+target packages
* change name of included makefiles from .mk to .smk (see commit for details)

Note that the first patch might be usefull independently of the (more controversial) second patch.

I am opened to changing the .smk to any pattern you suggest I am not sure where to fit this in the documentation. suggestions welcomed

As was discussed when we met in Lyon, and elsewhere on the list (sorry, I can't dig the thread now), we already outlined a better solution, which is to provide a generic way for a package to be extended or even completely overriden from a br2-external tree.

I know it's been quite a long time, but I hope you do remember that discussion, and hopefully you can also dig the thread on the list...

I've now marked that series as rejected.

Thanks.

Quoted 27 lines

J?r?my Rosen (2):
allow .smk files as includes in packages
Include makefiles from GLOBAL_PATCH_DIR

 package/pkg-autotools.mk     |  1 +
 package/pkg-cmake.mk         |  1 +
 package/pkg-generic.mk       |  8 ++++++--
 package/pkg-golang.mk        |  1 +
 package/pkg-kconfig.mk       |  1 +
 package/pkg-kernel-module.mk |  1 +
 package/pkg-luarocks.mk      |  1 +
 package/pkg-meson.mk         |  1 +
 package/pkg-perl.mk          |  1 +
 package/pkg-python.mk        |  1 +
 package/pkg-rebar.mk         |  1 +
 package/pkg-utils.mk         | 21 ++++++++++++++++++++-
 package/pkg-virtual.mk       |  1 +
 package/pkg-waf.mk           |  1 +
 14 files changed, 38 insertions(+), 3 deletions(-)
Signature · 6 lines
2.24.0.rc1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

v2 cover Include makefiles from GLOBAL_PATCH_DIR

No worries, I'm fine with that.
As long as the problem is solved, I'm ok if my solution is not the one that gets in

Cheers
Jeremy

Le sam. 5 sept. 2020 ? 22:32, Yann E. MORIN <[email protected]> a ?crit :

Quoted 69 lines

J?r?my, All,

On 2019-11-09 19:55 +0100, J?r?my Rosen spake thusly:

Quoted 11 lines

V2:
* fix includes happening multiple times on host+target packages
* change name of included makefiles from .mk to .smk (see commit for details)

Note that the first patch might be usefull independently of the (more controversial) second patch.

I am opened to changing the .smk to any pattern you suggest I am not sure where to fit this in the documentation. suggestions welcomed

As was discussed when we met in Lyon, and elsewhere on the list (sorry, I can't dig the thread now), we already outlined a better solution, which is to provide a generic way for a package to be extended or even completely overriden from a br2-external tree.

I know it's been quite a long time, but I hope you do remember that discussion, and hopefully you can also dig the thread on the list...

I've now marked that series as rejected.

Thanks.

Quoted 20 lines

J?r?my Rosen (2):
allow .smk files as includes in packages
Include makefiles from GLOBAL_PATCH_DIR

 package/pkg-autotools.mk     |  1 +
 package/pkg-cmake.mk         |  1 +
 package/pkg-generic.mk       |  8 ++++++--
 package/pkg-golang.mk        |  1 +
 package/pkg-kconfig.mk       |  1 +
 package/pkg-kernel-module.mk |  1 +
 package/pkg-luarocks.mk      |  1 +
 package/pkg-meson.mk         |  1 +
 package/pkg-perl.mk          |  1 +
 package/pkg-python.mk        |  1 +
 package/pkg-rebar.mk         |  1 +
 package/pkg-utils.mk         | 21 ++++++++++++++++++++-
 package/pkg-virtual.mk       |  1 +
 package/pkg-waf.mk           |  1 +
 14 files changed, 38 insertions(+), 3 deletions(-)
Quoted 7 lines

--
2.24.0.rc1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
     |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
 conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Signature · 21 lines
[image: SMILE]  <http://www.smile.eu/>

20 rue des Jardins
92600 Asni?res-sur-Seine
*J?r?my ROSEN*
Architecte technique

[image: email] jeremy.rosen at smile.fr
[image: phone]  +33 6 88 25 87 42
[image: url] http://www.smile.eu

[image: Twitter] <https://twitter.com/GroupeSmile> [image: Facebook]
<https://www.facebook.com/smileopensource> [image: LinkedIn]
<https://www.linkedin.com/company/smile> [image: Github]
<https://github.com/Smile-SA>

[image: D?couvrez l?univers Smile, rendez-vous sur smile.eu]
<https://www.smile.eu/fr/publications/livres-blancs/yocto?utm_source=signature&utm_medium=email&utm_campaign=signature>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200907/61482015/attachment.html>