linux: fix using extensions (branch yem/kernel-ext)

Some packages need to vampirise files from one or more other packages. This is the case, for example, of the Linux kernel and its /extensions/.

Add a new type of dependencies, that are guaranteed to be extracted and patched before a package is patched.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 package/pkg-generic.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

package/pkg-generic.mk +0 -0

index c1b379b..018f048 100644

package/pkg-generic.mk +0 -0

 $(1)-extract:			$$($(2)_TARGET_EXTRACT)
 $$($(2)_TARGET_EXTRACT):	$$($(2)_TARGET_SOURCE)

Dear Yann E. MORIN,

On Sat, 14 Mar 2015 15:25:17 +0100, Yann E. MORIN wrote:

package/pkg-generic.mk endif · line 579

Quoted 7 lines

-$(1)-show-depends:
+$(1)-show-build-depends:

package/pkg-generic.mk +4 -0

 			@echo $$($(2)_FINAL_DEPENDENCIES)
+$(1)-show-patch-depends:
+			@echo $$($(2)_FINAL_PATCH_DEPENDENCIES)
+$(1)-show-depends:
+			@echo $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES))

I think this will break graph-depends. The python script will do "make <foo>-show-depends" for each package. Now this will return things such as "xenomai-patch"

Also, I'm not sure about the usefulness of having separate show-build-depends and show-patch-depends. It could have been useful if show-depends would simply depend on them, but it doesn't work because we want all dependencies space-separated on one line.

So, what about replacing this part with just:

$(1)-show-depends:

	@echo $$(sort $$($(2)_FINAL_DEPENDENCIES) $$(patsubst %-patch,%,$$($(2)_FINAL_PATCH_DEPENDENCIES)))

Quoted 3 lines

I think this will break graph-depends. The python script will do "make <foo>-show-depends" for each package. Now this will return things such as "xenomai-patch"

No, I don't think so, because _PATCH_DEPENDENCIES contain package names, not or internal make targets. And I can prove it:

    $ make linux-show-depends
    fbtft host-kmod host-lzop toolchain

where fbtft is a kernel extension.

Have you even tried it? ;-p

Well, I don;t mind getting rid of the separate show-{build,patch}-depends rules. But your proposal is wrong, since we do not have to get rid of the trailing -patch, because it's not in there...

Some packages need to vampirise files from one or more other packages. This is the case, for example, of the Linux kernel and its /extensions/.

Add a new type of dependencies, that are guaranteed to be extracted and patched before a package is patched.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 package/pkg-generic.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

package/pkg-generic.mk +3 -0

index c1b379b..018f048 100644
@@ -427,6 +427,7 @@ endif
 
 # Eliminate duplicates in dependencies
 $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
+$(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES))
 
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO

@@ -538,6 +539,8 @@ $$($(2)_TARGET_CONFIGURE):	$$($(2)_TARGET_PATCH)
 
 $(1)-patch:		$$($(2)_TARGET_PATCH)
 $$($(2)_TARGET_PATCH):	$$($(2)_TARGET_EXTRACT)
+# Order-only dependency
+$$($(2)_TARGET_PATCH):  | $$(patsubst %,%-patch,$$($(2)_FINAL_PATCH_DEPENDENCIES))
 
 $(1)-extract:			$$($(2)_TARGET_EXTRACT)
 $$($(2)_TARGET_EXTRACT):	$$($(2)_TARGET_SOURCE)

package/pkg-generic.mk +0 -0

 $(1)-graph-depends: graph-depends-requirements
 			@$$(INSTALL) -d $$(O)/graphs
 

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 docs/manual/adding-packages-generic.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

docs/manual/adding-packages-generic.txt +2 -0

index 6150bf7..adf4ddf 100644
@@ -304,6 +304,15 @@ information is (assuming the package name is +libfoo+) :
   a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for
   the current host package.
 
+* +LIBFOO_PATCH_DEPENDENCIES+ lists the dependencies (in terms of
+  package name) that are required for the current package to be

Since the move to the kconfig-package infra, linux extensions are broken.

In our linux package, extensions are applied as pre-patch hooks.

Before the kconfig-package infra, we had custom rules for the linux-*config targets, which were of the form:

    linux-menuconfig: linux-configure
        $(MAKE) -C $(LINUX_DIR) menuconfig

This caused the linux tree to be fully configured before running the configurators, and thus linux dependencies were entirely fullfilled, and extensions were properly applied.

Since we migrated (in dff25ea), the kconfig-package infra introduces a (hidden, internal) intermediate step 'kconfig-fixup' and decorelates the kconfig-part of the configuration from the actual package-part of the configuration:

    linux-configure -------> kconfig-fixup --> .config --> $(LINUX_CONFIG_FILE)
                        /
    linux-menuconfig --'

As thus, this (very useful!) use-case breaks (starting from a clean Buildroot tree):

    make menuconfig
        -> enable a kernel and at least one extension
        -> save and exit
    make linux-menuconfig
        -> extensions are not available

Fix that by using the newly-introduced patch-dependencies, so that extensions are available before we try to patch the linux kernel.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc Thomas De Schampheleire <[email protected]>

---

Curently, all three linux extensions follow the same layout:
- test if the extension is enabled
- add itself to linux' patch-dependencies
- declare a macro, added as the pre-patch hook

Except for the macro, all can be commonalised.

Add a simple infrastructure for that:
- extensions declare themselves in the list of extensions
- extensions define their macro
- the infra adds them to the patch-dependencies and pre-patch hooks as appropriate

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 linux/linux.mk | 7 +++++++
 1 file changed, 7 insertions(+)

linux/linux.mk +0 -0

index b1aca41..2917857 100644
@@ -333,6 +333,13 @@ endef
 # included here *must* be in the same directory!
 include $(sort $(wildcard linux/linux-ext-*.mk))
 

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
 linux/linux-ext-fbtft.mk   | 8 +-------
 linux/linux-ext-rtai.mk    | 8 +-------
 linux/linux-ext-xenomai.mk | 8 +-------
 3 files changed, 3 insertions(+), 21 deletions(-)

Yann E. MORIN (5):
package infra: add patch-dependencies docs/manual: add _PATCH_DEPENDENCIES
linux: fix extensions
linux: simplify adding new extensions
linux: migrate extensions to use the new infrastructure