summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViolet Purcell <vimproved@inventati.org>2023-06-09 01:40:50 +0000
committerSam James <sam@gentoo.org>2023-06-09 04:53:20 +0100
commit1bfd36623c00d5d6c4b234b3c69b21a0826807f8 (patch)
tree3293cfbd01190589e0ec89834592e65da4a89300 /sys-kernel/raspberrypi-sources
parentapp-editors/vim-core: drop 9.0.1157 (diff)
downloadgentoo-1bfd36623c00d5d6c4b234b3c69b21a0826807f8.tar.gz
gentoo-1bfd36623c00d5d6c4b234b3c69b21a0826807f8.tar.bz2
gentoo-1bfd36623c00d5d6c4b234b3c69b21a0826807f8.zip
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@inventati.org> Closes: https://github.com/gentoo/gentoo/pull/31361 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-kernel/raspberrypi-sources')
-rw-r--r--sys-kernel/raspberrypi-sources/files/raspberrypi-sources-6.1.21-gentoo-kconfig.patch13
-rw-r--r--sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild3
2 files changed, 15 insertions, 1 deletions
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