From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sys-boot/Manifest.gz | Bin 6724 -> 6722 bytes sys-boot/grub/Manifest | 11 +- sys-boot/grub/grub-2.02-r4.ebuild | 6 +- sys-boot/grub/grub-2.04-r1.ebuild | 8 +- sys-boot/grub/grub-2.04_rc1.ebuild | 306 --------------------- sys-boot/grub/grub-2.05_alpha20200110.ebuild | 291 ++++++++++++++++++++ sys-boot/grub/grub-9999.ebuild | 8 +- sys-boot/plymouth/Manifest | 4 +- sys-boot/plymouth/plymouth-0.9.4-r1.ebuild | 7 +- sys-boot/plymouth/plymouth-9999.ebuild | 7 +- sys-boot/raspberrypi-firmware/Manifest | 4 +- .../raspberrypi-firmware-1.20190925.ebuild | 2 +- .../raspberrypi-firmware-9999.ebuild | 2 +- sys-boot/raspberrypi-mkimage/Manifest | 2 +- .../raspberrypi-mkimage-0_p20120201.ebuild | 4 +- sys-boot/udk/Manifest | 4 +- sys-boot/udk/udk-2015-r1.ebuild | 4 +- sys-boot/udk/udk-2018.ebuild | 4 +- sys-boot/unetbootin/Manifest | 6 +- sys-boot/unetbootin/unetbootin-661-r1.ebuild | 2 +- sys-boot/unetbootin/unetbootin-661.ebuild | 2 +- sys-boot/unetbootin/unetbootin-675.ebuild | 2 +- sys-boot/vboot-utils/Manifest | 7 +- .../files/vboot-utils-80-musl-fts.patch | 17 ++ sys-boot/vboot-utils/metadata.xml | 5 +- .../vboot-utils/vboot-utils-59_p20170413.ebuild | 85 ------ .../vboot-utils/vboot-utils-80_p20200108.ebuild | 104 +++++++ 27 files changed, 465 insertions(+), 439 deletions(-) delete mode 100644 sys-boot/grub/grub-2.04_rc1.ebuild create mode 100644 sys-boot/grub/grub-2.05_alpha20200110.ebuild create mode 100644 sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch delete mode 100644 sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild create mode 100644 sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index 6b329e3900eb..cdf801a5ecfb 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 45887447b428..3b4811ba9802 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -12,12 +12,11 @@ AUX grub.default-3 2532 BLAKE2B f59b8e862b7069603a975327d51507aae4568bfc80d7aa23 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb -DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3 -DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3 +DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 -EBUILD grub-2.02-r4.ebuild 7966 BLAKE2B 55adf4ac6809011c7ffd425ab305557bed8f2b7e4fec29bdba9c104d2a553963da2400363376fa933b64ad2ff02b57ebacfa0fd06b7ef69814d3b2fdfd2bf063 SHA512 e440ba7a2a6157e11823dfe0049415b81bd19baffef36cce73d7cbe3576c635eba8c334118b6468f70a4636cd9a1bcc36790c8e4dc7ca51d7aba3d8481069fe0 -EBUILD grub-2.04-r1.ebuild 7647 BLAKE2B 527f093bd35e65a7ce971408f7ad2a4e6dc2cbb828f9b8cd3194e401ab4f7c19f20afdfa9a13180ee508f7632ece69502b4df8c5790012ce8d6fdd9c7813ddca SHA512 27ff52b62232af35ede419837a1a7d24e8485ac17b6034bf7a27d8395473fb451ba1a7967d69c4bdcbc4f7dc78833527ab68c3a57c0bfba6ace3a853f74fd8f3 -EBUILD grub-2.04_rc1.ebuild 7706 BLAKE2B 540493ecb71e14bedf42cc788606747fb5a9ba0e5898b7276d1a4bf348210ce8dbcaf99dde406987b22867cf9184411f878232f7fadf2f9d01473cd8f9e0d8c4 SHA512 964beed8ecd518078ef22aea3308eef5c69e2c0900b931a88dfa7389b6752ffb8b3f7b468a799f1a75f83cc605435f85907cbf7d4186fb74ff61f73fa2d73796 -EBUILD grub-9999.ebuild 7597 BLAKE2B db14887aa1777cdbf36db65d362dd863d4f768a7962daf0de467fd473196928aadfde8055596a53674f4e97c38cbf62b5bfd1d963f5551d8bd8a46cc0ab30d28 SHA512 2ba49dd61247f386298acf8f0c3372071f2b8be6b2a422666d3b94c7773d991c08d0280be73d2fbe76abd58f93c2331cd54b982624d78052c215a4d31db683a8 +EBUILD grub-2.02-r4.ebuild 7986 BLAKE2B 28a1db0e31b86b972bb0dae7b6fa18d7db3b4ee2be9e7ae6353699a8ec45e382b0bcd33d68cb481763421937779aabe7bb902106cce2cb8171d6c61d0f1f0494 SHA512 0fefc254e134b5ce01ca3e890b5df6076265ee16971226407c0cd977ec75b2356c0dab493ba5e4a2578747a3be7bf0920221f2c539bfebffc6eec5bf82eee00f +EBUILD grub-2.04-r1.ebuild 7662 BLAKE2B a1217db77ca4314b19e92d67639fe262d1c37c19f0f7c3da1a37a3a6d545d865b84c7a5e3abcf6e170119610e035f2474ceeed98667bc88b39b4125099564058 SHA512 5959478a50f35553910179c5b7efe681f437a7603f9e8ad4e62ef318e2ec0c86dfc81d656de24577a8a143f721fd0da028f17df25201ea13bd0a039a0a9cbbf3 +EBUILD grub-2.05_alpha20200110.ebuild 7372 BLAKE2B cb93bb07869e0d3525fbffa0f205aa53c7ad7444353169e3c25c6182581ce496f0e9cb862da7577a4126b4a70e7f579f14aca59cb5d03e77193e978fcb7471d9 SHA512 e03e8b8e9da1f117fd5972cc715b945349e23917cdbea8a0f1fcf5a5e0523f8f3ad6e532614c299e855ba71bed4691857e8a370de3078048afaaab671f7a591a +EBUILD grub-9999.ebuild 7623 BLAKE2B c902db0fd59ce8ef6330b89a33cfa104fecad90b7e922bac284656f2f39f1de0b4228e68cf2662d9c40da299b41fce3d8960e27b5f57b147ab02a6e6299ce658 SHA512 26e9ad7fbeb82e7203045eae27ab927c74f967c4201f2d75bc3950bc7f66f1b2611d4bdac9c442afaa9fc8e7b7e311173f25544689df1d325d21ae442f343a9a MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild index acd2c79e3794..c76287b57389 100644 --- a/sys-boot/grub/grub-2.02-r4.ebuild +++ b/sys-boot/grub/grub-2.02-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -7,7 +7,7 @@ GRUB_AUTOGEN=1 GRUB_AUTORECONF=1 if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + PYTHON_COMPAT=( python{2_7,3_{6,7}} ) inherit python-any-r1 fi @@ -56,7 +56,7 @@ DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="https://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" SLOT="2/${PVR}" IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs" diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild index e2119933d191..bdc25eef77bc 100644 --- a/sys-boot/grub/grub-2.04-r1.ebuild +++ b/sys-boot/grub/grub-2.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then fi if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + PYTHON_COMPAT=( python{2_7,3_{6,7}} ) inherit python-any-r1 fi @@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" S=${WORKDIR}/${P%_*} fi - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -51,7 +51,7 @@ DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="https://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" SLOT="2/${PVR}" IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild deleted file mode 100644 index 545017ee85a8..000000000000 --- a/sys-boot/grub/grub-2.04_rc1.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - GRUB_AUTORECONF=1 - GRUB_BOOTSTRAP=1 -fi - -if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - inherit python-any-r1 -fi - -if [[ -n ${GRUB_AUTORECONF} ]]; then - WANT_LIBTOOL=none - inherit autotools -fi - -inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -else - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-12.0.01 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" -SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs" - -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE=" - grub_platforms_coreboot? ( fonts ) - grub_platforms_qemu? ( fonts ) - grub_platforms_ieee1275? ( fonts ) - grub_platforms_loongson? ( fonts ) -" - -BDEPEND=" - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - fonts? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - test? ( - app-admin/genromfs - app-arch/cpio - app-arch/lzop - app-emulation/qemu - dev-libs/libisoburn - sys-apps/miscfiles - sys-block/parted - sys-fs/squashfs-tools - ) - themes? ( - app-arch/unzip - media-libs/freetype:2 - virtual/pkgconfig - ) - truetype? ( virtual/pkgconfig ) -" -COMMON_DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - sdl? ( media-libs/libsdl ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse:0 ) - truetype? ( media-libs/freetype:2= ) - ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - grub_platforms_xen-32? ( app-emulation/xen-tools:= ) -" -DEPEND="${COMMON_DEPEND} - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) - ) -" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !sys-boot/grub:0 !sys-boot/grub-static - nls? ( sys-devel/gettext ) -" - -RESTRICT="strip !test? ( test )" - -QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*" -QA_WX_LOAD="usr/lib/grub/*" -QA_MULTILIB_PATHS="usr/lib/grub/.*" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - pushd "${P}" >/dev/null || die - local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" - local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") - git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" - git-r3_checkout "${GNULIB_URI}" gnulib - popd >/dev/null || die - fi - default -} - -src_prepare() { - default - - sed -i -e /autoreconf/d autogen.sh || die - - # Nothing in Gentoo packages 'american-english' in the exact path - # wanted for the test, but all that is needed is a compressible text - # file, and we do have 'words' from miscfiles in the same path. - sed -i \ - -e '/CFILESSRC.*=/s,american-english,words,' \ - tests/util/grub-fs-tester.in \ - || die - - if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - python_setup - fi - - if [[ -n ${GRUB_BOOTSTRAP} ]]; then - eautopoint --force - AUTOPOINT=: AUTORECONF=: ./bootstrap || die - elif [[ -n ${GRUB_AUTOGEN} ]]; then - ./autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - eautoreconf - fi -} - -grub_do() { - multibuild_foreach_variant run_in_build_dir "$@" -} - -grub_do_once() { - multibuild_for_best_variant run_in_build_dir "$@" -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi*) platform=efi ;; - xen*) platform=xen ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - case ${MULTIBUILD_VARIANT} in - *-32) - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=i386 - fi ;; - *-64) - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=x86_64 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - fi ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable themes grub-themes) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use fonts; then - ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - fi - - if use themes; then - ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi - - local ECONF_SOURCE="${S}" - econf "${myeconfargs[@]}" -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - use static && HOST_LDFLAGS+=" -static" - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY RANLIB STRIP - tc-export BUILD_CC # Bug 485592 - - MULTIBUILD_VARIANTS=() - local p - for p in "${GRUB_ALL_PLATFORMS[@]}"; do - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) - done - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) - grub_do grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - grub_do emake - use doc && grub_do_once emake -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - grub_do emake check -} - -src_install() { - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" - - einstalldocs - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub -} - -pkg_postinst() { - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may consider installing the following optional packages:" - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn - optfeature "Enable RAID device detection" sys-fs/mdadm - fi -} diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild new file mode 100644 index 000000000000..488d6c8219e7 --- /dev/null +++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + GRUB_AUTORECONF=1 + GRUB_BOOTSTRAP=1 +fi + +if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then + PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + inherit python-any-r1 +fi + +if [[ -n ${GRUB_AUTORECONF} ]]; then + WANT_LIBTOOL=none + inherit autotools +fi + +inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs + +if [[ ${PV} != 9999 ]]; then + SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" +fi + +PATCHES=( + "${FILESDIR}"/gfxpayload.patch + "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch +) + +DEJAVU=dejavu-sans-ttf-2.37 +UNIFONT=unifont-12.1.02 +SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) + themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" + +DESCRIPTION="GNU GRUB boot loader" +HOMEPAGE="https://www.gnu.org/software/grub/" + +# Includes licenses for dejavu and unifont +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" +SLOT="2/${PVR}" +IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" + +GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) +IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" + +REQUIRED_USE=" + grub_platforms_coreboot? ( fonts ) + grub_platforms_qemu? ( fonts ) + grub_platforms_ieee1275? ( fonts ) + grub_platforms_loongson? ( fonts ) +" + +BDEPEND=" + ${PYTHON_DEPS} + app-misc/pax-utils + sys-devel/flex + sys-devel/bison + sys-apps/help2man + sys-apps/texinfo + fonts? ( + media-libs/freetype:2 + virtual/pkgconfig + ) + test? ( + app-admin/genromfs + app-arch/cpio + app-arch/lzop + app-emulation/qemu + dev-libs/libisoburn + sys-apps/miscfiles + sys-block/parted + sys-fs/squashfs-tools + ) + themes? ( + app-arch/unzip + media-libs/freetype:2 + virtual/pkgconfig + ) + truetype? ( virtual/pkgconfig ) +" +DEPEND=" + app-arch/xz-utils + >=sys-libs/ncurses-5.2-r5:0= + sdl? ( media-libs/libsdl ) + device-mapper? ( >=sys-fs/lvm2-2.02.45 ) + libzfs? ( sys-fs/zfs ) + mount? ( sys-fs/fuse:0 ) + truetype? ( media-libs/freetype:2= ) + ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) + ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) + grub_platforms_xen? ( app-emulation/xen-tools:= ) + grub_platforms_xen-32? ( app-emulation/xen-tools:= ) + grub_platforms_xen-pvh? ( app-emulation/xen-tools:= ) +" +RDEPEND="${DEPEND} + kernel_linux? ( + grub_platforms_efi-32? ( sys-boot/efibootmgr ) + grub_platforms_efi-64? ( sys-boot/efibootmgr ) + ) + !sys-boot/grub:0 !sys-boot/grub-static + nls? ( sys-devel/gettext ) +" + +RESTRICT="!test? ( test )" + +QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*" +QA_PRESTRIPPED="usr/lib/grub/.*" +QA_MULTILIB_PATHS="usr/lib/grub/.*" +QA_WX_LOAD="usr/lib/grub/*" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + pushd "${P}" >/dev/null || die + local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" + local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") + git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" + git-r3_checkout "${GNULIB_URI}" gnulib + popd >/dev/null || die + fi + default +} + +src_prepare() { + default + + sed -i -e /autoreconf/d autogen.sh || die + + # Nothing in Gentoo packages 'american-english' in the exact path + # wanted for the test, but all that is needed is a compressible text + # file, and we do have 'words' from miscfiles in the same path. + sed -i \ + -e '/CFILESSRC.*=/s,american-english,words,' \ + tests/util/grub-fs-tester.in \ + || die + + if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then + python_setup + fi + + if [[ -n ${GRUB_BOOTSTRAP} ]]; then + eautopoint --force + AUTOPOINT=: AUTORECONF=: ./bootstrap || die + elif [[ -n ${GRUB_AUTOGEN} ]]; then + ./autogen.sh || die + fi + + if [[ -n ${GRUB_AUTORECONF} ]]; then + eautoreconf + fi +} + +grub_do() { + multibuild_foreach_variant run_in_build_dir "$@" +} + +grub_do_once() { + multibuild_for_best_variant run_in_build_dir "$@" +} + +grub_configure() { + local platform + + case ${MULTIBUILD_VARIANT} in + efi*) platform=efi ;; + xen-pvh) platform=xen_pvh ;; + xen*) platform=xen ;; + guessed) ;; + *) platform=${MULTIBUILD_VARIANT} ;; + esac + + case ${MULTIBUILD_VARIANT} in + *-32) + if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then + local CTARGET=i386 + fi ;; + *-64) + if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then + local CTARGET=x86_64 + local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" + local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" + fi ;; + esac + + local myeconfargs=( + --disable-werror + --program-prefix= + --libdir="${EPREFIX}"/usr/lib + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + $(use_enable device-mapper) + $(use_enable mount grub-mount) + $(use_enable nls) + $(use_enable themes grub-themes) + $(use_enable truetype grub-mkfont) + $(use_enable libzfs) + $(use_enable sdl grub-emu-sdl) + ${platform:+--with-platform=}${platform} + + # Let configure detect this where supported + $(usex efiemu '' '--disable-efiemu') + ) + + if use fonts; then + ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die + fi + + if use themes; then + ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die + fi + + local ECONF_SOURCE="${S}" + econf "${myeconfargs[@]}" +} + +src_configure() { + # Bug 508758. + replace-flags -O3 -O2 + + # We don't want to leak flags onto boot code. + export HOST_CCASFLAGS=${CCASFLAGS} + export HOST_CFLAGS=${CFLAGS} + export HOST_CPPFLAGS=${CPPFLAGS} + export HOST_LDFLAGS=${LDFLAGS} + unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS + + tc-ld-disable-gold #439082 #466536 #526348 + export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" + unset LDFLAGS + + tc-export CC NM OBJCOPY RANLIB STRIP + tc-export BUILD_CC # Bug 485592 + + MULTIBUILD_VARIANTS=() + local p + for p in "${GRUB_ALL_PLATFORMS[@]}"; do + use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) + done + [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) + grub_do grub_configure +} + +src_compile() { + # Sandbox bug 404013. + use libzfs && addpredict /etc/dfs:/dev/zfs + + grub_do emake + use doc && grub_do_once emake -C docs html +} + +src_test() { + # The qemu dependency is a bit complex. + # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. + grub_do emake check +} + +src_install() { + grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" + use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" + + einstalldocs + + insinto /etc/default + newins "${FILESDIR}"/grub.default-3 grub + + # https://bugs.gentoo.org/231935 + dostrip -x /usr/lib/grub +} + +pkg_postinst() { + elog "For information on how to configure GRUB2 please refer to the guide:" + elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" + + if has_version 'sys-boot/grub:0'; then + elog "A migration guide for GRUB Legacy users is available:" + elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog + elog "You may consider installing the following optional packages:" + optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober + optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn + optfeature "Enable RAID device detection" sys-fs/mdadm + fi +} diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 6b165af82481..292e60b093fb 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then fi if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + PYTHON_COMPAT=( python{2_7,3_{6,7}} ) inherit python-any-r1 fi @@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" S=${WORKDIR}/${P%_*} fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="https://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" SLOT="2/${PVR}" IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index 9a35a4242876..d455a7d59329 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -4,6 +4,6 @@ DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992 DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93 EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608 -EBUILD plymouth-0.9.4-r1.ebuild 2737 BLAKE2B 4d19500584ce7cf9568829d3e58077632b79e3e3dacc610166626470f563ad5339ae55f83ca22ba01f6b4bc4dfea19a3a27e569648049c07630a9773d7549bf0 SHA512 6503f274400178498858564c20b53e5aafd762774f9c3f9cd96fc89c4b52f58923723aa3de492e2734789145e63cd5bbed2b891d80430bb6f1147e50ab18123b -EBUILD plymouth-9999.ebuild 2691 BLAKE2B a09eb144e11469b0af81e094dad79fcf2a50522ab26d24286dbf2ee22e70c216b071437304d2eb3dbac8dea72e22621f7adc74769d918410357aa772bf65d32d SHA512 68812de9973b89cdc93ef7015a812c24250dc9a2524d63d043eab121bc86a1d25ee9c404230435508f531d6cdfdfdd19ca46c0dea2872b2306c4b61f3b08a768 +EBUILD plymouth-0.9.4-r1.ebuild 2772 BLAKE2B d390aaa44d5720b80737ae37c9261397b3e00c721c56dd8a0a7a34d8936fa6b8f6283391155eea7158e67f3ac6de74056e40767f65932bfa7b7c3bc920f06616 SHA512 4d51fb929b95f4622598788705421ba9485b5692b3e134338e718bca1a0bceadceaddc90187e7ad4b53bd443372a1a43773d3d4c07df0c8f2d8cf8a655e3b2f8 +EBUILD plymouth-9999.ebuild 2726 BLAKE2B e0c136d41da63a030b7b7ea035b7753f3f193f7bc6eb9a70fa7518b8950f565618fce58d49c3cf405a64981b6a8f881204597ed6cf2e9404c90da1278845b1b8 SHA512 1e3dee3116536e25a6207ac038c8358405de5b4d5d4708e58ad25fcdf7ac3332ae2de96b140e650196a02ed60a664ed1113d80f6623883b480577fe3f2013bbd MISC metadata.xml 1135 BLAKE2B c2fe402798b480f8fcb790884bff76881768eb90b0ae74ef529a3a7850665f6912642b1079598c60d2010af79a77b4372f1608a71e81f08e0fa9ded75c1c37a7 SHA512 51c1ffb9a1dd25f5c2085fd4a5fa43dc9af3b10470411e4c15e7653df32f09db6b2f64795bbf0760c60206e82e2db396d05f04bc5dd92bbe945647902787b673 diff --git a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild index ca1a0bce4cbf..1ade24f98db6 100644 --- a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild +++ b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs" +IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs +udev" CDEPEND=" >=media-libs/libpng-1.2.16:= @@ -41,7 +41,7 @@ DEPEND="${CDEPEND} " # Block due bug #383067 RDEPEND="${CDEPEND} - virtual/udev + udev? ( virtual/udev ) ! ${P}.tar.gz https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" SLOT="0" diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild index 43b50f59cc77..b7c6d4eb4c21 100644 --- a/sys-boot/unetbootin/unetbootin-661.ebuild +++ b/sys-boot/unetbootin/unetbootin-661.ebuild @@ -8,7 +8,7 @@ inherit desktop qmake-utils DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive" HOMEPAGE="https://github.com/unetbootin/unetbootin" -SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz +SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" SLOT="0" diff --git a/sys-boot/unetbootin/unetbootin-675.ebuild b/sys-boot/unetbootin/unetbootin-675.ebuild index cfc39c26a046..dab61c00204f 100644 --- a/sys-boot/unetbootin/unetbootin-675.ebuild +++ b/sys-boot/unetbootin/unetbootin-675.ebuild @@ -7,7 +7,7 @@ inherit desktop flag-o-matic qmake-utils DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive" HOMEPAGE="https://github.com/unetbootin/unetbootin" SRC_URI=" - ${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~jer/${P}-qt5.patch.xz " diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index 636c4fbc4950..3af229588091 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,6 +1,7 @@ AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3 -DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048 +AUX vboot-utils-80-musl-fts.patch 428 BLAKE2B b36b902b045906324e0553f6acba4a760d11289d1d68b38bcfd6c4c6531493f0c778fb2539cb5f19604f8705ceee3dcc2b30caab87f2114ee485345d9b0d7d79 SHA512 59a11a87d9cd4596df749c8dfd188f90818c09a432805cfbb47d02cd13228561af345a336bfd502d205a94ca432cff539ba1ea684542e86f13d6dfdea3db0d41 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe -EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e +DIST vboot-utils-80_p20200108.tar.xz 18448212 BLAKE2B f7e375133fb6dc90def1e22c42c7511a3b649c34d067a447f44fb99c1ec37a73d034837c2212e5d6ad368a4f4b011c8cb9eb479e81db4a52b1160cda99382a77 SHA512 077d137d8fe89f35b6f7ec6408b2e9fc7a28765b0987646c1964e6e0c039e359711ab79958c45ee555a0fe810997217225d072a7f1011b1c73c4aefb4e57fcc1 EBUILD vboot-utils-72_p20181229-r1.ebuild 2594 BLAKE2B f586492f5f860ddb24715616d788268f7576fd24a4b24e4b13c34cb0e88f28e1c3d1e83c6b2769b7db9b7abfc6e9260155366b44420e4d8acdebf65949e865f0 SHA512 146556fae5811a92a995e58b059f4f0afefd84e979e19d5b0869aac9cfe717966fa984eb19ef1398c149b9861bb6fd1d06f755b04a34b1d211c7fbbd5db8fe6e -MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914 +EBUILD vboot-utils-80_p20200108.ebuild 2800 BLAKE2B 24e32895f0a84865643a062fd873f535b27ca7ea89d55f7c4cbc3b09730f0eba3127ceddffa89830e0deb638505cfc7c28e59529af8b3ae71be0986b57ffe0d1 SHA512 59ddc28a5c5ba959dcc2a7a0207efadedcadb1ff01db596a67705b66abc0998fe4922a1b94ebebcd178aafc2ba88437ce8a50ed9c810f41bb8a4c3b44c7388e5 +MISC metadata.xml 552 BLAKE2B 972282f45e6ca80d35ee7a4dae2a146140011b712af1ef60cdb35688edb95a44cdf330a5073b0963331955465e5c57be65e43973bd437db94935985a630c3a30 SHA512 d53e7b64d40848c539e95d7a888018ddea177eeeae3d3a3da95ecd6a33c79630215a49159c6b4095475a84ed475c01a7f8d759ad392ee154468ac8deb9cddb54 diff --git a/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch new file mode 100644 index 000000000000..bd291f9138e1 --- /dev/null +++ b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch @@ -0,0 +1,17 @@ +--- a/Makefile ++++ b/Makefile +@@ -231,4 +231,7 @@ + ifndef HAVE_MUSL + CFLAGS += -DHAVE_EXECINFO_H ++# Musl doesn't have fts.h so enable linking to the standalone lib. ++else ++ MUSL_LIBS := -lfts + endif + +@@ -1043,5 +1046,5 @@ + + # FUTIL_LIBS is shared by FUTIL_BIN and TEST_FUTIL_BINS. +-FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ++FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${MUSL_LIBS} + + ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS} diff --git a/sys-boot/vboot-utils/metadata.xml b/sys-boot/vboot-utils/metadata.xml index 7cf6be5c254f..c4bb35a0e1b7 100644 --- a/sys-boot/vboot-utils/metadata.xml +++ b/sys-boot/vboot-utils/metadata.xml @@ -9,4 +9,7 @@ zmedico@gentoo.org - + + Use dev-libs/libzip. + + diff --git a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild deleted file mode 100644 index 12b8ef351c9f..000000000000 --- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -# This is the latest commit in the latest branch. -GIT_SHA1="748af73c67abf473d45bbacd708ce79bfc264ff5" - -DESCRIPTION="Chrome OS verified boot tools" -HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot" -# Can't use gitiles directly until b/19710536 is fixed. -#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="libressl minimal static" - -LIB_DEPEND=" - !libressl? (