[gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/, sys-kernel/raspberrypi-sources/files/

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/, sys-kernel/raspberrypi-sources/files/

[Sam James]

commit:     1bfd36623c00d5d6c4b234b3c69b21a0826807f8
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Jun  9 01:40:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 03:53:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfd3662

sys-kernel/raspberrypi-sources: Fix patch application

See: https://github.com/gentoo/gentoo/pull/31041#issuecomment-1583677573
Fixes: 2e0f585e9ce72744abbd44df02152ab9eadd9f53
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31361
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/raspberrypi-sources-6.1.21-gentoo-kconfig.patch   | 13 +++++++++++++
 .../raspberrypi-sources-6.1.21_p20230405.ebuild             |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/sys-kernel/raspberrypi-sources/files/raspberrypi-sources-6.1.21-gentoo-kconfig.patch b/sys-kernel/raspberrypi-sources/files/raspberrypi-sources-6.1.21-gentoo-kconfig.patch
new file mode 100644
index 000000000000..941501ef35aa
--- /dev/null
+++ b/sys-kernel/raspberrypi-sources/files/raspberrypi-sources-6.1.21-gentoo-kconfig.patch
@@ -0,0 +1,13 @@
+--- a/drivers/base/firmware_loader/Kconfig
++++ b/drivers/base/firmware_loader/Kconfig
+@@ -75,6 +75,7 @@ config EXTRA_FIRMWARE_DIR
+ 
+ config FW_LOADER_USER_HELPER
+ 	bool "Enable the firmware sysfs fallback mechanism"
++	depends on !GENTOO_LINUX_INIT_SYSTEMD
+ 	select FW_LOADER_SYSFS
+ 	select FW_LOADER_PAGED_BUF
+ 	help
+-- 
+2.41.0
+

diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild
index c64869addb18..49c6604e6b33 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild
@@ -29,11 +29,12 @@ SRC_URI="
 
 KEYWORDS="~arm ~arm64"
 
-PATCHES=("${FILESDIR}"/${PN}-5.15.32-gentoo-kconfig.patch)
+PATCHES=("${FILESDIR}"/${PN}-6.1.21-gentoo-kconfig.patch)
 
 UNIPATCH_EXCLUDE="
 	10*
 	15*
+	1700
 	2000
 	29*
 	3000