[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: 23e60465a398daff88f916502cdaac028c14b6e3
Author: callmetango users noreply github
com>
AuthorDate: Tue Feb 5 12:12:11 2019 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Tue Feb 5 12:39:51 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=23e60465
sys-kernel/dracut: version bump to 049-r1
Signed-off-by: Anthony G. Basile gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/dracut-049-r1.ebuild | 156 +
...etwork-Don-t-include-40network-by-default.patch | 34 +
...49-remove-bashism-in-various-boot-scripts.patch | 89
4 files changed, 280 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 4de5b6f..7732468 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -2,3 +2,4 @@ DIST dracut-045.tar.xz 292652 BLAKE2B
0e7c57ddca6757d59823afdc4ff23dcb06cc9cec31
DIST dracut-046.tar.xz 299520 BLAKE2B
1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced
SHA512
75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
DIST dracut-047.tar.xz 305836 BLAKE2B
18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0
SHA512
03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
DIST dracut-048.tar.xz 308484 BLAKE2B
b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7
SHA512
97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
+DIST dracut-049.tar.gz 376857 BLAKE2B
e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6
SHA512
51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7
diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild
b/sys-kernel/dracut/dracut-049-r1.ebuild
new file mode 100644
index 000..b3adc6b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-049-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+if [[ ${PV} == ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut;
+else
+ [[ "${PV}" = *_rc* ]] || \
+ 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"
+HOMEPAGE="https://dracut.wiki.kernel.org;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="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/systemd[sysv-utils]
+ )
+ >=sys-apps/util-linux-2.21
+ virtual/pkgconfig
+ virtual/udev
+
+ selinux? (
+ sec-policy/selinux-dracut
+ sys-libs/libselinux
+ sys-libs/libsepol
+ )
+ "
+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
+ README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
+ "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
+ "${FILESDIR}"/${PN}-047-libfts.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} != ]] ; then
+ # Source tarball from github doesn't include this file
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+ fi
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d
+ newins dracut.logrotate dracut
+
+ docinto html
+ dodoc dracut.html
+}
+
+pkg_postinst() {
+ if
[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: 9fe92e88ca28ae64afd09611e92f6a21700a1ac8
Author: Marty E. Plummer startmail com>
AuthorDate: Sun Jan 20 19:52:51 2019 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sun Jan 20 21:02:37 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9fe92e88
sys-kernel/dracut: version bump to 048
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Anthony G. Basile gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/dracut-048-r1.ebuild | 154 +
...dracut-install-simplify-ldd-parsing-logic.patch | 41 ++
3 files changed, 196 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 71ff6ad..4de5b6f 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
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
+DIST dracut-048.tar.xz 308484 BLAKE2B
b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7
SHA512
97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild
b/sys-kernel/dracut/dracut-048-r1.ebuild
new file mode 100644
index 000..b3796a7
--- /dev/null
+++ b/sys-kernel/dracut/dracut-048-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/kmod-23[tools]
+ virtual/pkgconfig
+ virtual/udev
+ "
+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/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
+ )
+ "
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ 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 )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
+ "${FILESDIR}"/${PN}-047-libfts.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
+}
+
+src_install() {
+ default
+
+ local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
+ if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
+ # Preserve lib -> lib64 symlinks in initramfs
+ libdirs+=( /lib /usr/lib )
+ fi
+
+ 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
+
+ docinto html
+ dodoc dracut.html
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_exists;
[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: 8afd8f91b09134e647435069479aabf83d07fbb0
Author: Anthony G. Basile gentoo org>
AuthorDate: Fri Mar 30 21:41:43 2018 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Fri Mar 30 21:43:07 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=8afd8f91
sys-kernel/dracut: is required for __WORDSIZE
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-kernel/dracut/dracut-047-r1.ebuild | 1 +
sys-kernel/dracut/files/dracut-sys-reg_h.patch | 11 +++
2 files changed, 12 insertions(+)
diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild
b/sys-kernel/dracut/dracut-047-r1.ebuild
index 8f58b6c..7548567 100644
--- a/sys-kernel/dracut/dracut-047-r1.ebuild
+++ b/sys-kernel/dracut/dracut-047-r1.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch"
"${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch"
"${FILESDIR}"/${P}-libfts.patch
+ "${FILESDIR}"/${PN}-sys-reg_h.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-sys-reg_h.patch
b/sys-kernel/dracut/files/dracut-sys-reg_h.patch
new file mode 100644
index 000..9cf7cfc
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-sys-reg_h.patch
@@ -0,0 +1,11 @@
+diff -Naur dracut-046.orig/install/util.h dracut-046/install/util.h
+--- dracut-046.orig/install/util.h 2017-08-11 11:44:06.0 +
dracut-046/install/util.h 2018-03-30 21:33:00.720715093 +
+@@ -36,6 +36,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "macro.h"
+
[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: 2f21704fb2fad7531d40504637c23bf30232e935
Author: Aric Belsito gmail com>
AuthorDate: Sat Mar 10 01:55:47 2018 +
Commit: Aric Belsito gmail com>
CommitDate: Sat Mar 10 01:55:47 2018 +
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
[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: 06c085dcc400b0fb80e1ebac1924822d1456ccaa
Author: Aric Belsito gmail com>
AuthorDate: Sun Jan 7 19:45:37 2018 +
Commit: Aric Belsito gmail com>
CommitDate: Sun Jan 7 19:45:37 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=06c085dc
sys-kernel/dracut: version bump to 046-r1
sys-kernel/dracut/Manifest | 4 +--
.../{dracut-046.ebuild => dracut-046-r1.ebuild}| 3 ++-
sys-kernel/dracut/files/046-amd-microcode.patch| 30 ++
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 8cb1009..29e5148 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,2 +1,2 @@
-DIST dracut-045.tar.xz 292652 SHA256
ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512
b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
WHIRLPOOL
d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
-DIST dracut-046.tar.xz 299520 SHA256
3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 SHA512
75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
WHIRLPOOL
2a430978934e00a5c87908a6e312e94785d8c2d4d9281c23de9a04d0e91658d234e97dbf826c3e90c6d3c7186f96eb251cfd5e7508ac0c2d2e9dd46486dc284d
+DIST dracut-045.tar.xz 292652 BLAKE2B
0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7
SHA512
b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
+DIST dracut-046.tar.xz 299520 BLAKE2B
1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced
SHA512
75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
diff --git a/sys-kernel/dracut/dracut-046.ebuild
b/sys-kernel/dracut/dracut-046-r1.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-046.ebuild
rename to sys-kernel/dracut/dracut-046-r1.ebuild
index 55a83e3..e028ce3 100644
--- a/sys-kernel/dracut/dracut-046.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -52,6 +52,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}/045-systemdutildir.patch"
+ "${FILESDIR}/046-amd-microcode.patch"
"${FILESDIR}"/${P}-libfts.patch
)
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch
b/sys-kernel/dracut/files/046-amd-microcode.patch
new file mode 100644
index 000..c351275
--- /dev/null
+++ b/sys-kernel/dracut/files/046-amd-microcode.patch
@@ -0,0 +1,30 @@
+From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin
+Date: Tue, 12 Dec 2017 17:48:36 +0100
+Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
+
+---
+ dracut-functions.sh | 7 ++-
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 112b2434..d7fc5303 100755
+--- a/dracut-functions.sh
b/dracut-functions.sh
+@@ -661,11 +661,8 @@ get_ucode_file ()
+ local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\
//`
+
+ if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
+-# If family greater than or equal to 0x16
+-if [[ $family -ge 22 ]]; then
+-printf "microcode_amd_fam16h.bin"
+-elif [[ $family -eq 21 ]]; then
+-printf "microcode_amd_fam15h.bin"
++if [[ $family -ge 21 ]]; then
++printf "microcode_amd_fam%xh.bin" $family
+ else
+ printf "microcode_amd.bin"
+ fi
+--
+2.16.0.rc0
+
[gentoo-commits] proj/musl:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
commit: bf8d89b066d171bb948858823451bd1716be578c
Author: Aric Belsito gmail com>
AuthorDate: Mon Nov 20 18:50:34 2017 +
Commit: Aric Belsito gmail com>
CommitDate: Mon Nov 20 18:50:34 2017 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=bf8d89b0
sys-kernel/dracut: bump patch
sys-kernel/dracut/dracut-046.ebuild | 2 +-
sys-kernel/dracut/files/dracut-046-libfts.patch | 87 +
2 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/dracut/dracut-046.ebuild
b/sys-kernel/dracut/dracut-046.ebuild
index f9edae9..55a83e3 100644
--- a/sys-kernel/dracut/dracut-046.ebuild
+++ b/sys-kernel/dracut/dracut-046.ebuild
@@ -52,7 +52,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}/045-systemdutildir.patch"
- "${FILESDIR}"/dracut-045-libfts.patch
+ "${FILESDIR}"/${P}-libfts.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-046-libfts.patch
b/sys-kernel/dracut/files/dracut-046-libfts.patch
new file mode 100644
index 000..6eeb73b
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-046-libfts.patch
@@ -0,0 +1,87 @@
+diff -Naur dracut-046.orig/Makefile dracut-046/Makefile
+--- dracut-046.orig/Makefile 2017-08-11 04:44:06.0 -0700
dracut-046/Makefile2017-11-20 10:47:53.667837476 -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-046.orig/configure dracut-046/configure
+--- dracut-046.orig/configure 2017-08-11 04:44:06.0 -0700
dracut-046/configure 2017-11-20 10:49:33.023835696 -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 >= 15 "; then
++printf "no\n"
+ echo "dracut needs pkg-config and libkmod >= 15." >&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.$$ <= 15 ")
+ EOF
+
++if $fts_library ; then
++cat >> Makefile.inc.$$ <
