From 4c8bf1cf96adc6bf5f3ef41de4435f5b925d86b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2024 16:08:05 +0000 Subject: sys-kernel/dracut : revision bump --- metadata/md5-cache/sys-kernel/dracut-059-r10 | 16 --- metadata/md5-cache/sys-kernel/dracut-059-r15 | 16 +++ metadata/pkg_desc_index | 2 +- sys-kernel/dracut/dracut-059-r10.ebuild | 149 --------------------- sys-kernel/dracut/dracut-059-r15.ebuild | 150 ++++++++++++++++++++++ sys-kernel/dracut/files/059-early_microcode.patch | 31 +++++ 6 files changed, 198 insertions(+), 166 deletions(-) delete mode 100644 metadata/md5-cache/sys-kernel/dracut-059-r10 create mode 100644 metadata/md5-cache/sys-kernel/dracut-059-r15 delete mode 100644 sys-kernel/dracut/dracut-059-r10.ebuild create mode 100644 sys-kernel/dracut/dracut-059-r15.ebuild create mode 100644 sys-kernel/dracut/files/059-early_microcode.patch diff --git a/metadata/md5-cache/sys-kernel/dracut-059-r10 b/metadata/md5-cache/sys-kernel/dracut-059-r10 deleted file mode 100644 index 0348eddb..00000000 --- a/metadata/md5-cache/sys-kernel/dracut-059-r10 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig -DEFINED_PHASES=configure install postinst test -DEPEND=cryptsetup? ( sys-fs/cryptsetup ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 ) microcode? ( sys-firmware/intel-microcode sys-kernel/linux-firmware ) splash? ( sys-boot/plymouth ) mdadm? ( sys-fs/mdadm ) >=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone ) -DESCRIPTION=Generic initramfs generation tool -EAPI=8 -HOMEPAGE=https://github.com/dracutdevs/dracut/wiki -INHERIT=bash-completion-r1 systemd toolchain-funcs -IUSE=+cryptsetup +device-mapper +lvm +microcode +splash +mdadm selinux test -KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 -LICENSE=GPL-2 -RDEPEND=cryptsetup? ( sys-fs/cryptsetup ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 ) microcode? ( sys-firmware/intel-microcode sys-kernel/linux-firmware ) splash? ( sys-boot/plymouth ) mdadm? ( sys-fs/mdadm ) app-alternatives/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/dracutdevs/dracut/archive/refs/tags/059.tar.gz -> dracut-059.tar.gz -_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 -_md5_=18b6a42c3d1d095e7fd4fd697316ff91 diff --git a/metadata/md5-cache/sys-kernel/dracut-059-r15 b/metadata/md5-cache/sys-kernel/dracut-059-r15 new file mode 100644 index 00000000..3839b49b --- /dev/null +++ b/metadata/md5-cache/sys-kernel/dracut-059-r15 @@ -0,0 +1,16 @@ +BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig +DEFINED_PHASES=configure install postinst test +DEPEND=cryptsetup? ( sys-fs/cryptsetup ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 ) microcode? ( sys-firmware/intel-microcode sys-kernel/linux-firmware ) splash? ( sys-boot/plymouth ) mdadm? ( sys-fs/mdadm ) >=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone ) +DESCRIPTION=Generic initramfs generation tool +EAPI=8 +HOMEPAGE=https://github.com/dracutdevs/dracut/wiki +INHERIT=bash-completion-r1 systemd toolchain-funcs +IUSE=+cryptsetup +device-mapper +lvm +microcode +splash +mdadm selinux test +KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 +LICENSE=GPL-2 +RDEPEND=cryptsetup? ( sys-fs/cryptsetup ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 ) microcode? ( sys-firmware/intel-microcode sys-kernel/linux-firmware ) splash? ( sys-boot/plymouth ) mdadm? ( sys-fs/mdadm ) app-alternatives/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/dracutdevs/dracut/archive/refs/tags/059.tar.gz -> dracut-059.tar.gz +_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 +_md5_=114f3c4bbef05f74f5f14461722a5057 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 6660ef43..14d767b0 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -63,7 +63,7 @@ sys-fs/zfs 2.2.2: ZFS meta-package (Gentoo compatibility ebuild) sys-fs/zfs-utils 2.2.2: Userland utilities for ZFS Linux kernel module sys-kernel/bcmwl-dkms 6.30.223.271-r8: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r3: Dynamic Kernel Module Support -sys-kernel/dracut 059-r10: Generic initramfs generation tool +sys-kernel/dracut 059-r15: Generic initramfs generation tool sys-kernel/linux-image-redcore 6.7.6: Redcore Linux Kernel Image sys-kernel/linux-image-redcore-lts 5.15.149 6.1.79 6.6.18: Redcore Linux LTS Kernel Image sys-kernel/linux-sources-redcore 6.7.6: Redcore Linux Kernel Sources diff --git a/sys-kernel/dracut/dracut-059-r10.ebuild b/sys-kernel/dracut/dracut-059-r10.ebuild deleted file mode 100644 index 50a5fb81..00000000 --- a/sys-kernel/dracut/dracut-059-r10.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 systemd toolchain-funcs - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://github.com/dracutdevs/dracut/wiki" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+cryptsetup +device-mapper +lvm +microcode +splash +mdadm selinux test" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - cryptsetup? ( - sys-fs/cryptsetup - ) - device-mapper? ( - sys-fs/lvm2 - ) - lvm? ( - sys-fs/lvm2 - ) - microcode? ( - sys-firmware/intel-microcode - sys-kernel/linux-firmware - ) - splash? ( - sys-boot/plymouth - ) - mdadm? ( - sys-fs/mdadm - )" - -RDEPEND="${COMMON_DEPEND} - app-alternatives/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - >=sys-apps/kmod-23[tools] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/openrc[sysv-utils(-),selinux?] - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - virtual/pkgconfig - virtual/udev - - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-apps/kmod-23 - elibc_musl? ( sys-libs/fts-standalone ) -" - -BDEPEND=" - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - virtual/pkgconfig -" - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/gentoo-network-r1.patch - "${FILESDIR}"/059-kernel-install-uki.patch - "${FILESDIR}"/059-uefi-split-usr.patch - "${FILESDIR}"/059-uki-systemd-254.patch - "${FILESDIR}"/059-gawk.patch - "${FILESDIR}"/dracut-059-dmsquash-live.patch - "${FILESDIR}"/059-systemd-pcrphase.patch - "${FILESDIR}"/059-systemd-executor.patch - "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch - "${FILESDIR}"/059-redcore-change-default-initramfs-name.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die - - if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then - # Source tarball from github doesn't include this file - echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die - fi -} - -src_test() { - if [[ ${EUID} != 0 ]]; then - # Tests need root privileges, bug #298014 - ewarn "Skipping tests: Not running as root." - elif [[ ! -w /dev/kvm ]]; then - ewarn "Skipping tests: Unable to access /dev/kvm." - else - emake -C test check - fi -} - -src_install() { - local DOCS=( - AUTHORS - NEWS.md - README.md - docs/README.cross - docs/README.generic - docs/README.kernel - docs/SECURITY.md - ) - - default - - docinto html - dodoc dracut.html -} - -_dracut_initramfs_regen() { - if [ -x $(which dracut) ]; then - dracut -N -f --no-hostonly-cmdline - fi -} - -pkg_postinst() { - if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then - _dracut_initramfs_regen - fi -} - diff --git a/sys-kernel/dracut/dracut-059-r15.ebuild b/sys-kernel/dracut/dracut-059-r15.ebuild new file mode 100644 index 00000000..ab43df91 --- /dev/null +++ b/sys-kernel/dracut/dracut-059-r15.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 systemd toolchain-funcs + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+cryptsetup +device-mapper +lvm +microcode +splash +mdadm selinux test" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + cryptsetup? ( + sys-fs/cryptsetup + ) + device-mapper? ( + sys-fs/lvm2 + ) + lvm? ( + sys-fs/lvm2 + ) + microcode? ( + sys-firmware/intel-microcode + sys-kernel/linux-firmware + ) + splash? ( + sys-boot/plymouth + ) + mdadm? ( + sys-fs/mdadm + )" + +RDEPEND="${COMMON_DEPEND} + app-alternatives/cpio + >=app-shells/bash-4.0:0 + sys-apps/coreutils[xattr(-)] + >=sys-apps/kmod-23[tools] + || ( + >=sys-apps/sysvinit-2.87-r3 + sys-apps/openrc[sysv-utils(-),selinux?] + sys-apps/systemd[sysv-utils] + ) + >=sys-apps/util-linux-2.21 + virtual/pkgconfig + virtual/udev + + elibc_musl? ( sys-libs/fts-standalone ) + selinux? ( + sec-policy/selinux-dracut + sys-libs/libselinux + sys-libs/libsepol + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-apps/kmod-23 + elibc_musl? ( sys-libs/fts-standalone ) +" + +BDEPEND=" + app-text/asciidoc + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + >=dev-libs/libxslt-1.1.26 + virtual/pkgconfig +" + +QA_MULTILIB_PATHS="usr/lib/dracut/.*" + +PATCHES=( + "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/gentoo-network-r1.patch + "${FILESDIR}"/059-kernel-install-uki.patch + "${FILESDIR}"/059-uefi-split-usr.patch + "${FILESDIR}"/059-uki-systemd-254.patch + "${FILESDIR}"/059-gawk.patch + "${FILESDIR}"/dracut-059-dmsquash-live.patch + "${FILESDIR}"/059-systemd-pcrphase.patch + "${FILESDIR}"/059-systemd-executor.patch + "${FILESDIR}"/059-early_microcode.patch + "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch + "${FILESDIR}"/059-redcore-change-default-initramfs-name.patch +) + +src_configure() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + tc-export CC PKG_CONFIG + + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then + # Source tarball from github doesn't include this file + echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die + fi +} + +src_test() { + if [[ ${EUID} != 0 ]]; then + # Tests need root privileges, bug #298014 + ewarn "Skipping tests: Not running as root." + elif [[ ! -w /dev/kvm ]]; then + ewarn "Skipping tests: Unable to access /dev/kvm." + else + emake -C test check + fi +} + +src_install() { + local DOCS=( + AUTHORS + NEWS.md + README.md + docs/README.cross + docs/README.generic + docs/README.kernel + docs/SECURITY.md + ) + + default + + docinto html + dodoc dracut.html +} + +_dracut_initramfs_regen() { + if [ -x $(which dracut) ]; then + dracut -N -f --no-hostonly-cmdline + fi +} + +pkg_postinst() { + if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then + _dracut_initramfs_regen + fi +} + diff --git a/sys-kernel/dracut/files/059-early_microcode.patch b/sys-kernel/dracut/files/059-early_microcode.patch new file mode 100644 index 00000000..1768f884 --- /dev/null +++ b/sys-kernel/dracut/files/059-early_microcode.patch @@ -0,0 +1,31 @@ +diff -Nur a/dracut.sh b/dracut.sh +--- a/dracut.sh 2022-12-24 16:49:27.000000000 +0000 ++++ b/dracut.sh 2024-02-24 16:05:11.347129929 +0000 +@@ -1495,23 +1495,20 @@ + + if [[ $early_microcode == yes ]]; then + if [[ $hostonly ]]; then +- if [[ $(get_cpu_vendor) == "AMD" ]]; then +- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode +- elif [[ $(get_cpu_vendor) == "Intel" ]]; then +- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode ++ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then ++ check_kernel_config CONFIG_MICROCODE || unset early_microcode + else + unset early_microcode + fi + else +- ! check_kernel_config CONFIG_MICROCODE_AMD \ +- && ! check_kernel_config CONFIG_MICROCODE_INTEL \ ++ ! check_kernel_config CONFIG_MICROCODE \ + && unset early_microcode + fi + # Do not complain on non-x86 architectures as it makes no sense + case "${DRACUT_ARCH:-$(uname -m)}" in + x86_64 | i?86) + [[ $early_microcode != yes ]] \ +- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y" ++ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y" + ;; + *) ;; + esac -- cgit v1.2.3