diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent index b15d5c1cf90..c51b3b68255 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -1,2 +1,2 @@ -portage-stable:default/linux/amd64/17.1/no-multilib/hardened +portage-stable:default/linux/amd64/23.0/no-multilib/hardened/systemd :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent index ffc428f7733..f0a79704e37 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent @@ -1,2 +1,3 @@ -portage-stable:default/linux/arm64/17.0/hardened +portage-stable:default/linux/arm64/23.0/hardened +portage-stable:targets/systemd :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force index c538b7f58c6..afc4ecf8731 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force @@ -25,3 +25,6 @@ net-misc/curl ssl openssl curl_ssl_openssl # that cause the build in stage1 to fail. Pulling in asm too, as it is # required by cpudetection. dev-libs/gmp cpudetection asm + +# Disable gentoo-only bits. +sys-apps/systemd vanilla diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent deleted file mode 100644 index e00b432785f..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent +++ /dev/null @@ -1,2 +0,0 @@ -portage-stable:targets/systemd -:features/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force deleted file mode 100644 index 506c18cf11e..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force +++ /dev/null @@ -1,7 +0,0 @@ -# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base -# profile in portage-stable forces split-usr, so here we unforce it -# and in use.mask we mask it. -# -# TODO: Drop it when we move to -# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile --split-usr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 955ab8e276b..726c8edc2e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -21,11 +21,3 @@ python_single_target_python3_13 # We don't care about i10n, takes too much space, pulls in too many # extra dependencies. nls - -# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base -# profile in portage-stable forces split-usr, so in use.force we -# unforce it and here we mask it. -# -# TODO: Drop it when we move to -# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile -split-usr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults deleted file mode 100644 index ded4466d96d..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -USE="systemd udev" -BOOTSTRAP_USE="$BOOTSTRAP_USE udev" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask deleted file mode 100644 index 3123811515b..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask +++ /dev/null @@ -1,4 +0,0 @@ -# Mask sysvinit+openrc and runit+openrc in favor of systemd -sys-apps/sysvinit -sys-apps/openrc -sys-process/runit diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask deleted file mode 100644 index 9b52e5deb1c..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask +++ /dev/null @@ -1 +0,0 @@ -sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force deleted file mode 100644 index 09272cb6394..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2014 The CoreOS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# replace sysvinit and disable gentoo-only bits -sys-apps/systemd sysv-utils vanilla - -# dbus without systemd conflicts with systemd -sys-apps/dbus systemd - -# use systemd as udev implementation -virtual/libudev systemd -virtual/udev systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages deleted file mode 100644 index 92783beb684..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ /dev/null @@ -1,4 +0,0 @@ -# Add systemd to the 'system' set -*sys-apps/gentoo-functions -*sys-apps/systemd --*sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build deleted file mode 100644 index a3d7e98b94e..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build +++ /dev/null @@ -1,3 +0,0 @@ -sys-apps/dbus -sys-apps/gentoo-functions --sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask deleted file mode 100644 index 6259b323fc1..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask +++ /dev/null @@ -1,2 +0,0 @@ -openrc --systemd diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest similarity index 50% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/Manifest rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index f630cdcac57..3f2f5cc1ff7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1 +1,2 @@ DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 +DIST kmod-33.tar.xz 514428 BLAKE2B 5fb4ea9d96217f8c94cba752b07a1b53228c6ae79dbaa605030cd84e3c6ca8d9c1a703a0253cea1d6c78a78f1507e2a1d9c6215d28dcb01b9e7f8b98a9fde425 SHA512 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/files/kmod-31-musl-basename.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/files/kmod-31-musl-basename.patch rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/files/kmod-static-nodes-r1 b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes-r1 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/files/kmod-static-nodes-r1 rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild index 366c2ba3d51..ba1675a4d32 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-32-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild @@ -13,12 +13,12 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 split-usr static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -79,6 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" $(use_enable debug) @@ -99,10 +101,12 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools && use split-usr; then - # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel - rm "${ED}/usr/bin/modprobe" || die - dosym ../usr/bin/kmod /sbin/modprobe + if use tools; then + local cmd + for cmd in depmod insmod modprobe rmmod; do + rm "${ED}"/bin/${cmd} || die + dosym ../bin/kmod /sbin/${cmd} + done fi cat <<-EOF > "${T}"/usb-load-ehci-first.conf diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-33.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-33.ebuild new file mode 100644 index 00000000000..ef67100015c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-33.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools libtool bash-completion-r1 + +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git" + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-r3 +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" + +# Upstream does not support running the test suite with custom configure flags. +# I was also told that the test suite is intended for kmod developers. +# So we have to restrict it. +# See bug #408915. +#RESTRICT="test" + +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.2-r1 required for bug #771078 +RDEPEND=" + !sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-build/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == 9999* ]]; then + BDEPEND+=" app-text/scdoc" +fi + +src_prepare() { + default + + if [[ ! -e configure ]] || use doc ; then + if use doc; then + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + gtkdocize --copy --docdir libkmod/docs || die + else + touch libkmod/docs/gtk-doc.make + fi + eautoreconf + else + elibtoolize + fi + + # Restore possibility of running --enable-static, bug #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + # TODO: >=33 enables decompressing without libraries being built in + # as kmod defers to the kernel. How should the ebuild be adapted? + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + $(use_enable debug) + $(usev doc '--enable-gtk-doc') + $(use_enable static-libs static) + $(use_enable tools) + $(use_with lzma xz) + $(use_with pkcs7 openssl) + $(use_with zlib) + $(use_with zstd) + ) + + if [[ ${PV} != 9999 ]] ; then + # See src_install + myeconfargs+=( --disable-manpages ) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if [[ ${PV} != 9999 ]] ; then + # The dist logic is broken but the files are in there (bug #937942) + emake -C man DESTDIR="${D}" install + fi + + find "${ED}" -type f -name "*.la" -delete || die + + if use tools; then + local cmd + for cmd in depmod insmod modprobe rmmod; do + rm "${ED}"/bin/${cmd} || die + dosym ../bin/kmod /sbin/${cmd} + done + fi + + cat <<-EOF > "${T}"/usb-load-ehci-first.conf + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + EOF + + insinto /lib/modprobe.d + # bug #260139 + doins "${T}"/usb-load-ehci-first.conf + + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes +} + +pkg_postinst() { + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then + ewarn "Removing old conflicting static-nodes init script from the boot runlevel" + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes + fi + + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit + fi + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes + fi + fi + + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + ewarn + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" + ewarn "kernel modules to have required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add kmod-static-nodes sysinit" + fi + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-9999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index 1e49c67ac4a..ef67100015c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2" @@ -49,13 +49,9 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - BDEPEND+=" dev-libs/libxslt" + BDEPEND+=" app-text/scdoc" fi -PATCHES=( - "${FILESDIR}"/${PN}-31-musl-basename.patch -) - src_prepare() { default @@ -78,6 +74,8 @@ src_prepare() { } src_configure() { + # TODO: >=33 enables decompressing without libraries being built in + # as kmod defers to the kernel. How should the ebuild be adapted? local myeconfargs=( --bindir="${EPREFIX}/bin" --sbindir="${EPREFIX}/sbin" @@ -93,12 +91,22 @@ src_configure() { $(use_with zstd) ) + if [[ ${PV} != 9999 ]] ; then + # See src_install + myeconfargs+=( --disable-manpages ) + fi + econf "${myeconfargs[@]}" } src_install() { default + if [[ ${PV} != 9999 ]] ; then + # The dist logic is broken but the files are in there (bug #937942) + emake -C man DESTDIR="${D}" install + fi + find "${ED}" -type f -name "*.la" -delete || die if use tools; then diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/kmod/metadata.xml rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml