From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A48641581C1 for ; Mon, 15 Jul 2024 13:32:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 614492BC07D; Mon, 15 Jul 2024 13:32:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 403F52BC076 for ; Mon, 15 Jul 2024 13:32:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7AC2133FECD for ; Mon, 15 Jul 2024 13:32:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AFB051E2A for ; Mon, 15 Jul 2024 13:32:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1721050357.e2310bf82076c003cb19ffc0db977418e6b98123.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/Manifest sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.40.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e2310bf82076c003cb19ffc0db977418e6b98123 X-VCS-Branch: master Date: Mon, 15 Jul 2024 13:32:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a18327a6-58cd-47f5-8f71-6cc2dfce9381 X-Archives-Hash: decece55a3c103cb013bf499a0bec951 commit: e2310bf82076c003cb19ffc0db977418e6b98123 Author: Michał Górny gentoo org> AuthorDate: Mon Jul 15 13:22:31 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 15 13:32:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2310bf8 sys-kernel/gentoo-kernel-bin: Bump to 6.6.40 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.40.ebuild | 164 +++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 604a47d35591..ad9b96635a59 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -20,6 +20,8 @@ DIST genpatches-6.6-45.base.tar.xz 2573196 BLAKE2B a6ff1fdc5c661f28d45e8297a325d DIST genpatches-6.6-45.extras.tar.xz 4048 BLAKE2B dd86fb162ed81abf47e1fe88e238d67d557294b9502dedf9d3d405e52e014ba9852ea48ef7ab62a255996cc0a3506599b07c76a20b217764c31e2efa0a636872 SHA512 8cd9e82c2c33eb625c86181e47cdf9be5a3246db140174792cb38c68e44a39103bd42964560d8af659a9f44117fd40b804927a544c32780fcbb7a023cba9bfb3 DIST genpatches-6.6-46.base.tar.xz 2606596 BLAKE2B f8b284a798b7f734ae39e8ac349598f8a7ac0902dd66264c1de754fc43c275e8e785097f9ad479e63cab0705bc9c8f917b91fdb4acf196fc9e032675d2dd72d7 SHA512 d7b62bb4c570b5fcccbdb27ab0da65c2309038d3ac31ccbf48df0ac32ef057b52046ad502ba02ec6c0cb4f3ac2e6ac0d4f97ced6adb85c96a89f31881a34b848 DIST genpatches-6.6-46.extras.tar.xz 4048 BLAKE2B 235f71efef27116556f2d7b6e7bd8c9ffcbfbc798fe87a59d69f672094830b13fa0e6ceb900eacc5ca250e92cfb410998af70939df9317c76f6291e2446020c9 SHA512 10f0f98d2c5a63371f8225e677f3e12a2e4f54b892dd6f64f3ed0c7cb8956671dc4bced0128d66bc0f2e61e1cb3c590a9d43270237d8457c2825cff1b8e236e1 +DIST genpatches-6.6-47.base.tar.xz 2606912 BLAKE2B 9ab2547e43d9d17ce67824dbb5eacfd25d1c0ea314c440d925b53a89362f47d9d1ffe853b12bb3fcd3761745306914678b33261e56c4df2ebfe3ce65035ccc61 SHA512 109d430209ab4f02428ccd6357047742da383791a3ada574ddfb6a25f28dd0df1b0a376a895e0c624a7da4d34519ba895992c7cf7e3c83c03f6f7f8cb9ed787f +DIST genpatches-6.6-47.extras.tar.xz 4052 BLAKE2B 8cb744f165c0ebb88d4a8eb097c6f45c550d6eb984fa06902980c7276863fb6b5b7c1e760a9f6904f58178977f7e10a12626a20f83df4a2121379a26d1182ca7 SHA512 9f7c53624e9ca9bad3f36a114b3da3aa5d3c1a7c92bfb85d862814900303a58d2a6280a9ab9a0c3f342930a1354b579e94cf5eecbb379d31c7666925c1ae9cfd DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e @@ -68,6 +70,10 @@ DIST gentoo-kernel-6.6.39-1.amd64.gpkg.tar 147240960 BLAKE2B 42e7bf39bf5fec8c718 DIST gentoo-kernel-6.6.39-1.arm64.gpkg.tar 119244800 BLAKE2B 898418ba06e3e4f8094b365a1d013949aaadd7582e9d0c7bbb96137ba42049de1fd056c851584a7591178c340c2ef02a4b1f8e5dcb3d857dda21c70f1c1c6faf SHA512 523c969b0c80e6bcfac3bfe95b0acfb0815a253b9f8b94424b3725ee671b9720b341ca89226175a7bfc4d5430d14cb19dc8d28916d9bec9970147804579f4423 DIST gentoo-kernel-6.6.39-1.ppc64le.gpkg.tar 64235520 BLAKE2B 715d8565e96849ac09f343f5487b8f8bb9e7124cbb5866f1fc8624f05883d010269d09dec6ceda4ec20065f24026cc6f0cdb45b3865bc75aedac89f8507ce8ca SHA512 ca1b417f75de051365603389326f4045835e12773011bc464e99b103ae5ec62833738bf70750ccc1d4acab8f9c20f3a978419aef9a8be6cd95bb02b306a91d06 DIST gentoo-kernel-6.6.39-1.x86.gpkg.tar 68270080 BLAKE2B ec1e4f4aceee240a8dfa5e262b0de34913a96125dbc6bb6a1239ddce3a9e540fa56d26ce831824532ed02041825851fcefd2016d121797bf721bb2daea87b720 SHA512 3c40bad5b01d529cf3d45d18a0e3b077c16c677a92caf7c1d520ba801ef84fdf1875f55bf0d9237f7cb99e70f79b2d92b6e76b3acbc325bd3653a8f2b14e5638 +DIST gentoo-kernel-6.6.40-1.amd64.gpkg.tar 147456000 BLAKE2B f3d0ae2736520819fbbe77f54609945fd221cafc26dc1e5f092db3a50e3ec13c4a9a04d9ed569994fda0109ec3a7b999f0d2c900e8f517adfec8460879d338b1 SHA512 68ea7572dffbc008d3548ea5e9c1b0b98a34835575fe66ef89e8e0285235300fa97867ea88d251cf0e7b7242caa81f8119b8b5a3c18fe3cf0fe8126ef08b1532 +DIST gentoo-kernel-6.6.40-1.arm64.gpkg.tar 119439360 BLAKE2B 44c090c62335cf33b40ca85fbdd8843949bf439813fba6a27347f55191ed267148d7939ab3c4e5e9d8e9235a0a16984956dcc7a1fb4dcb94b3324f77f4868b56 SHA512 3ff7488a33ede797524b2dedc1cb07dbd9de43d41d8d383256555a7705a23a91254d70499f92f3caa423e4afba4fea13c1656f78c8585004ffae672c57643627 +DIST gentoo-kernel-6.6.40-1.ppc64le.gpkg.tar 64245760 BLAKE2B 55604506b9edf6307e9334f6f17244a29779eafd553a09af4afc4ba34c6ab9c75bed35f56e2f8e33af6cbd638087bc3787117c0c9aeb9d6fb483498ad6e64e16 SHA512 43ad773b3f0de197e5925685d05e4680ac84019e2dae1d3090da5f73f00799371c78d3ea6c8b48cf659eb1eaf3ab9a187ecf46e0a1938760e95425cc7e3a6607 +DIST gentoo-kernel-6.6.40-1.x86.gpkg.tar 68249600 BLAKE2B ef235d7f3f12b93e25951483f764b02e015bc1a8d50976cc256f7575a168d0a641ff00b7daf8e9dd7f50d3d5b9ea85469dbdff9646bab9747afdd44f675321e5 SHA512 2607b6610f9299774b4cdb08518ccb7808637964d49da2801ea01aebd7d6f7356415b0d93a4a51a3535a0d9bda5782363833ff998083fc7c59fedaa867623285 DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B f54c76780fdec033d8ce5b419dfb8cb1d9fd36af80791532ec7d6bf5ac4472f1fff6f52151aca93cebf3f99ba569b990a850403a99b56d427b6a48a32350b735 SHA512 ddf33e3b2d19a1beadbf6e578a70f363e2fac965dc19c2fcaf4a73b768f27611c86f1c3ec2a472fe37376fcdfece48a53846ff3ca554c97d4eb9686055c1a758 DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B 7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7 SHA512 b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B 782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a SHA512 923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.40.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.40.ebuild new file mode 100644 index 000000000000..e0e46cd48882 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.40.ebuild @@ -0,0 +1,164 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_EFI_ZBOOT=1 +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_SECUREBOOT=1 + +inherit kernel-install toolchain-funcs unpacker + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 )) +BINPKG=${PF/-bin}-1 + +DESCRIPTION="Pre-built Linux kernel with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.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 + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.amd64.gpkg.tar + ) + arm64? ( + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.arm64.gpkg.tar + ) + ppc64? ( + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.ppc64le.gpkg.tar + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.x86.gpkg.tar + ) +" +S=${WORKDIR} + +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + virtual/libelf + app-alternatives/yacc +" + +QA_PREBUILT='*' + +KV_LOCALVERSION='-gentoo-dist' +KPV=${PV}${KV_LOCALVERSION} + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + cd "${MY_P}" || die + default +} + +src_configure() { + # force ld.bfd if we can find it easily + local LD="$(tc-getLD)" + if type -P "${LD}.bfd" &>/dev/null; then + LD+=.bfd + fi + + tc-export_build_env + local makeargs=( + V=1 + + HOSTCC="$(tc-getBUILD_CC)" + HOSTCXX="$(tc-getBUILD_CXX)" + HOSTCFLAGS="${BUILD_CFLAGS}" + HOSTLDFLAGS="${BUILD_LDFLAGS}" + + CROSS_COMPILE=${CHOST}- + AS="$(tc-getAS)" + CC="$(tc-getCC)" + LD="${LD}" + AR="$(tc-getAR)" + NM="$(tc-getNM)" + STRIP="$(tc-getSTRIP)" + OBJCOPY="$(tc-getOBJCOPY)" + OBJDUMP="$(tc-getOBJDUMP)" + + # we need to pass it to override colliding Gentoo envvar + ARCH="$(tc-arch-kernel)" + + O="${WORKDIR}"/modprep + ) + + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # We need to extract the plain image for the test phase + # and USE=-generic-uki. + kernel-install_extract_from_uki linux "${uki}" "${image}" + fi + + mkdir modprep || die + cp "${kernel_dir}/.config" modprep/ || die + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare +} + +src_test() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + kernel-install_test "${KPV}" \ + "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" +} + +src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # Keep the kernel image type we don't want out of install tree + # Replace back with placeholder + if use generic-uki; then + > "${image}" || die + else + > "${uki}" || die + fi + fi + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die + + # FIXME: requires proper mount-boot + if [[ -d ${BINPKG}/image/boot/dtbs ]]; then + mv "${BINPKG}"/image/boot "${ED}"/ || die + fi + + # strip out-of-source build stuffs from modprep + # and then copy built files + find modprep -type f '(' \ + -name Makefile -o \ + -name '*.[ao]' -o \ + '(' -name '.*' -a -not -name '.config' ')' \ + ')' -delete || die + rm modprep/source || die + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die + + # Update timestamps on all modules to ensure cleanup works correctly + # when switching USE=modules-compress. + find "${ED}/lib" -name '*.ko' -exec touch {} + || die + + # Modules were already stripped before signing + dostrip -x /lib/modules + kernel-install_compress_modules +}