From cb85578bf32caee74a8bbad0174eb96aecba8272 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Sun, 9 Mar 2025 21:15:56 +0530 Subject: linux-intel-rt/6.12: Adapt 6.6-rt recipe for 6.12-rt * Use LTS 6.12 for RT as well, as 6.12 now has a single branch for both RT and non-RT kernels. * Rename the patch: linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch * Drop the following patches, as they were specific to the 6.6 kernel: 0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch 0001-6.6-vt-conmakehash-improve-reproducibility.patch Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-rt_6.12.bb | 35 +++++++++++++ recipes-kernel/linux/linux-intel-rt_6.6.bb | 36 -------------- ...d_OID_registry-fix-reproducibility-issues.patch | 48 ------------------ ...d_OID_registry-fix-reproducibility-issues.patch | 48 ++++++++++++++++++ ...d_OID_registry-fix-reproducibility-issues.patch | 39 --------------- ....6-vt-conmakehash-improve-reproducibility.patch | 58 ---------------------- 6 files changed, 83 insertions(+), 181 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel-rt_6.12.bb delete mode 100644 recipes-kernel/linux/linux-intel-rt_6.6.bb delete mode 100644 recipes-kernel/linux/linux-intel/0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch create mode 100644 recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch delete mode 100644 recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch delete mode 100644 recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch diff --git a/recipes-kernel/linux/linux-intel-rt_6.12.bb b/recipes-kernel/linux/linux-intel-rt_6.12.bb new file mode 100644 index 00000000..139d4c91 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-rt_6.12.bb @@ -0,0 +1,35 @@ +require linux-intel.inc + +SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ + " +SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ + " + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") +} + +KBRANCH = "6.12/linux" +KMETA_BRANCH = "yocto-6.12" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "elfutils-native openssl-native util-linux-native" + +LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" + +LINUX_VERSION ?= "6.12.16" +SRCREV_machine ?= "934bc38849dd7c6cabd8110d3ef2bd50a7fc79c4" +SRCREV_meta ?= "f24c58a63b7e047d2c4441dd2adc30de21c8814d" + +LINUX_KERNEL_TYPE = "preempt-rt" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" + +UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv6.12.(\d+)-linux-(\d+)T(\d+)Z)$" diff --git a/recipes-kernel/linux/linux-intel-rt_6.6.bb b/recipes-kernel/linux/linux-intel-rt_6.6.bb deleted file mode 100644 index 06c29e61..00000000 --- a/recipes-kernel/linux/linux-intel-rt_6.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -require linux-intel.inc - -SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ - " -SRC_URI:append = " file://0001-6.6-vt-conmakehash-improve-reproducibility.patch \ - file://0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch \ - " - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") -} - -KBRANCH = "6.6/preempt-rt" -KMETA_BRANCH = "yocto-6.6" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "6.6.63" -SRCREV_machine ?= "91eff9b39c0f16e7487480fb2f1b89446b16b055" -SRCREV_meta ?= "693358ea6816821663168ac9063d60e52a8ee4fe" - -LINUX_KERNEL_TYPE = "preempt-rt" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" - -UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv6.6.(\d+)-rt(\d)-preempt-rt-(\d+)T(\d+)Z)$" 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 deleted file mode 100644 index df2a4139..00000000 --- a/recipes-kernel/linux/linux-intel/0001-6.11-6.12-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/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-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.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.6-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch deleted file mode 100644 index 4a918616..00000000 --- a/recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c53db24c143f9d0f5f1c1894852c00c0567f80a6 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 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/build_OID_registry b/lib/build_OID_registry -index 8267e8d71338..7bb198f08c94 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 = (); --- -2.43.0 - diff --git a/recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch deleted file mode 100644 index 0ecacb30..00000000 --- a/recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2f662283528bc003d0be988bf6590a271ebe7755 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Sun, 10 Jul 2022 21:37:07 -0400 -Subject: [PATCH] vt/conmakehash: improve reproducibility - -The file generated by conmakehash capture the application -path used to generate the file. While that can be informative, -it varies based on where the kernel was built, as the full -path is captured. - -We tweak the application to use a second input as the "capture -name", and then modify the Makefile to pass the basename of -the source, making it reproducible. - -This could be improved by using some sort of path mapping, -or the application manipualing argv[1] itself, but for now -this solves the reprodicibility issue. - -Signed-off-by: Bruce Ashfield - -Upstream-Status: Inappropriate - -Taken from linux-yocto, v5.15/standard/base -Signed-off-by: Anuj Mittal ---- - drivers/tty/vt/Makefile | 2 +- - drivers/tty/vt/conmakehash.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile -index b3dfe9d5717e..6ee3736776c8 100644 ---- a/drivers/tty/vt/Makefile -+++ b/drivers/tty/vt/Makefile -@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c - hostprogs += conmakehash - - quiet_cmd_conmk = CONMK $@ -- cmd_conmk = $(obj)/conmakehash $< > $@ -+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@ - - $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash - $(call cmd,conmk) -diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c -index cddd789fe46e..d62510b280e9 100644 ---- a/drivers/tty/vt/conmakehash.c -+++ b/drivers/tty/vt/conmakehash.c -@@ -253,7 +253,7 @@ int main(int argc, char *argv[]) - #include \n\ - \n\ - u8 dfont_unicount[%d] = \n\ --{\n\t", argv[1], fontlen); -+{\n\t", argv[2], fontlen); - - for ( i = 0 ; i < fontlen ; i++ ) - { --- -2.34.1 - -- cgit v1.2.3-54-g00ecf