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 A7987138334 for ; Mon, 21 Jan 2019 14:23:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E206EE0AAE; Mon, 21 Jan 2019 14:23:50 +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 8D178E0AAE for ; Mon, 21 Jan 2019 14:23:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CE6D2335D35 for ; Mon, 21 Jan 2019 14:23:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4227A4EC for ; Mon, 21 Jan 2019 14:23:47 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1548080540.794684f82667e5352cffc3055f03c058c0f6823f.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-9999.ebuild X-VCS-Directories: sys-kernel/dracut/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 794684f82667e5352cffc3055f03c058c0f6823f X-VCS-Branch: master Date: Mon, 21 Jan 2019 14:23:47 +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: eae616c5-41b9-4ee1-b35a-37b0ab14d1bc X-Archives-Hash: defd59dc1db3519008f4af3aa7eb8cb3 commit: 794684f82667e5352cffc3055f03c058c0f6823f Author: Alexander Tsoy tsoy me> AuthorDate: Fri Jan 11 17:41:01 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jan 21 14:22:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794684f8 sys-kernel/dracut: update live ebuild - EAPI-7 bump - Update optional packages: syslog-ng support is actually not implemented, networking support is provided by NetworkManager by default - Remove "debug" USE-flag - Replace SRC_URI with github mirror Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Alexander Tsoy tsoy.me> Signed-off-by: Mike Gilbert gentoo.org> sys-kernel/dracut/dracut-9999.ebuild | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index a686d0637f2..7ccd4d0b0e5 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs @@ -10,8 +10,8 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 sparc x86" - SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" @@ -19,37 +19,38 @@ HOMEPAGE="https://dracut.wiki.kernel.org" LICENSE="GPL-2" SLOT="0" -IUSE="debug selinux" +IUSE="selinux" # Tests need root privileges, bug #298014 RESTRICT="test" -COMMON_DEPEND=">=sys-apps/kmod-23[tools] - virtual/pkgconfig - virtual/udev - " -RDEPEND="${COMMON_DEPEND} +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/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 + virtual/pkgconfig + virtual/udev - debug? ( dev-util/strace ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol ) " -DEPEND="${COMMON_DEPEND} +DEPEND=">=sys-apps/kmod-23" + +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 " DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules @@ -72,6 +73,11 @@ src_configure() { echo ./configure "${myconf[@]}" ./configure "${myconf[@]}" || die + + if [[ ${PV} != 9999 ]] ; then + # Source tarball from github doesn't include this file + echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die + fi } src_install() { @@ -126,7 +132,8 @@ pkg_postinst() { elog "To get additional features, a number of optional runtime" elog "dependencies may be installed:" elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ + 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" \ @@ -153,6 +160,5 @@ pkg_postinst() { optfeature \ "Install ssh and scp along with config files and specified keys" \ net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog + optfeature "Enable logging with rsyslog" app-admin/rsyslog }