diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 454f385a..5e8dc207 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,6 +1,9 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.7" python: - version: "3.7" install: - requirements: docs/requirements.txt diff --git a/recipes-kernel/linux/files/0001-wifi-cfg80211-Add-my-certificate.patch b/recipes-kernel/linux/files/0001-wifi-cfg80211-Add-my-certificate.patch new file mode 100644 index 00000000..9b62e9e4 --- /dev/null +++ b/recipes-kernel/linux/files/0001-wifi-cfg80211-Add-my-certificate.patch @@ -0,0 +1,126 @@ +From 80663991ddaec664f6ffd37e4b61eed405fbfd9c Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai +Date: Thu, 7 Dec 2023 21:20:50 +0800 +Subject: [PATCH] wifi: cfg80211: Add my certificate + +commit fb768d3b13ffa325b7e84480d488ac799c9d2cd7 upstream. + +As announced [1][2], I have taken over maintainership of the +wireless-regdb project. + +Add my certificate so that newer releases are valid to the kernel. +Seth's certificate should be kept around for awhile, at least until +a few new releases by me happen. + +This should also be applied to stable trees so that stable kernels +can utilize newly released database binaries. + +[1] https://lore.kernel.org/linux-wireless/CAGb2v657baNMPKU3QADijx7hZa=GUcSv2LEDdn6N=QQaFX8r-g@mail.gmail.com/ +[2] https://lore.kernel.org/linux-wireless/ZWmRR5ul7EDfxCan@wens.tw/ + +Cc: stable@vger.kernel.org +Signed-off-by: Chen-Yu Tsai +Acked-by: Seth Forshee +Link: https://msgid.link/ZXHGsqs34qZyzZng@wens.tw +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- +Upstream-Status: Backport [018f336f79fd wifi: cfg80211: Add my certificate] + + net/wireless/certs/wens.hex | 87 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + create mode 100644 net/wireless/certs/wens.hex + +diff --git a/net/wireless/certs/wens.hex b/net/wireless/certs/wens.hex +new file mode 100644 +index 000000000000..ccd5b5dc3360 +--- /dev/null ++++ b/net/wireless/certs/wens.hex +@@ -0,0 +1,87 @@ ++/* Chen-Yu Tsai's regdb certificate */ ++0x30, 0x82, 0x02, 0xa7, 0x30, 0x82, 0x01, 0x8f, ++0x02, 0x14, 0x61, 0xc0, 0x38, 0x65, 0x1a, 0xab, ++0xdc, 0xf9, 0x4b, 0xd0, 0xac, 0x7f, 0xf0, 0x6c, ++0x72, 0x48, 0xdb, 0x18, 0xc6, 0x00, 0x30, 0x0d, ++0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, ++0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x0f, 0x31, ++0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03, ++0x0c, 0x04, 0x77, 0x65, 0x6e, 0x73, 0x30, 0x20, ++0x17, 0x0d, 0x32, 0x33, 0x31, 0x32, 0x30, 0x31, ++0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, 0x18, ++0x0f, 0x32, 0x31, 0x32, 0x33, 0x31, 0x31, 0x30, ++0x37, 0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, ++0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, ++0x55, 0x04, 0x03, 0x0c, 0x04, 0x77, 0x65, 0x6e, ++0x73, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, ++0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, ++0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, ++0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, ++0x01, 0x00, 0xa9, 0x7a, 0x2c, 0x78, 0x4d, 0xa7, ++0x19, 0x2d, 0x32, 0x52, 0xa0, 0x2e, 0x6c, 0xef, ++0x88, 0x7f, 0x15, 0xc5, 0xb6, 0x69, 0x54, 0x16, ++0x43, 0x14, 0x79, 0x53, 0xb7, 0xae, 0x88, 0xfe, ++0xc0, 0xb7, 0x5d, 0x47, 0x8e, 0x1a, 0xe1, 0xef, ++0xb3, 0x90, 0x86, 0xda, 0xd3, 0x64, 0x81, 0x1f, ++0xce, 0x5d, 0x9e, 0x4b, 0x6e, 0x58, 0x02, 0x3e, ++0xb2, 0x6f, 0x5e, 0x42, 0x47, 0x41, 0xf4, 0x2c, ++0xb8, 0xa8, 0xd4, 0xaa, 0xc0, 0x0e, 0xe6, 0x48, ++0xf0, 0xa8, 0xce, 0xcb, 0x08, 0xae, 0x37, 0xaf, ++0xf6, 0x40, 0x39, 0xcb, 0x55, 0x6f, 0x5b, 0x4f, ++0x85, 0x34, 0xe6, 0x69, 0x10, 0x50, 0x72, 0x5e, ++0x4e, 0x9d, 0x4c, 0xba, 0x38, 0x36, 0x0d, 0xce, ++0x73, 0x38, 0xd7, 0x27, 0x02, 0x2a, 0x79, 0x03, ++0xe1, 0xac, 0xcf, 0xb0, 0x27, 0x85, 0x86, 0x93, ++0x17, 0xab, 0xec, 0x42, 0x77, 0x37, 0x65, 0x8a, ++0x44, 0xcb, 0xd6, 0x42, 0x93, 0x92, 0x13, 0xe3, ++0x39, 0x45, 0xc5, 0x6e, 0x00, 0x4a, 0x7f, 0xcb, ++0x42, 0x17, 0x2b, 0x25, 0x8c, 0xb8, 0x17, 0x3b, ++0x15, 0x36, 0x59, 0xde, 0x42, 0xce, 0x21, 0xe6, ++0xb6, 0xc7, 0x6e, 0x5e, 0x26, 0x1f, 0xf7, 0x8a, ++0x57, 0x9e, 0xa5, 0x96, 0x72, 0xb7, 0x02, 0x32, ++0xeb, 0x07, 0x2b, 0x73, 0xe2, 0x4f, 0x66, 0x58, ++0x9a, 0xeb, 0x0f, 0x07, 0xb6, 0xab, 0x50, 0x8b, ++0xc3, 0x8f, 0x17, 0xfa, 0x0a, 0x99, 0xc2, 0x16, ++0x25, 0xbf, 0x2d, 0x6b, 0x1a, 0xaa, 0xe6, 0x3e, ++0x5f, 0xeb, 0x6d, 0x9b, 0x5d, 0x4d, 0x42, 0x83, ++0x2d, 0x39, 0xb8, 0xc9, 0xac, 0xdb, 0x3a, 0x91, ++0x50, 0xdf, 0xbb, 0xb1, 0x76, 0x6d, 0x15, 0x73, ++0xfd, 0xc6, 0xe6, 0x6b, 0x71, 0x9e, 0x67, 0x36, ++0x22, 0x83, 0x79, 0xb1, 0xd6, 0xb8, 0x84, 0x52, ++0xaf, 0x96, 0x5b, 0xc3, 0x63, 0x02, 0x4e, 0x78, ++0x70, 0x57, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, ++0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, ++0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, ++0x01, 0x01, 0x00, 0x24, 0x28, 0xee, 0x22, 0x74, ++0x7f, 0x7c, 0xfa, 0x6c, 0x1f, 0xb3, 0x18, 0xd1, ++0xc2, 0x3d, 0x7d, 0x29, 0x42, 0x88, 0xad, 0x82, ++0xa5, 0xb1, 0x8a, 0x05, 0xd0, 0xec, 0x5c, 0x91, ++0x20, 0xf6, 0x82, 0xfd, 0xd5, 0x67, 0x60, 0x5f, ++0x31, 0xf5, 0xbd, 0x88, 0x91, 0x70, 0xbd, 0xb8, ++0xb9, 0x8c, 0x88, 0xfe, 0x53, 0xc9, 0x54, 0x9b, ++0x43, 0xc4, 0x7a, 0x43, 0x74, 0x6b, 0xdd, 0xb0, ++0xb1, 0x3b, 0x33, 0x45, 0x46, 0x78, 0xa3, 0x1c, ++0xef, 0x54, 0x68, 0xf7, 0x85, 0x9c, 0xe4, 0x51, ++0x6f, 0x06, 0xaf, 0x81, 0xdb, 0x2a, 0x7b, 0x7b, ++0x6f, 0xa8, 0x9c, 0x67, 0xd8, 0xcb, 0xc9, 0x91, ++0x40, 0x00, 0xae, 0xd9, 0xa1, 0x9f, 0xdd, 0xa6, ++0x43, 0x0e, 0x28, 0x7b, 0xaa, 0x1b, 0xe9, 0x84, ++0xdb, 0x76, 0x64, 0x42, 0x70, 0xc9, 0xc0, 0xeb, ++0xae, 0x84, 0x11, 0x16, 0x68, 0x4e, 0x84, 0x9e, ++0x7e, 0x92, 0x36, 0xee, 0x1c, 0x3b, 0x08, 0x63, ++0xeb, 0x79, 0x84, 0x15, 0x08, 0x9d, 0xaf, 0xc8, ++0x9a, 0xc7, 0x34, 0xd3, 0x94, 0x4b, 0xd1, 0x28, ++0x97, 0xbe, 0xd1, 0x45, 0x75, 0xdc, 0x35, 0x62, ++0xac, 0x1d, 0x1f, 0xb7, 0xb7, 0x15, 0x87, 0xc8, ++0x98, 0xc0, 0x24, 0x31, 0x56, 0x8d, 0xed, 0xdb, ++0x06, 0xc6, 0x46, 0xbf, 0x4b, 0x6d, 0xa6, 0xd5, ++0xab, 0xcc, 0x60, 0xfc, 0xe5, 0x37, 0xb6, 0x53, ++0x7d, 0x58, 0x95, 0xa9, 0x56, 0xc7, 0xf7, 0xee, ++0xc3, 0xa0, 0x76, 0xf7, 0x65, 0x4d, 0x53, 0xfa, ++0xff, 0x5f, 0x76, 0x33, 0x5a, 0x08, 0xfa, 0x86, ++0x92, 0x5a, 0x13, 0xfa, 0x1a, 0xfc, 0xf2, 0x1b, ++0x8c, 0x7f, 0x42, 0x6d, 0xb7, 0x7e, 0xb7, 0xb4, ++0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, ++0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, ++0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, ++0x45, 0x4e, 0xc3 diff --git a/recipes-kernel/linux/files/0002-wifi-cfg80211-fix-certs-build-to-not-depend-on-file-.patch b/recipes-kernel/linux/files/0002-wifi-cfg80211-fix-certs-build-to-not-depend-on-file-.patch new file mode 100644 index 00000000..ecd53bfe --- /dev/null +++ b/recipes-kernel/linux/files/0002-wifi-cfg80211-fix-certs-build-to-not-depend-on-file-.patch @@ -0,0 +1,34 @@ +From 14b5aacbb831f4bb411381d885cb87d7c455a0dc Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Thu, 14 Dec 2023 09:08:16 +0100 +Subject: [PATCH] wifi: cfg80211: fix certs build to not depend on file order + +commit 3c2a8ebe3fe66a5f77d4c164a0bea8e2ff37b455 upstream. + +The file for the new certificate (Chen-Yu Tsai's) didn't +end with a comma, so depending on the file order in the +build rule, we'd end up with invalid C when concatenating +the (now two) certificates. Fix that. + +Cc: stable@vger.kernel.org +Reported-by: Biju Das +Reported-by: Naresh Kamboju +Fixes: fb768d3b13ff ("wifi: cfg80211: Add my certificate") +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- +Upstream-Status: Backport [4ccca0017c4e wifi: cfg80211: fix certs build to not depend on file order] + + net/wireless/certs/wens.hex | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/wireless/certs/wens.hex b/net/wireless/certs/wens.hex +index ccd5b5dc3360..0d50369bede9 100644 +--- a/net/wireless/certs/wens.hex ++++ b/net/wireless/certs/wens.hex +@@ -84,4 +84,4 @@ + 0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, + 0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, + 0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, +-0x45, 0x4e, 0xc3 ++0x45, 0x4e, 0xc3, diff --git a/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/recipes-kernel/linux/linux-raspberrypi_5.15.bb index 73a5fc71..6e000350 100644 --- a/recipes-kernel/linux/linux-raspberrypi_5.15.bb +++ b/recipes-kernel/linux/linux-raspberrypi_5.15.bb @@ -10,6 +10,8 @@ KMETA = "kernel-meta" SRC_URI = " \ git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \ + file://0001-wifi-cfg80211-Add-my-certificate.patch \ + file://0002-wifi-cfg80211-fix-certs-build-to-not-depend-on-file-.patch \ file://powersave.cfg \ file://android-drivers.cfg \ " diff --git a/recipes-kernel/linux/linux-raspberrypi_6.1.bb b/recipes-kernel/linux/linux-raspberrypi_6.1.bb index 0a838ae7..5731a816 100644 --- a/recipes-kernel/linux/linux-raspberrypi_6.1.bb +++ b/recipes-kernel/linux/linux-raspberrypi_6.1.bb @@ -1,9 +1,9 @@ -LINUX_VERSION ?= "6.1.61" +LINUX_VERSION ?= "6.1.77" LINUX_RPI_BRANCH ?= "rpi-6.1.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1" -SRCREV_machine = "f364e0eb8f973e1aa24a3c451d18e84247a8efcd" -SRCREV_meta = "29ec3dc6f4f59b731badcc864b212767023cc40c" +SRCREV_machine = "77fc1fbcb5c013329af9583307dd1ff3cd4752aa" +SRCREV_meta = "43d1723dbe0ce7b341cf32feeb35ecbe6b0ce29a" KMETA = "kernel-meta"