[v2,13/15] integration-patches: make patches per target kernel version

Commit Message

Thomas Pedersen May 13, 2022, 4:05 p.m. UTC

The integration patches are applied to the target kernel,
so really need to be versioned accordingly.

Signed-off-by: Thomas Pedersen <[e-mail]>
---
 gentree.py                                                     | 3 ++-
 .../0001-enable-backports/0001-enable-backports-built-in.patch | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename integration-patches/{ => 4.19}/0001-enable-backports/0001-enable-backports-built-in.patch (100%)

Patch

diff --git a/gentree.py b/gentree.py
index 9699ce0128d0..04e47c76e607 100755
--- a/gentree.py
+++ b/gentree.py
@@ -1137,8 +1137,9 @@  def process(kerneldir, copy_list_file, git_revision=None,
         f.write('source "backports/Kconfig"\n')
         f.close()
         git_debug_snapshot(args, "hooked backport to top level Kconfig")
+        patchdir = 'integration-patches/%s.%s/' % (rel_specs['VERSION'], rel_specs['PATCHLEVEL'])
 
-        failure = apply_patches(args, "integration", source_dir, 'integration-patches/',
+        failure = apply_patches(args, "integration", source_dir, patchdir,
                                 bpid.project_dir, logwrite)
         if failure:
             return failure
diff --git a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch b/integration-patches/4.19/0001-enable-backports/0001-enable-backports-built-in.patch
similarity index 100%
rename from integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
rename to integration-patches/4.19/0001-enable-backports/0001-enable-backports-built-in.patch