From a8c0951e7daa766ebc5fa62b249d0a6b11aeef6d Mon Sep 17 00:00:00 2001 From: projectmoon Date: Sun, 5 Mar 2023 08:58:00 +0000 Subject: [PATCH] sys-kernel/libre-kernel: add gentoo patches, fix config version. --- sys-kernel/libre-kernel/Manifest | 4 + .../libre-kernel-6.1.12-r1.ebuild | 170 ++++++++++++++++++ sys-kernel/libre-kernel/metadata.xml | 3 +- 3 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 sys-kernel/libre-kernel/libre-kernel-6.1.12-r1.ebuild diff --git a/sys-kernel/libre-kernel/Manifest b/sys-kernel/libre-kernel/Manifest index 52e76b7..9147d7d 100644 --- a/sys-kernel/libre-kernel/Manifest +++ b/sys-kernel/libre-kernel/Manifest @@ -1,5 +1,9 @@ +DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0 +DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e +DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f +DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c DIST linux-libre-5.15.75-gnu.tar.xz 119675216 BLAKE2B 7b5658c5516062eeba00fdd02e20c135b2d693a48b2d73afa98bd3f0e58be67213f722a2707c43db48db75d8f015ebd824b19b74c3b9193c00af8dd58f21ea23 SHA512 c5fbb755500692a12e859218b0e5a3c42336be073b234b543a865d30f95af0854634b9a7454fb15c08c3635cec44af7f5a24c54945345fb6bbafb0805fa808c8 DIST linux-libre-5.15.77-gnu.tar.xz 119696132 BLAKE2B c4a16a82a886c82954480f6063693edde3202e2c4981f40692c603d9917f5b39825b4b9c097c462ea42f3ae524a0aa5018fcd18c93ca908493e2aad6d18e5f7d SHA512 1b7309dd89ffc365722cdf2e0c0a8ed19ff769e22a90fd3a8b3fadc6d6a6dc442bf203c7cef075631b94d560144b3167a2f430fb27bf9c49946498917315aeb9 DIST linux-libre-5.15.77-gnu.tar.xz.sign 195 BLAKE2B ba41ae8c34c9f53a9a9b7bb8ec67c990c4a30168bcab79b7deb15b99615aa257f4dd48a7ff59db40b6d32ce87b155aa5a56eb663c999f1c91d04441bc8db39aa SHA512 988464375ee5f41fcac07f0ecaa1194e9332cfa1f134f6b1427ddfadf31bbd71f3d51efa8ccc87a927011bc5d9e95791cdf0399a9464b8e5d4f85e83acab8e3c diff --git a/sys-kernel/libre-kernel/libre-kernel-6.1.12-r1.ebuild b/sys-kernel/libre-kernel/libre-kernel-6.1.12-r1.ebuild new file mode 100644 index 0000000..1670736 --- /dev/null +++ b/sys-kernel/libre-kernel/libre-kernel-6.1.12-r1.ebuild @@ -0,0 +1,170 @@ +# Copyright 2020-2023 Gentoo Authors, projectmoon +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build verify-sig + +BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)" +RESTRICT="mirror" + +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g6 + +DESCRIPTION="GNU Linux-libre kernel built from upstream sources" +HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/" +SRC_URI+=" + https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign + ) + amd64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) +" + +# Workdir is named linux-PV. +MY_P=linux-${PV} +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="amd64" +IUSE="debug +gentoo" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-linux-libre ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc + +pkg_pretend() { + if has_version -d sys-kernel/linux-firmware[redistributable]; then + ewarn "sys-kernel/linux-firmware was found installed on your system," + ewarn "but it is configured to install non-Free firmware files." + ewarn "The non-Free firmware files may be required for some hardware" + ewarn "work. The Linux-libre kernel cannot load non-Free firmware." + ewarn "To install only the Free firmware, set the -redistributable" + ewarn "USE flag on sys-kernel/linux-firmware." + + if use initramfs; then + elog + elog "If you decide to change or remove linux-firmware later, you" + elog "can rebuild the initramfs via issuing a command equivalent to:" + elog + elog " emerge --config ${CATEGORY}/${PN}:${SLOT}" + fi + else + if ! has_version -d sys-kernel/linux-firmware; then + ewarn "sys-kernel/linux-firmware[-redistributable] not found installed" + ewarn "on your system. This package provides various firmware files that" + ewarn "may be needed for your hardware to work. If in doubt, it is recommended" + ewarn "to pause or abort the build process and install it before" + ewarn "resuming." + + if use initramfs; then + elog + elog "If you decide to install linux-firmware later, you can rebuild" + elog "the initramfs via issuing a command equivalent to:" + elog + elog " emerge --config ${CATEGORY}/${PN}:${SLOT}" + fi + fi + fi +} + +src_unpack() { + if use verify-sig; then + FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz + SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign + verify-sig_verify_detached $FILE $SIGFILE + fi + + default +} + +src_prepare() { + local PATCHES + if use gentoo; then + PATCHES=" + ${WORKDIR}/1500_XATTR_USER_PREFIX.patch + ${WORKDIR}/1510_fs-enable-link-security-restrictions-by-default.patch + ${WORKDIR}/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch + ${WORKDIR}/2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch + ${WORKDIR}/2910_bfp-mark-get-entry-ip-as--maybe-unused.patch + ${WORKDIR}/2920_sign-file-patch-for-libressl.patch + ${WORKDIR}/2930_gcc-plugins-Reorg-gimple-incs-for-gcc-13.patch + ${WORKDIR}/2940_gcc-plugins-drop-std-gnu-plus-plus-to-fix-GCC-13-build.patch + ${WORKDIR}/3000_Support-printing-firmware-info.patch + ${WORKDIR}/4567_distro-Gentoo-Kconfig.patch + " + else + PATCHES="${WORKDIR}/4567_distro-Gentoo-Kconfig.patch" + fi + + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + hppa) + return + ;; + ppc) + # assume powermac/powerbook defconfig + # we still package.use.force savedconfig + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION' + local myversion="-gnu-dist" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/libre-kernel/metadata.xml b/sys-kernel/libre-kernel/metadata.xml index 4f5aa09..67e2e7b 100644 --- a/sys-kernel/libre-kernel/metadata.xml +++ b/sys-kernel/libre-kernel/metadata.xml @@ -6,6 +6,7 @@ projectmoon - Build initramfs along with the kernel. + Build initramfs along with the kernel. + Apply selected patches from the Gentoo kernel patchset.