diff --git a/sys-kernel/libre-kernel/Manifest b/sys-kernel/libre-kernel/Manifest index ae6f0c4..c57b443 100644 --- a/sys-kernel/libre-kernel/Manifest +++ b/sys-kernel/libre-kernel/Manifest @@ -1,9 +1,7 @@ DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e121acf4a95d130866f37ac0113a8697df1996c13bbf65e14f4a5703f7bb3f4dd3ebfb29e258ca358d191c0580a7f8e61fbf7c0c SHA512 3fc49566b23ef50590a3b9f90eb99558c9e37847259e0defdfb0ca036c37b7f45c4989d58787b8488c67ea031114173319346c1c17799680ebfdc581ae7e4588 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041 -DIST genpatches-6.12-20.base.tar.xz 1202448 BLAKE2B 29d739ca47c15374e039c5ca76017dca7ff4da352bd161127c0fa1d2d9faae002a99d284b3dcc94cc6357e3df9f43d4637fe172948709a2a6829df836edae0d3 SHA512 47e5e47d11ce176d3cb22e51641b2987d8b3aff62fc12546f3336c939108da5fbd66f1d2dee0b0d932b896666e504b8449bc988c34bca8620e3b185322db0106 -DIST genpatches-6.12-20.extras.tar.xz 4056 BLAKE2B d4c33c87e387de3b7bda99a9b58c8b8284129e945ceebe7b3972038bfcf9ccd0b67c0136f82ca1178ea60e12861e3bec4b26bf7b3c91c36fe9ecb0520930f1c9 SHA512 af5c01cb6e4154c20cc5d3cc84c90aab8e43b616e04da2c08b0e4e86b62c9a840a02dea467bc7eba39f699457c37a8038c5e81991bc3234dbfa5cba37bdab4e2 -DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d -DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399 +DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B 818643d9f5ec5f4edc3cf2360f75bcf213ca99846e2bb96721933fa1785624aef8ae5c3ecd3af4f2e13e0cc44fed86e2d1cad8b53ed45acddcb9d91fc483c20b SHA512 746f4b5523fc3ebb3c59211c7fb4a80714e6068ab769a001c044ad300621b5a4a7a0b0b06c5a689bbf382cb27098f36725962bafb4d6e4489ab44cdb19b6ed1d +DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B 2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1 SHA512 d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92 DIST genpatches-6.6-82.base.tar.xz 4255664 BLAKE2B 812e8caabf0a73991504a728a8abc5a61a0b51ac073be06bf18b87e6de0291fc568ce4dd2dea506ce0db648669f2341843e608d0184cfb4dc233d71d57518137 SHA512 5fe4f880baab09d51b2fb36f3501298ecdfa382f09699f64c887ac39d84788ed4c27a9f7fd1d5766dbbdf8135956f0f81b4adc09c2558682f8f7dfb1ac7ce6ca DIST genpatches-6.6-82.extras.tar.xz 4056 BLAKE2B e2f0c26e84f51fedb421fdbaf2afad1ee5c456f3b700ae9232ed8581ba73db2e5de69f685651d8bd7e9ee547a34712367ce7515facb33c7cf4c707c5e10e6883 SHA512 36c6830ed793159fc09139b85f87abfa7c195726be667076be5c2fbebeeb75dd508db52073395b9bca3a53c3496cc3c49e59d9717db8ce53a301f17ae9deee24 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6 @@ -14,9 +12,7 @@ DIST kernel-x86_64-fedora.config.6.12.8-gentoo 256210 BLAKE2B f14f7de8ae57356182 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c DIST linux-libre-5.15.165-gnu.tar.xz 119931308 BLAKE2B 312d6a2091f48fe013d9207c749ff6fd850565e1a77b8bd437167fe8b7863f2b4c39b4ee43bd00614c3b8229a6de2ae671863e1a258e8248d8dc19e5333e309d SHA512 475063e224e3fc3c9bcc64b79dc5d3e41159bbf144c7cd1dd7b024c90996d788718b1ebceb19412b357cb6b8976f7135ad202a2b36197dbb7a311c4b1be9997b DIST linux-libre-5.15.165-gnu.tar.xz.sign 195 BLAKE2B 69c860aeb656c3207d31209ff71c8d75aab95842611500aec2c59ab222ff7e2c27535cbe952da02edfa425afb6c18cd4a29668e0a46a40ee295bfad856e26287 SHA512 7418b5312cf8a2c5f0ab00f1a3906858256a1d172adfc493d95f7e1f06ece7efa00c9bc71b9cccf447bbb6b76c42ee8201044d46fa028b49be47edcc05983c77 -DIST linux-libre-6.12.16-gnu.tar.xz 138877984 BLAKE2B 04988d6c79603a21898569c8d918fcdd6441bef8a3a635c00f7da051bfa920ab011ff48f0612a7c70c29757b35efc7ff604e7e37fcfe08ae33baf41d1147a17a SHA512 553fd02c7fc2f95415c615d2c1b5f6d37da38e867682535bddb313d07ea99a78961d2c2bd90b0c2245460eac35ffaece52d3deb8262c2100499e369a20d16059 -DIST linux-libre-6.12.16-gnu.tar.xz.sign 195 BLAKE2B d9bbb9124b68ec5fbf10ddb007044f6a2cf1f41bbd227a2d9f67c42873382d027a27aae4f94a59cee81092c5ffc18b47040f6fee8a91f1f768660ddfd1197f55 SHA512 b9374a63158cb33545be579a45f608453357cb0e076aba26eb6d1f48f964666d9c0c8173830eddc5df88b75180eccf44e8ce73a699904af41fa0e3ff92090cf1 -DIST linux-libre-6.6.67-gnu.tar.xz 132034108 BLAKE2B 72dbe81f50cbe35544804e3866f8bcb3cbded65b92f38d860e0399abbd846c0b5fcf0411497af00026863662dff8439b1b67c644eb08811dbafd1ac00dd3a9d6 SHA512 854f3efd25802cbc5bdfb4601859ad67ccb4981c4364b6d052d7700da5a70c9605cff4d7a305ac636f71016043e88ed2c1b267af93bbd437670038e8cb6212fa -DIST linux-libre-6.6.67-gnu.tar.xz.sign 195 BLAKE2B 3e80856409684fb5df893c05b71ee9849c73f4177b86f004c6569233721e1600c31852b06fbff48a708648a73e2aadd176cb372293e65b4c9ba5c8390a01582b SHA512 50d8e161217709cdfc5fb2418c74d2302614e6dedc9f104ab2d3147cb355b318af0a2bef63bb3013c22a680d68a537ea6bbfd7db5a11078c5fd212bccb4c639e +DIST linux-libre-6.12.21-gnu.tar.xz 138909484 BLAKE2B 536116f350e38f7395611726be26fae285009c60b318a53b58c5cd6970f7f0bfb4378a79a14865f7f6341cdc0b772b4440fde8de720a6660388ec9c437dd633a SHA512 2576d77c994f826c12fc77052ff09765bcb3f386b2aa6ceb86a902afde3dd632e9714b09255b4e75e7de9e2ba83175153c26b71447f7027f4deeec19747554f9 +DIST linux-libre-6.12.21-gnu.tar.xz.sign 195 BLAKE2B 3d0272aace3d09aee0fb0b53a6d3aadb68fbcbb299933436d4aa92d3c0c3695394a8051f78ad713a9ce543126ed774ed14f20202507586bedfa3d8d0c2e246c3 SHA512 bfe25fd7ea89ff1c449902c4fb86fcf76e4cfb591604fb2ed8e629227fb851f93eaeebe58b277a69c757ed5ee5afca708d0c6a713b80289ea9fa81a3104808e7 DIST linux-libre-6.6.74-gnu.tar.xz 132058092 BLAKE2B e9163014d918b9fad67577d4fe045fbff67de8506539f61d87a0929dd1a1766eb6113231e90d0efb2266eb3aa5750d6cf9f15da4f005e1e375ffeff41438fbce SHA512 526ede433780ba24e676040634d2e9539787834c4f0b6f85b50aed71acc0f7ad2d17318714fb7dd38b793bb03b10bc13f3a1132705eca2b5034c710385eb9865 DIST linux-libre-6.6.74-gnu.tar.xz.sign 195 BLAKE2B 17034fdb58481b2d47305f2099e7a521fec18327654ad9b0ef72c23cf02e2e8eb7af0973226406e43a21e0c36c7802f740af467b2f37765fe3301e6ec6df25ce SHA512 f375c5fe63956ea07231ce8d8fc2abb217cbce2439c22a42a48fa91f710b82f80ab71edd83ad0cbfa1bb1d5485614a6da207b8b58e43f7ac1847d3eaa905c4ec diff --git a/sys-kernel/libre-kernel/libre-kernel-6.12.16.ebuild b/sys-kernel/libre-kernel/libre-kernel-6.12.21.ebuild similarity index 92% rename from sys-kernel/libre-kernel/libre-kernel-6.12.16.ebuild rename to sys-kernel/libre-kernel/libre-kernel-6.12.21.ebuild index 4d76d59..3248493 100644 --- a/sys-kernel/libre-kernel/libre-kernel-6.12.16.ebuild +++ b/sys-kernel/libre-kernel/libre-kernel-6.12.21.ebuild @@ -47,7 +47,9 @@ PDEPEND=" >=virtual/dist-kernel-${PV} " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc +ERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc +KBUILD_CFLAGS="${KBUILD_CFLAGS} -Wno-error=format-extra-args" +KBUILD_CPPFLAGS="${KBUILD_CPPFLAGS} -Wno-error=format-extra-args" pkg_pretend() { if has_version -d sys-kernel/linux-firmware[redistributable]; then @@ -135,9 +137,14 @@ src_prepare() { echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + # Required to suppress errors from deblobbing in the DRM module, + # that only started showing up in kernel 6.12+. + echo "CONFIG_DRM_WERROR=n" >> "${T}/no-warnings.config" || die + local merge_configs=( "${T}"/version.config "${dist_conf_path}"/base.config + "${T}"/no-warnings.config ) use debug || merge_configs+=( "${dist_conf_path}"/no-debug.config diff --git a/sys-kernel/libre-kernel/libre-kernel-6.6.67.ebuild b/sys-kernel/libre-kernel/libre-kernel-6.6.67.ebuild deleted file mode 100644 index 2d6bda9..0000000 --- a/sys-kernel/libre-kernel/libre-kernel-6.6.67.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2020-2024 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" - -GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 8 )) -CONFIG_VER=6.6.12-gentoo -GENTOO_CONFIG_VER=g14 - -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://linux-libre.fsfla.org/pub/linux-libre/releases/${BASE_VER}-gnu/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 - https://linux-libre.fsfla.org/pub/linux-libre/releases/${BASE_VER}-gnu/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 - # Fiters out the kernel incremental version upgrade patches, - # leaving only the Gentoo bug fix/functionality changes. The - # regex removes any patches starting with 10XX to 14XX. - MY_PATCHES=$(find "${WORKDIR}"/*.patch -printf "%f\n" | grep -v -E -e '^1[01234][[:digit:]][[:digit:]]_.+.patch') - PATCHES=$(echo "$MY_PATCHES" | sed 's|^|'"${WORKDIR}/"'|g') - else - # If no patches are to be applied, apply only the config changes - # for a Gentoo installation, as this does not change any actual - # Kernel functionality. - 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 - ;; - *) - 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[@]}" -}