diff options
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r-- | sys-kernel/dracut/Manifest | 7 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-053.ebuild | 2 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-055.ebuild | 173 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-9999.ebuild | 34 | ||||
-rw-r--r-- | sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch | 39 |
5 files changed, 242 insertions, 13 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 915cd581a15c..ecc04bee0a6c 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -8,12 +8,15 @@ AUX 050-lvm-fix-removal-of-pvscan-from-udev-rules.patch 1270 BLAKE2B ac4b93d0ed4 AUX 050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch 1627 BLAKE2B c45b8efef1612ede5021be1bfe2135586286b4ac8d501ce6cde518eefb699c143fec1ec858e4320ba473feb06e88896ab0f4b2f738c6a5a98c20a161d11f508a SHA512 e070f24f0d0e95a14ee503e0cbc62d87b32ad678c12a8054c1a0c505d9ae833cd37052d51fe8d1a2a608fd06a8894d06ea4da626aadf5e9e4dd39b2ea883aaae AUX 050-systemd-remove-obsolete-syslog-parameter.patch 8176 BLAKE2B abf1619f4010cd38d98814f8827d592394a7ed7acc4c19392751adea4a98ce4acfce12bae1c2d264c392c73081ae04a205cfccd3591de651b87301352bbbe68c SHA512 3609ea93b85f79d3451fc810164c1be61def3f8e016a1fc0963088f2a690c56680d0c49bad5f8398af80150bd07bf953de50fe8832a5b88da5c01eead5fdbe7f AUX 051-dracut.sh-move-ldconfig.patch 2064 BLAKE2B 91d60d66cc3dd788f97900e4765761b918425abb603ce09b3101ec242222f17e6e7166af7faaa8ad47cff7aa1a9259af90832066ee67f7bee25c400bdfd302cb SHA512 060f968f39bd11822b1154baa7d28a1190ead371f57e43d4a997e8013f39d48e1509908b2fe3859b9315de57dc4ed03b8e4beab1ec743dc56186c9e6a1d9c116 +AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850 DIST dracut-051.tar.xz 346500 BLAKE2B 38129b6b713b3338bbb2554fffd611f80216969eebac9fca7fb72df2db2036d4fbe66ebd54e646e562e24801e61064e54b62f066bab9e77ca88814100ebdd8ff SHA512 f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8 DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a +DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866 EBUILD dracut-050-r2.ebuild 5188 BLAKE2B 2ad317c0431d3d29bed17260d7a115c2affe911f20d08e4fb7a9b03bc9a271245c520c3c221e72ab8c9ea75a7a082df680d585cbfbd95bcad7d3d88336757073 SHA512 f4c72035af1a9c4baae689ccc26cd29a97371a6c05f8f7d4709e2e8c2659baf8d22bef4b8db7d0da8eb85ed2146c2c21367b5d4e50f36219b20d73846e654299 EBUILD dracut-051-r1.ebuild 4646 BLAKE2B 981c0e9b8121a7b57405ee16d83304733830b077df166e4ed8c26b081d6302151c209d666b4ee1b1277b7f8a362d9e6e8e55138ac48f740b2bb35a325566057b SHA512 49b78798b58b09ed1268e80834de6f3547337a06c5232ad226dc59156167cd122899bff60cfa6051d04131416fda15cf6e606774d653461e1d91495d8b4a5fad -EBUILD dracut-053.ebuild 4487 BLAKE2B 75bd84807a13d8c92eb34644e8054434fcab7666555e134e055541fa3ebac70a91053d9922a00a94b2bc558c0498e41ad66ea1be1ce87f3e0083de7d980ecbb0 SHA512 80d6de3e60ba07aabd39e1fadfbbf39a941db8c83e21f633970ca6dd4c25f1e362d5b0bc9f4b9bdf84f4872ed502e71878661ec461f3e78fb3ea86c41be92c37 -EBUILD dracut-9999.ebuild 4597 BLAKE2B f9855f06d7608950dab5b8053bd58c647d3f0e7a158a6402fe57a3bd8afeeaf446739c8d76c18efe2d8a666939f695d69c2a48aaeefdbd14e8127472ed063aae SHA512 4ce6cbced027265bb6d841ce2f5d6e903280b0427ca4ed023134e4c5244fd5d48589cb69d92463bf34dd04cc935cf3de1dfe1808d87a9f4718078b194be29fae +EBUILD dracut-053.ebuild 4480 BLAKE2B 8cf2dd7689598e9d626335203dc9e6a565dbc1e255d5f8c7af10622d162c0eaab2fb5190d6ecf1f0b5866e44d461054e701be52e0de8493b6b53fe3d4531f534 SHA512 859cd2d7760c40a08c4f6701ac3e1776603c0b3eb0a42f19a4044e6eac469cc56970c4426c44372d5e720a1ca3692eece6c14079f74fc1d0ad8f1f96537332d8 +EBUILD dracut-055.ebuild 4792 BLAKE2B 0a1a700f00c370c7de6db5e90f11d7c93dfedf7cf42838018cd047203333e3f44383446292da3008979c63b13e1622483cb87ae475ad1613b20b4711c1741dd3 SHA512 54b5ca49fe62ff36314ddf0937b9d400bc3891638b06c2dbf82cf946c5808bf2237b9d51406bfbd2b7c162d99cbb402b77155b8260e4cf97bb3f658b03e6d452 +EBUILD dracut-9999.ebuild 4792 BLAKE2B 0a1a700f00c370c7de6db5e90f11d7c93dfedf7cf42838018cd047203333e3f44383446292da3008979c63b13e1622483cb87ae475ad1613b20b4711c1741dd3 SHA512 54b5ca49fe62ff36314ddf0937b9d400bc3891638b06c2dbf82cf946c5808bf2237b9d51406bfbd2b7c162d99cbb402b77155b8260e4cf97bb3f658b03e6d452 MISC metadata.xml 478 BLAKE2B 28130c92964b57a250220a1f5792459c8c35f5308a9f6713f60cb0492175fb6f296a77535dcb59db47db5cc3e8c3a56e7828e28d3519610a119bac500b844f4f SHA512 75bd848d2f69e892d6d4623fb00d36ac5572f19ce89db246f668c3f15581c1bd74987988c46c6dc656bd1d75342d98a47b7af57e0f646c39572ccb1b398f6090 diff --git a/sys-kernel/dracut/dracut-053.ebuild b/sys-kernel/dracut/dracut-053.ebuild index 758f8865d6c4..670c8599df84 100644 --- a/sys-kernel/dracut/dracut-053.ebuild +++ b/sys-kernel/dracut/dracut-053.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" fi diff --git a/sys-kernel/dracut/dracut-055.ebuild b/sys-kernel/dracut/dracut-055.ebuild new file mode 100644 index 000000000000..3b042f3de741 --- /dev/null +++ b/sys-kernel/dracut/dracut-055.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dracutdevs/dracut" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" +fi + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://dracut.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/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=" + >=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 +) + +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 +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_exists; then + ewarn "" + ewarn "If the following test report contains a missing kernel" + ewarn "configuration option, you should reconfigure and rebuild your" + ewarn "kernel before booting image generated with this Dracut version." + ewarn "" + + local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" + + # Kernel configuration options descriptions: + local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' + ERROR_DEVTMPFS+='is missing and REQUIRED' + local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' + ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' + + check_extra_config + echo + else + ewarn "" + ewarn "Your kernel configuration couldn't be checked." + ewarn "Please check manually if following options are enabled:" + ewarn "" + ewarn " CONFIG_BLK_DEV_INITRD" + ewarn " CONFIG_DEVTMPFS" + ewarn "" + fi + + optfeature "Networking support" net-misc/networkmanager + optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ + sys-apps/iproute2 "net-misc/iputils[arping]" + optfeature \ + "Measure performance of the boot process for later visualisation" \ + app-benchmarks/bootchart2 app-admin/killproc sys-process/acct + optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs + optfeature "Load kernel modules and drop this privilege for real init" \ + sys-libs/libcap + optfeature "Support CIFS" net-fs/cifs-utils + optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ + "sys-fs/cryptsetup[-static-libs]" + optfeature "Support for GPG-encrypted keys for crypt module" \ + app-crypt/gnupg + optfeature \ + "Allows use of dash instead of default bash (on your own risk)" \ + app-shells/dash + optfeature "Support iSCSI" sys-block/open-iscsi + optfeature "Support Logical Volume Manager" sys-fs/lvm2 + optfeature "Support MD devices, also known as software RAID devices" \ + sys-fs/mdadm + optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools + optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' + optfeature "Support network block devices" sys-block/nbd + optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind + optfeature \ + "Install ssh and scp along with config files and specified keys" \ + net-misc/openssh + optfeature "Enable logging with rsyslog" app-admin/rsyslog + optfeature \ + "Enable rngd service to help generating entropy early during boot" \ + sys-apps/rng-tools +} diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index e6d09f406d08..3b042f3de741 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -19,10 +19,9 @@ HOMEPAGE="https://dracut.wiki.kernel.org" LICENSE="GPL-2" SLOT="0" -IUSE="selinux" +IUSE="selinux test" -# Tests need root privileges, bug #298014 -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" app-arch/cpio @@ -58,13 +57,10 @@ BDEPEND=" virtual/pkgconfig " -DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules - README.testsuite TODO ) - QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( - "${FILESDIR}"/gentoo-ldconfig-paths.patch + "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch ) src_configure() { @@ -86,11 +82,29 @@ src_configure() { 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() { - default + local DOCS=( + AUTHORS + NEWS.md + README.md + docs/README.cross + docs/README.generic + docs/README.kernel + docs/SECURITY.md + ) - insinto /etc/logrotate.d - newins dracut.logrotate dracut + default docinto html dodoc dracut.html diff --git a/sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch b/sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch new file mode 100644 index 000000000000..53349a1f31f3 --- /dev/null +++ b/sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch @@ -0,0 +1,39 @@ +From e6a5f02038954ede223cc75901386acf43ec4264 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Mon, 9 Mar 2020 02:47:07 +0300 +Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths() + +Bug: https://bugs.gentoo.org/705728 +--- + dracut-functions.sh | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 5206bd21..a119fb15 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -81,7 +81,20 @@ find_binary() { + } + + ldconfig_paths() { +- $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2> /dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq ++ local gccpath ++ ++ if type -P gcc-config &>/dev/null; then ++ gccpath=$(gcc-config -c) ++ gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-} ++ fi ++ ++ while read -r line; do ++ if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then ++ echo ${line} ++ elif [[ ${line} == ${gccpath} ]]; then ++ echo ${line} ++ fi ++ done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq) + } + + # Version comparision function. Assumes Linux style version scheme. +-- +2.32.0 + |