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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5782E1382C5 for ; Sat, 10 Mar 2018 01:56:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E18DE0829; Sat, 10 Mar 2018 01:56:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 504D2E0829 for ; Sat, 10 Mar 2018 01:56:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02212335C2A for ; Sat, 10 Mar 2018 01:56:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B67A621D for ; Sat, 10 Mar 2018 01:56:21 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1520646947.2f21704fb2fad7531d40504637c23bf30232e935.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: proj/musl X-VCS-Files: sys-kernel/dracut/Manifest sys-kernel/dracut/dracut-046-r1.ebuild sys-kernel/dracut/dracut-047.ebuild sys-kernel/dracut/files/dracut-047-libfts.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 2f21704fb2fad7531d40504637c23bf30232e935 X-VCS-Branch: master Date: Sat, 10 Mar 2018 01:56:21 +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-Archives-Salt: 10796ebc-c928-47c3-b43e-9090f9e6fa29 X-Archives-Hash: 14cd34ac6a3e8cbb4938ad8a2f1d7847 commit: 2f21704fb2fad7531d40504637c23bf30232e935 Author: Aric Belsito gmail com> AuthorDate: Sat Mar 10 01:55:47 2018 +0000 Commit: Aric Belsito gmail com> CommitDate: Sat Mar 10 01:55:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2f21704f sys-kernel/dracut: version bump to 047 sys-kernel/dracut/Manifest | 1 + sys-kernel/dracut/dracut-046-r1.ebuild | 2 +- .../{dracut-046-r1.ebuild => dracut-047.ebuild} | 62 ++++++--------- sys-kernel/dracut/files/dracut-047-libfts.patch | 87 ++++++++++++++++++++++ 4 files changed, 112 insertions(+), 40 deletions(-) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 29e5148..71ff6ad 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,2 +1,3 @@ DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 +DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035 diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild index 75ecc57..db58301 100644 --- a/sys-kernel/dracut/dracut-046-r1.ebuild +++ b/sys-kernel/dracut/dracut-046-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org" SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ia64 ~mips ~ppc sparc x86" IUSE="debug selinux" RESTRICT="test" diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-047.ebuild similarity index 75% copy from sys-kernel/dracut/dracut-046-r1.ebuild copy to sys-kernel/dracut/dracut-047.ebuild index 75ecc57..977b3ce 100644 --- a/sys-kernel/dracut/dracut-046-r1.ebuild +++ b/sys-kernel/dracut/dracut-047.ebuild @@ -3,56 +3,56 @@ EAPI=6 -inherit bash-completion-r1 linux-info toolchain-funcs systemd +inherit bash-completion-r1 linux-info systemd toolchain-funcs DESCRIPTION="Generic initramfs generation tool" HOMEPAGE="https://dracut.wiki.kernel.org" SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86" IUSE="debug selinux" +# Tests need root privileges, bug #298014 RESTRICT="test" -CDEPEND="virtual/udev +COMMON_DEPEND=">=sys-apps/kmod-23[tools] virtual/pkgconfig - >=sys-apps/kmod-15[tools] + virtual/udev " -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} app-arch/cpio >=app-shells/bash-4.0:0 + sys-apps/coreutils[xattr(-)] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] ) - sys-apps/coreutils[xattr(-)] >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) elibc_musl? ( sys-libs/fts-standalone ) selinux? ( + sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol - sec-policy/selinux-dracut ) - !net-analyzer/arping " -DEPEND="${CDEPEND} +DEPEND="${COMMON_DEPEND} app-text/asciidoc - >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 + >=dev-libs/libxslt-1.1.26 " DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) + README.testsuite TODO dracut.html ) QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}/045-systemdutildir.patch" - "${FILESDIR}/046-amd-microcode.patch" "${FILESDIR}"/${P}-libfts.patch ) @@ -73,25 +73,19 @@ src_configure() { src_install() { default - local dracutlibdir="usr/lib/dracut" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then + local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) + if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" + libdirs+=( /lib /usr/lib ) fi - einfo "Setting libdirs to \"${libdirs}\" ..." - echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf" - insinto "${dracutlibdir}/dracut.conf.d" + einfo "Setting libdirs to \"${libdirs[*]}\" ..." + echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die + insinto "/usr/lib/dracut/dracut.conf.d" doins "${T}/gentoo.conf" insinto /etc/logrotate.d newins dracut.logrotate dracut - - dodir /var/lib/dracut/overlay - - dodoc dracut.html } pkg_postinst() { @@ -105,27 +99,17 @@ pkg_postinst() { local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" # Kernel configuration options descriptions: - local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" - local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ -"(initramfs/initrd) support" - - local opt desc - - # Generate ERROR_* variables for check_extra_config. - for opt in ${CONFIG_CHECK}; do - opt=${opt#\~} - desc=desc_${opt} - eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ - "is missing and REQUIRED'" - done + 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. Do you have" - ewarn "/usr/src/linux/.config file there? Please check manually if" - ewarn "following options are enabled:" + 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" diff --git a/sys-kernel/dracut/files/dracut-047-libfts.patch b/sys-kernel/dracut/files/dracut-047-libfts.patch new file mode 100644 index 0000000..4d67f12 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-047-libfts.patch @@ -0,0 +1,87 @@ +diff -Naur dracut-047.orig/Makefile dracut-047/Makefile +--- dracut-047.orig/Makefile 2018-03-09 17:50:16.951255993 -0800 ++++ dracut-047/Makefile 2018-03-09 17:50:21.034255919 -0800 +@@ -13,7 +13,7 @@ + bindir ?= ${prefix}/bin + mandir ?= ${prefix}/share/man + CFLAGS ?= -O2 -g -Wall +-CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) ++CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) $(FTS_CFLAGS) + bashcompletiondir ?= ${datadir}/bash-completion/completions + pkgconfigdatadir ?= $(datadir)/pkgconfig + +@@ -61,7 +61,7 @@ + install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h + + install/dracut-install: $(DRACUT_INSTALL_OBJECTS) +- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) $(FTS_LIBS) + + dracut-install: install/dracut-install + ln -fs $< $@ +diff -Naur dracut-047.orig/configure dracut-047/configure +--- dracut-047.orig/configure 2018-03-09 17:50:16.951255993 -0800 ++++ dracut-047/configure 2018-03-09 17:51:16.447254927 -0800 +@@ -7,6 +7,7 @@ + + enable_documentation=yes + ++CC="${CC:-gcc}" + PKG_CONFIG="${PKG_CONFIG:-pkg-config}" + + # Little helper function for reading args from the commandline. +@@ -52,10 +53,40 @@ + shift + done + ++printf "checking for libkmod... " + if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then ++ printf "no\n" + echo "dracut needs pkg-config and libkmod >= 23." >&2 + exit 1 + fi ++printf "yes\n" ++ ++tmpc="./conftest.c" ++ ++printf "checking whether we have fts available from libc... " ++echo '#if !defined(__x86_64__)' > "$tmpc" ++echo '#undef _FILE_OFFSET_BITS' >> "$tmpc" ++echo '#define _FILE_OFFSET_BITS 32' >> "$tmpc" ++echo '#endif' >> "$tmpc" ++echo '#include ' >> "$tmpc" ++echo 'int main() { FTS* fts = 0; return fts_close(fts); return 0; }' >> "$tmpc" ++if $CC -o /dev/null "$tmpc" >/dev/null 2>&1 ; then ++printf "yes\n" ++fts_library=false ++else ++printf "no\n" ++printf "checking whether we have fts available from libfts... " ++if $CC -lfts -o /dev/null "$tmpc" >/dev/null 2>&1 ; then ++printf "yes\n" ++fts_library=true ++else ++printf "no\n" ++echo "fts not in libc and libfts not found." ++exit 1 ++fi ++fi ++ ++rm $tmpc + + cat > Makefile.inc.$$ <= 23 ") + EOF + ++if $fts_library ; then ++cat >> Makefile.inc.$$ <