commit: 7986226d9ccf99e62a6dbc0acea438f9f9c2faab Author: Laszlo Gombos <laszlo.gombos <AT> gmail <DOT> com> AuthorDate: Sat Oct 28 00:36:33 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 29 04:03:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7986226d
sys-kernel/dracut: add 059_p20231027 Signed-off-by: Laszlo Gombos <laszlo.gombos <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33552 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/dracut/Manifest | 1 + ...acut-9999.ebuild => dracut-059_p20231027.ebuild} | 21 ++++++++++++--------- sys-kernel/dracut/dracut-9999.ebuild | 21 ++++++++++++--------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 81aa88d9197f..17aee74d6bd5 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,2 +1,3 @@ DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089 DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d +DIST dracut-059_p20231027.tar.gz 491099 BLAKE2B 02c5de4577bc5fc87fd11b7b9760b0f1a4a83ed7ef1fc2de22ea3f9588e9b03b347c1be4f26965d26ab8b88736b0da70e01ecb4a50c2951d1ec4009222aaa97a SHA512 da26c798f8c3856f7b9488278f26f1f392e6f6e1863bd6bb590f940854cde6633a45cf60acf52a2a184a1a47250a23e6ee53cb3f5fa759eb0146a4c0d172c07e diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-059_p20231027.ebuild similarity index 88% copy from sys-kernel/dracut/dracut-9999.ebuild copy to sys-kernel/dracut/dracut-059_p20231027.ebuild index 904e988502bc..56fe81dd7349 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-059_p20231027.ebuild @@ -3,25 +3,30 @@ EAPI=8 -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs +inherit bash-completion-r1 edo linux-info optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/dracutdevs/dracut"; else - if [[ "${PV}" != *_rc* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + if [[ ${PV} == *_p* ]] ; then + EGIT_COMMIT="b2af8c8bcfc72802e02e2c0adc2eed9279101624" + SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${EGIT_COMMIT} + else + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi - SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org"; +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"; LICENSE="GPL-2" SLOT="0" +if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi IUSE="selinux test" - RESTRICT="!test? ( test )" RDEPEND=" @@ -63,7 +68,6 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/gentoo-network-r1.patch ) src_configure() { @@ -76,8 +80,7 @@ src_configure() { tc-export CC PKG_CONFIG - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die + edo ./configure "${myconf[@]}" if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then # Source tarball from github doesn't include this file diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 904e988502bc..cb88e1e52e74 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -3,25 +3,30 @@ EAPI=8 -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs +inherit bash-completion-r1 edo linux-info optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/dracutdevs/dracut"; else - if [[ "${PV}" != *_rc* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + if [[ ${PV} == *_p* ]] ; then + EGIT_COMMIT="b2af8c8bcfc72802e02e2c0adc2eed9279101624" + SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${EGIT_COMMIT} + else + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi - SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org"; +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"; LICENSE="GPL-2" SLOT="0" +if [[ ${PV} != 9999 && ${PV} != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi IUSE="selinux test" - RESTRICT="!test? ( test )" RDEPEND=" @@ -63,7 +68,6 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/gentoo-network-r1.patch ) src_configure() { @@ -76,8 +80,7 @@ src_configure() { tc-export CC PKG_CONFIG - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die + edo ./configure "${myconf[@]}" if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then # Source tarball from github doesn't include this file
