From 0a941ec0afea184d2aa1d5d7c9520b29282541aa Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Wed, 18 Dec 2024 22:16:37 +0530 Subject: linux-intel/6.12: add recipe * Add recipe for linux-intel Mainline 6.12 kernel * Drop recipe for linux-intel Mainline 6.11 kernel * Use the 6.12 kernel tag mainline-tracking-pre-prod-v6.12-linux-241211T020725Z * Rename the patch 0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...d_OID_registry-fix-reproducibility-issues.patch | 48 ++++++++++++++++++++++ ...d_OID_registry-fix-reproducibility-issues.patch | 48 ---------------------- recipes-kernel/linux/linux-intel_6.11.bb | 24 ----------- recipes-kernel/linux/linux-intel_6.12.bb | 24 +++++++++++ 4 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch delete mode 100644 recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch delete mode 100644 recipes-kernel/linux/linux-intel_6.11.bb create mode 100644 recipes-kernel/linux/linux-intel_6.12.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch new file mode 100644 index 00000000..df2a4139 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch @@ -0,0 +1,48 @@ +From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Sun, 10 Jul 2022 22:56:53 -0400 +Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues + +The script build_OID_registry captures the full path of itself +in the generated data. This causes reproduciblity issues as the +path is captured and packaged. + +We use the basename of the script instead, and that allows us +to be reprodicible, with slightly less information captured in +the output data (but the generating script can still easily +be found). + +Signed-off-by: Bruce Ashfield +Upstream-Status: Inappropriate + +Taken from linux-yocto, v5.15/standard/base. + +Signed-off-by: Anuj Mittal +--- + lib/build_OID_registry | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/build_OID_registry b/lib/build_OID_registry +index 8267e8d71338..755dd33a8b04 100755 +--- a/lib/build_OID_registry ++++ b/lib/build_OID_registry +@@ -9,6 +9,7 @@ + + use strict; + use Cwd qw(abs_path); ++use File::Basename; + + my @names = (); + my @oids = (); +@@ -40,7 +41,7 @@ open C_FILE, ">$ARGV[1]" or die; + print C_FILE "/*\n"; + my $scriptname = $0; + $scriptname =~ s#^\Q$abs_srctree/\E##; +-print C_FILE " * Automatically generated by ", $scriptname, ". Do not edit\n"; ++print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; + print C_FILE " */\n"; + + # +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch deleted file mode 100644 index df2a4139..00000000 --- a/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Sun, 10 Jul 2022 22:56:53 -0400 -Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues - -The script build_OID_registry captures the full path of itself -in the generated data. This causes reproduciblity issues as the -path is captured and packaged. - -We use the basename of the script instead, and that allows us -to be reprodicible, with slightly less information captured in -the output data (but the generating script can still easily -be found). - -Signed-off-by: Bruce Ashfield -Upstream-Status: Inappropriate - -Taken from linux-yocto, v5.15/standard/base. - -Signed-off-by: Anuj Mittal ---- - lib/build_OID_registry | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/build_OID_registry b/lib/build_OID_registry -index 8267e8d71338..755dd33a8b04 100755 ---- a/lib/build_OID_registry -+++ b/lib/build_OID_registry -@@ -9,6 +9,7 @@ - - use strict; - use Cwd qw(abs_path); -+use File::Basename; - - my @names = (); - my @oids = (); -@@ -40,7 +41,7 @@ open C_FILE, ">$ARGV[1]" or die; - print C_FILE "/*\n"; - my $scriptname = $0; - $scriptname =~ s#^\Q$abs_srctree/\E##; --print C_FILE " * Automatically generated by ", $scriptname, ". Do not edit\n"; -+print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; - print C_FILE " */\n"; - - # --- -2.34.1 - diff --git a/recipes-kernel/linux/linux-intel_6.11.bb b/recipes-kernel/linux/linux-intel_6.11.bb deleted file mode 100644 index 2e9c9d99..00000000 --- a/recipes-kernel/linux/linux-intel_6.11.bb +++ /dev/null @@ -1,24 +0,0 @@ -require linux-intel.inc - -SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ - " -SRC_URI:append = " file://0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch \ - " -KMETA_BRANCH = "master" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "6.11" -SRCREV_machine ?= "9a961f4b0a6a2655ef37e86b8588f2946b427650" -SRCREV_meta ?= "5b42ba3f7fd0bb7b15d194871152f3b1a30f3926" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ - features/security/security.scc \ - features/intel-npu/intel-npu.scc" - -UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.11-linux-(?P(\d+)T(\d+)Z)$" diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb new file mode 100644 index 00000000..d3933898 --- /dev/null +++ b/recipes-kernel/linux/linux-intel_6.12.bb @@ -0,0 +1,24 @@ +require linux-intel.inc + +SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ + " +SRC_URI:append = " file://0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ + " +KMETA_BRANCH = "yocto-6.12" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "elfutils-native openssl-native util-linux-native" + +LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" + +LINUX_VERSION ?= "6.12" +SRCREV_machine ?= "0f23779724ce8d6654abd0ef2a4167dd37d677c8" +SRCREV_meta ?= "b6eb84a3327f850c42300c394586fe58a57db72d" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ + features/security/security.scc \ + features/intel-npu/intel-npu.scc" + +UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.12-linux-(?P(\d+)T(\d+)Z)$" -- cgit v1.2.3-54-g00ecf