commit:     e7b718ced4b6731c9b273ec13fd3b1450a5e4a1e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 22:03:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 22:06:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b718ce

sys-kernel/linux-headers: add 5.18 patch for lirc build breakage

Closes: https://bugs.gentoo.org/847886
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/linux-headers/Manifest                  |  1 +
 .../linux-headers/linux-headers-5.18-r1.ebuild     | 62 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sys-kernel/linux-headers/Manifest 
b/sys-kernel/linux-headers/Manifest
index 7c4ceee6803f..09d45895a920 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -8,6 +8,7 @@ DIST gentoo-headers-5.15-1.tar.xz 1496 BLAKE2B 
9d88ecc517e226580ba43cba1b5cc6223
 DIST gentoo-headers-5.16-0.tar.xz 1508 BLAKE2B 
8a98768f3f33ca2fa5f61dbcea39388f7faf13033dc4f64dab989b0ecf06a193b22f3e692ad4aa882e4ae1428daae127f0562c7e3416b381d6825beff239a71d
 SHA512 
e48e50ccd79ef79d59b986931dd65881e8a72d0531ff5043897c862795acb54fd3c3c0667eaca572cebd835a8c3196b01348f3865855d06fd409c185970855ef
 DIST gentoo-headers-5.17-0.tar.xz 1496 BLAKE2B 
562923dd1fdb1fc8afc97196cf8ada2345170d91a4166722b474fc15484840bfcbb31d33b1a71d98fec7684f0c01660f3437dabca541dfbfe802591c81bea2f9
 SHA512 
27372682de83ba04aebcaa5d25aea8cfdf1ac51166b155c7bcd5e03ef2722f7cc2d4761d519c325267bfd79e69996d1a9647f0f24b4059d7771bc1f8e94a027e
 DIST gentoo-headers-5.18-0.tar.xz 1172 BLAKE2B 
136ea2989239f776ec0873c87a9d53f7f579f8c7341a80543912161073c22e0af275141a7e935e7af03b8fd82be19f88538f8a4b2963e7dc31cc0a4b2324fe2e
 SHA512 
f0df48f3926eda93da8cf637e377ce5c3b06a55744870224dd4968ff5fac9a68f79ce62e0c1635fcc02646b9ff94672678f241cbe6048161c4784a1ec48f402e
+DIST gentoo-headers-5.18-1.tar.xz 2064 BLAKE2B 
a988b180ed5d885b62f1913b3f43243f77be5dcca03c8df83748ceb71c79d5359785cc64811fea251aa055b9193bd436184f66b8e773abf028722424977ee6b8
 SHA512 
f7c9279115e836c1bc0f065fdae7d3a2260ec82eaa729f395c96bed2bf53f2ddc40325a2d116b39337e00d841fbc19d072f48475bab382c63fa89331b226aff6
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 
0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8
 SHA512 
b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 
837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe
 SHA512 
6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B 
e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a
 SHA512 
2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a

diff --git a/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild 
b/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild
new file mode 100644
index 000000000000..4f5cb7cb58ca
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 
loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 
score sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+PATCH_DEV="sam"
+LOONGARCH_PATCH_VER="20220523"
+LOONGARCH_PATCH_DEV="xen0n"
+SRC_URI="${KERNEL_URI}
+       
${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+       experimental-loong? ( 
${LOONGARCH_PATCH_VER:+https://dev.gentoo.org/~${LOONGARCH_PATCH_DEV}/distfiles/linux-loongarch-next-on-${PATCH_PV}-${LOONGARCH_PATCH_VER}.tar.xz}
 )"
+S="${WORKDIR}/linux-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE+=" experimental-loong"
+
+BDEPEND="app-arch/xz-utils
+       dev-lang/perl"
+
+# bug #816762
+RESTRICT="test"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+       # avoid kernel-2_src_unpack
+       default
+}
+
+src_prepare() {
+       # TODO: May need forward porting to newer versions
+       use elibc_musl && PATCHES+=(
+               
"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+               "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+       )
+
+       use experimental-loong && PATCHES+=(
+               "${WORKDIR}"/loongarch-next-on-${PATCH_PV}
+       )
+
+       # avoid kernel-2_src_prepare
+       default
+}
+
+src_test() {
+       emake headers_check ${xmakeopts}
+}
+
+src_install() {
+       kernel-2_src_install
+
+       find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+       # delete empty directories
+       find "${ED}" -empty -type d -delete || die
+}

Reply via email to