From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- sys-boot/Manifest.gz | Bin 7387 -> 7391 bytes sys-boot/grub/Manifest | 7 +- sys-boot/grub/grub-2.02-r1.ebuild | 311 -------------------- sys-boot/grub/grub-2.02-r2.ebuild | 312 --------------------- sys-boot/grub/grub-2.02-r3.ebuild | 4 +- sys-boot/grub/grub-9999.ebuild | 102 +++---- sys-boot/raspberrypi-firmware/Manifest | 18 +- sys-boot/raspberrypi-firmware/metadata.xml | 13 +- .../raspberrypi-firmware-1.20160209.ebuild | 47 ---- .../raspberrypi-firmware-1.20160309.ebuild | 47 ---- .../raspberrypi-firmware-1.20190215.ebuild | 60 ++++ .../raspberrypi-firmware-1_pre20130807.ebuild | 61 ---- .../raspberrypi-firmware-9999.ebuild | 33 ++- sys-boot/syslinux/Manifest | 3 +- .../syslinux-6.04_pre1-singleloadsegment.patch | 304 ++++++++++++++++++++ sys-boot/syslinux/syslinux-6.04_pre1.ebuild | 1 + sys-boot/systemd-boot/Manifest | 10 +- .../233-Force-libsystemd-shared-to-be-static.patch | 25 -- .../systemd-boot/files/235-libshared-static.patch | 24 -- sys-boot/systemd-boot/systemd-boot-233.ebuild | 111 -------- sys-boot/systemd-boot/systemd-boot-235.ebuild | 108 ------- sys-boot/systemd-boot/systemd-boot-237.ebuild | 110 -------- sys-boot/systemd-boot/systemd-boot-241.ebuild | 115 ++++++++ 23 files changed, 575 insertions(+), 1251 deletions(-) delete mode 100644 sys-boot/grub/grub-2.02-r1.ebuild delete mode 100644 sys-boot/grub/grub-2.02-r2.ebuild delete mode 100644 sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild delete mode 100644 sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild create mode 100644 sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild delete mode 100644 sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild create mode 100644 sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch delete mode 100644 sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch delete mode 100644 sys-boot/systemd-boot/files/235-libshared-static.patch delete mode 100644 sys-boot/systemd-boot/systemd-boot-233.ebuild delete mode 100644 sys-boot/systemd-boot/systemd-boot-235.ebuild delete mode 100644 sys-boot/systemd-boot/systemd-boot-237.ebuild create mode 100644 sys-boot/systemd-boot/systemd-boot-241.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index c2ca0500b1c4..a287d2b6bd8e 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 8a71fb424664..bf5e8043a779 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -9,9 +9,8 @@ AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2121 BLAKE2B 398195f59537d40a4f61eadf5be9 AUX grub.default-3 2532 BLAKE2B f59b8e862b7069603a975327d51507aae4568bfc80d7aa237f620008b00520a5a14b0c95e3f9c277360e1dfafc83bcc815970b47a69bf469ad7e594956f47c60 SHA512 2faf5e730331b7d04045ee64d990227ef02f1b14a1cf88b5b71a18c91a9a8cba773a601eb3f5442092f6937935efed02629a278bd6822fac60f9c72045e4b13d DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 +DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 -EBUILD grub-2.02-r1.ebuild 7893 BLAKE2B 92ad17d49dd9269a72b8d9b6ad9820a35fd9f5655f72f6ceb54ec844c7b3643b3b839f8463a705dc30a0a2343db8b69b19aff494b5d19ac9b30f7b0aed53fc92 SHA512 1b679bda35c9dadfcf51f4d4a2e9349ee376a245dafc9e3c982dff775307b6fc659afb51a05795a812178bce9bccdf3ccde5faa7568bb036974f45c3cb9f0aa4 -EBUILD grub-2.02-r2.ebuild 7916 BLAKE2B 190da5db46c892cb23a1299fbd9d1bfd4b281433cbae0e0ac2dd5bf66965731f6a534bbf33febd72d3d233b578a423851ef0a79518a00c35f25bf93163d6aca7 SHA512 ad247ed42852e1683a15cdbb1b9bb15dac97682d88c0598e5e6cc69b2725826d49a337e70a614d8ae5fbce63cd49b96bd6725a9fa2b88c8a622c96260414cab3 -EBUILD grub-2.02-r3.ebuild 7991 BLAKE2B 6cfc137c0229fae5063f29bdb31eefa8465f8fd8e0abf929ab6fec24ac5267d335544af9deb6403ec41e18c3a20d9388dc84c84102a5c3a32117f6b594408ade SHA512 12ca8fb5f01c62891feb9a9d38cef4605e8e2971b9592a20781cfa4f5c7c5c29fa34138cca0bfd26050cb102a456bf83499533d39fe26ecfac2361306312939b -EBUILD grub-9999.ebuild 7726 BLAKE2B c6656be3322b8f8506af69888313e5e08f1a939fd16d35efc76ab929536c74f0840059b23567b76e531aa86bc56f5ef19e955af29a2e56f78f9f542e6a6c73cf SHA512 0b5b54f12d5a3354b9bded9b9eac2e82029aff5d02d4f53fb1e38e8afc097ad15385c4e20de1b71aea301bd3bccc962448ee296986959a7bbab51a52f75f415e +EBUILD grub-2.02-r3.ebuild 7989 BLAKE2B e2b0f83371bb78715e19074d7e4c7761357b1475856afce13184214403df205c3b2d010c8a7fde754aa05257f3ab3624c9a9a1a76e198e8d5849f5e9443a7bdd SHA512 64d71a99cd808c4c430f110a4c3d4d4c8e400b8a018df34b61b8876afbe5f2ef9067f885cdc6e8139f427d3c4222c25ac35eef06d376f2ea36ffd897c8a2788b +EBUILD grub-9999.ebuild 7760 BLAKE2B dae14cc051202ad4d108fa87c0a807eb6e56a37f5e8ee9d3856d2a906253fe613525f55b48687c66cb56fd95c0b2325fb3239f7c537b62cf3357ffdeecca4cc8 SHA512 6ce034bc107994049df25ebff3909da4bbf6ee5d5619836c7824ebfeda7e7e7d8d7352afacae662a270d9715e6b2ed9ae1e0b5cef37963b7bc9851cef9edf410 MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild deleted file mode 100644 index 95b66ff669f5..000000000000 --- a/sys-boot/grub/grub-2.02-r1.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GRUB_AUTOGEN=1 -GRUB_AUTORECONF=1 - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} ) - 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 x86" -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch - "${FILESDIR}"/2.02-multiple-early-initrd.patch - "${FILESDIR}"/2.02-freetype-capitalise-variables.patch - "${FILESDIR}"/2.02-freetype-pkg-config.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-9.0.06 -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="debug device-mapper doc efiemu +fonts mount multislot 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 ) -" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -COMMON_DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - debug? ( - 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 sys-apps/powerpc-utils ) - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) -" -DEPEND="${COMMON_DEPEND} - ${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 - ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - grub_platforms_xen-32? ( app-emulation/xen-tools:= ) - 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 - ) - ) - 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 ) -" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !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 - fi - default -} - -src_prepare() { - default - - sed -i -e /autoreconf/d autogen.sh || die - - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - - # 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} ]]; then - python_setup - bash autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - autopoint() { :; } - 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 debug mm-debug) - $(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 sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - # Set up font symlinks - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use themes; then - ln -s "${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 - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - 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.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild deleted file mode 100644 index 0075aa08c231..000000000000 --- a/sys-boot/grub/grub-2.02-r2.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GRUB_AUTOGEN=1 -GRUB_AUTORECONF=1 - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} ) - 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 ~ppc64 ~x86" -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch - "${FILESDIR}"/2.02-multiple-early-initrd.patch - "${FILESDIR}"/2.02-freetype-capitalise-variables.patch - "${FILESDIR}"/2.02-freetype-pkg-config.patch - "${FILESDIR}"/2.02-xfs-sparse-inodes.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-9.0.06 -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="debug device-mapper doc efiemu +fonts mount multislot 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 ) -" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -COMMON_DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - debug? ( - 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 ) -" -DEPEND="${COMMON_DEPEND} - ${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 - ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - grub_platforms_xen-32? ( app-emulation/xen-tools:= ) - 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 - ) - ) - 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 ) -" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !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 - fi - default -} - -src_prepare() { - default - - sed -i -e /autoreconf/d autogen.sh || die - - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - - # 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} ]]; then - python_setup - bash autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - autopoint() { :; } - 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 debug mm-debug) - $(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 sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - # Set up font symlinks - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use themes; then - ln -s "${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 - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - 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.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild index f40c9c795298..8067036a24cc 100644 --- a/sys-boot/grub/grub-2.02-r3.ebuild +++ b/sys-boot/grub/grub-2.02-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -28,7 +28,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 ppc ppc64 x86" else inherit git-r3 EGIT_REPO_URI="git://git.sv.gnu.org/grub.git diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 662c83807eeb..1a0431125250 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == 9999 ]]; then - GRUB_AUTOGEN=1 GRUB_AUTORECONF=1 + GRUB_BOOTSTRAP=1 fi -if [[ -n ${GRUB_AUTOGEN} ]]; then +if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} ) inherit python-any-r1 fi @@ -42,7 +42,7 @@ PATCHES=( ) DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-9.0.06 +UNIFONT=unifont-12.0.01 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" @@ -52,7 +52,7 @@ 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="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs" +IUSE="debug 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_}" @@ -64,22 +64,7 @@ REQUIRED_USE=" grub_platforms_loongson? ( fonts ) " -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -COMMON_DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - debug? ( - 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 ) -" -DEPEND="${COMMON_DEPEND} +BDEPEND=" ${PYTHON_DEPS} app-misc/pax-utils sys-devel/flex @@ -90,17 +75,6 @@ DEPEND="${COMMON_DEPEND} media-libs/freetype:2 virtual/pkgconfig ) - grub_platforms_xen? ( app-emulation/xen-tools:= ) - grub_platforms_xen-32? ( app-emulation/xen-tools:= ) - 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 - ) - ) test? ( app-admin/genromfs app-arch/cpio @@ -118,12 +92,38 @@ DEPEND="${COMMON_DEPEND} ) truetype? ( virtual/pkgconfig ) " +COMMON_DEPEND=" + app-arch/xz-utils + >=sys-libs/ncurses-5.2-r5:0= + debug? ( + 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 ) ) - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static ) + !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext ) " @@ -136,6 +136,12 @@ 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 } @@ -145,11 +151,6 @@ src_prepare() { sed -i -e /autoreconf/d autogen.sh || die - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - # 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. @@ -158,13 +159,18 @@ src_prepare() { tests/util/grub-fs-tester.in \ || die - if [[ -n ${GRUB_AUTOGEN} ]]; then + if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then python_setup - bash autogen.sh || die + 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 - autopoint() { :; } eautoreconf fi } @@ -219,14 +225,12 @@ grub_configure() { $(usex efiemu '' '--disable-efiemu') ) - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) + if use fonts; then + ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die fi - # Set up font symlinks - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die if use themes; then - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die + ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die fi local ECONF_SOURCE="${S}" @@ -282,10 +286,6 @@ src_install() { einstalldocs - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - insinto /etc/default newins "${FILESDIR}"/grub.default-3 grub } diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest index 12128d7850ca..15a974819ce0 100644 --- a/sys-boot/raspberrypi-firmware/Manifest +++ b/sys-boot/raspberrypi-firmware/Manifest @@ -1,17 +1,7 @@ AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 BLAKE2B 2435f2d4f1dc4c1283e19459bc07fb3fb569042e13724d10c5ae18490fc9f04e0ed4e910947414761386d32fd678c6031d5e53cfb2804d5f547d77dd47ffb840 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f AUX raspberrypi-firmware-0_p20130711-config.txt 1706 BLAKE2B a7086f2f91a3eb26887d6cb2e0edc74282b8c91ae1a6691071cafa29f455b9caff7f597a9a9df88250e6dab3fa74b742bd7733d7de24e150da3c64d1e09bc18e SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7 -DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 BLAKE2B 10453495af56d4f50859ec2ee4bdccbba131518b1460dfdf61143d7e7965ccb53b7bf83a4ddc340caa88bb6653762ec58a55fbaf3e7fd72c65c714ce1df489b8 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2 -DIST raspberrypi-firmware-1.20160309.tar.gz 115673896 BLAKE2B d08101180cd7373f9e93817ee8adc0c2798ff3f53e8a488232fff186707a602e38d916fee292662eac8858d7da857f66f10bac9837e479d657013d985b48d709 SHA512 30a6396ef52355c6f6404354645e8d0f5bbf70332b0e1661dfa8ef3456154d07e105d3b7b5bd64efb3e7397fa2fb8c36de1aa78040dc4118060b26949c2ab884 -DIST raspberrypi-firmware-b2dbc04508-bootcode.bin 17816 BLAKE2B acd5b04051d6f721fd15463b5f52b4592fd41c1612c40d56f1552d65cb68c0991bcd2c0478aefd51f415ddf6df04941d1f717941b91961d1cc761740c09c7124 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 -DIST raspberrypi-firmware-b2dbc04508-fixup.dat 5742 BLAKE2B a5b78c9655e66f6b24ddf236677f2cd4b8dcb529f476f0734671db2b69aabdba7bbf791c770dca55278900ddb2ade453fd516542656f795c73271af040c83030 SHA512 f701fce3db35bfcd204ca7130aa0db1a77a5c83815409ac0b85f1a57e495aea6cbdf81db985436b33b8862545a271743ea2edefd3b7c9ac0a5e5e30bafd206f3 -DIST raspberrypi-firmware-b2dbc04508-fixup_cd.dat 2032 BLAKE2B 7974f6f3a75da27667344c31cb457cafd5d6ef4dec6ff6cd936088c6eccf9f62e492f77d164f80c115357cefaf35446fab6e5843704da9a771ec1a144f59066a SHA512 c6b8b6fb7bc99f77c3aee5d51e1e07a5f9c4119d2ec64ade335315c0c28a2f6d310463a48b0becb424198d3771dc079fda1c15bb03b18c125bfb1b32f5c9867f -DIST raspberrypi-firmware-b2dbc04508-fixup_x.dat 8693 BLAKE2B 860f75afd28f5b80324a5b37bf99bd83a9eec61b7006a6d5082f5331e42a01498b4d489236fb732fd0308ed63d273e7899a0964ddb24f72889d389b0b9cf8e04 SHA512 ea407fd4b6422a7c932e118260cebd4c578a15bbbbea07e76bf1175b9bf9776e006172997d085e50a2a2a28965afd036a66450b1f0b17fcda741f9f02673c20f -DIST raspberrypi-firmware-b2dbc04508-start.elf 2494932 BLAKE2B 9e878a2d93414732c9995abaf120dc61323155b40e30223f87aed79fc9bc0c6ab4fd0f7d8f0094d5a8679afb153071b207c1bd1a7d9f7a770c3b745201058439 SHA512 bc1f5590de691b10bd375bc20acfe18a8658e4109736af4280ef7a3331024b61162330d8d687aca7da78bdb160beefd8bc38c90791e3e320282b8e98e091f670 -DIST raspberrypi-firmware-b2dbc04508-start_cd.elf 469560 BLAKE2B 176e89e0703c854584237949186e5403b32509b53329a0634195dfa1354e3621a19d1fd820bcc297888e56149a7f05852fa8a7c451593c7654ceddc339067a53 SHA512 bbd4b519ef6f830db7efdbb62f7f308a6092b9e99279fea96307771da08bf12898c664165d6dbd556799162728a479c1d0e1f8fd67ef2c2a7c731354dbea9d99 -DIST raspberrypi-firmware-b2dbc04508-start_x.elf 3462244 BLAKE2B b94b8cfb1eb4ad4c41534381ff308b257a094cf7841519f6d933b3365b0e1554264b76bb39456932e1f8283223e9aba34a0d0409a80c1983023efe9d8a086315 SHA512 4efb07958838d339b5635465e890cc433d734a47a5ec2d3e8b512755decc4fbffdd6b68f14c09b63284215f6b9d7716c222d77f18de0c783daa895e208796d2d -EBUILD raspberrypi-firmware-1.20160209.ebuild 1156 BLAKE2B c45a7dd89ac3a7f40e14c90319e6efab4eb0da71b37243823eb2501ce53a503a6b077df7fff4aafae5e17a4b03b74b5f0deebc8a56b9edbb002df89ea64bdbf4 SHA512 b28b1633169d77f939ac0853898c828b34c0ba73589e20858ad07e836bdd604bd9392fe84d24e729b1eca360190a853461e04e87a08889a8e3e97df5a1fc83f5 -EBUILD raspberrypi-firmware-1.20160309.ebuild 1156 BLAKE2B c45a7dd89ac3a7f40e14c90319e6efab4eb0da71b37243823eb2501ce53a503a6b077df7fff4aafae5e17a4b03b74b5f0deebc8a56b9edbb002df89ea64bdbf4 SHA512 b28b1633169d77f939ac0853898c828b34c0ba73589e20858ad07e836bdd604bd9392fe84d24e729b1eca360190a853461e04e87a08889a8e3e97df5a1fc83f5 -EBUILD raspberrypi-firmware-1_pre20130807.ebuild 1639 BLAKE2B 25a4036ffbaa562752ee9d5452fecf0a8bc8cf30a22e2dd128d6703887e57a703653f9b5410f67412da4ce3a3c5481c85e5d3f405931d4676a7ba1d92684690f SHA512 ac655e12570990ad9bf7381b4205bddd4bb8a6248001f9b9def2988bcc3ec30ee828332423b993fed86dffeeaf94f48d0d21dab9c91da88a26329841c40a59fe -EBUILD raspberrypi-firmware-9999.ebuild 1451 BLAKE2B 25f9ffe8bf55f56d060fd1f82f93d0b22940aa4644664e8e4dc5fee0fe559305a5662abfa85bf4a4a46629e02b8121367f6f421053cc73fd6a12f7ded759b80e SHA512 464eb652775d28e50aec7e7777826455376724ba0f66f76b731b72715cf492600f4de81f518e3967d5a23fa118ff614dda377059920af6d29b51a8d5b1013aa1 -MISC metadata.xml 252 BLAKE2B 1c461429fdbec0a9f4de8dc86ced8c4962e1abffff9c40e54f33d68de319ed7fe39f583330dd1b233894ad198d0d317ff27d7f4949ecdc295e953d86c6214df7 SHA512 354547f73138a569b9313cfa5a36de392e6b67909d55b7b2b36ff56896ec0321ecc2ef914caa4bf28f350674a74aeecbec4f971554072fd589db78d5107bc507 +DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193 +EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce +EBUILD raspberrypi-firmware-9999.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce +MISC metadata.xml 566 BLAKE2B 34fdc67dfee82a26f5e945fe7f63c2d239cc643a1aa5e4c4892facdd993c461a7ddc74fb5057e9429ab1eff4a39176398817dddcf2efa2e235a268d335c7f3db SHA512 ac35994d0f0432c9a0ee2e171b19a1e8d8a0c1f2d597b2489c37179b07ea86a0e94ac5d83e43348e65a01b64fade71022cf6e2ec83a779eb6b816b3907370daa diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml index 7775715c3dae..ce5947791ef2 100644 --- a/sys-boot/raspberrypi-firmware/metadata.xml +++ b/sys-boot/raspberrypi-firmware/metadata.xml @@ -1,7 +1,18 @@ - + + ck+gentoo@bl4ckb0x.de + Conrad Kostecki + + + proxy-maint@gentoo.org + Proxy Maintainers + + + andrey_utkin@gentoo.org + Andrey Utkin + raspberrypi/firmware diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild deleted file mode 100644 index 7dc51e4b7b0b..000000000000 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo - -DESCRIPTION="Raspberry PI boot loader and firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" -KEYWORDS="~arm -*" -IUSE="" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${P/raspberrypi-} - -RESTRICT="binchecks strip" - -pkg_preinst() { - if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then - ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place" - fi -} - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - rm boot/{kernel{,7}.img,COPYING.linux,LICENCE.broadcom} || die - insinto /boot - doins -r boot/* - - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - -DOC_CONTENTS=" config.txt and cmdline.txt need to be generated by you -More information here: -https://www.raspberrypi.org/documentation/configuration/config-txt.md -Another good source http://elinux.org/RPi_config.txt -http://elinux.org/RPi_cmdline.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild deleted file mode 100644 index 7dc51e4b7b0b..000000000000 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160309.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo - -DESCRIPTION="Raspberry PI boot loader and firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" -KEYWORDS="~arm -*" -IUSE="" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${P/raspberrypi-} - -RESTRICT="binchecks strip" - -pkg_preinst() { - if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then - ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place" - fi -} - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - rm boot/{kernel{,7}.img,COPYING.linux,LICENCE.broadcom} || die - insinto /boot - doins -r boot/* - - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - -DOC_CONTENTS=" config.txt and cmdline.txt need to be generated by you -More information here: -https://www.raspberrypi.org/documentation/configuration/config-txt.md -Another good source http://elinux.org/RPi_config.txt -http://elinux.org/RPi_cmdline.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild new file mode 100644 index 000000000000..4b06dfa49939 --- /dev/null +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit mount-boot readme.gentoo-r1 + +DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" +HOMEPAGE="https://github.com/raspberrypi/firmware" +LICENSE="GPL-2 raspberrypi-videocore-bin" +SLOT="0" + +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/raspberrypi/firmware" + EGIT_CLONE_TYPE="shallow" +else + SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="-* ~arm" + S="${WORKDIR}/firmware-${PV}" +fi + +RESTRICT="binchecks strip" + +pkg_preinst() { + if [ -z "${REPLACING_VERSIONS}" ] ; then + local msg="" + if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then + msg+="/boot/cmdline.txt " + fi + if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then + msg+="/boot/config.txt " + fi + if [ -n "${msg}" ] ; then + msg="This package installs following files: ${msg}." + msg="${msg} Please remove(backup) your copies durning install" + msg="${msg} and merge settings afterwards." + msg="${msg} Further updates will be CONFIG_PROTECTed." + die "${msg}" + fi + fi +} + +src_install() { + insinto /boot + cd boot || die + doins bootcode.bin fixup*.dat start*elf + doins *.dtb + doins -r overlays + newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt + newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt + newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} + +DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild deleted file mode 100644 index b4a3474a5182..000000000000 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit readme.gentoo - -DESCRIPTION="Raspberry PI boot loader and firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -MY_COMMIT="b2dbc04508" -SRC_URI="" -for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do - SRC_URI="${SRC_URI} https://github.com/raspberrypi/firmware/raw/${MY_COMMIT}/boot/${my_src_uri} -> ${PN}-${MY_COMMIT}-${my_src_uri}" -done - -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" -KEYWORDS="~arm -*" -IUSE="" - -DEPEND="" -RDEPEND="!sys-boot/raspberrypi-loader" - -S=${WORKDIR} - -RESTRICT="binchecks strip" - -src_unpack() { :; } - -pkg_preinst() { - if [ -z "${REPLACING_VERSIONS}" ] ; then - local msg="" - if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then - msg+="/boot/cmdline.txt " - fi - if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then - msg+="/boot/config.txt " - fi - if [ -n "${msg}" ] ; then - msg="This package installs following files: ${msg}." - msg="${msg} Please remove(backup) your copies durning install" - msg="${msg} and merge settings afterwards." - msg="${msg} Further updates will be CONFIG_PROTECTed." - die "${msg}" - fi - fi -} - -src_install() { - insinto /boot - local a - for a in ${A} ; do - newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-} - done - newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt - newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - -DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild index 8cdb8f63caa8..4b06dfa49939 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit git-r3 readme.gentoo +inherit mount-boot readme.gentoo-r1 -DESCRIPTION="Raspberry PI boot loader and firmware" +DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" HOMEPAGE="https://github.com/raspberrypi/firmware" -SRC_URI="" - LICENSE="GPL-2 raspberrypi-videocore-bin" SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND="" -RDEPEND="!sys-boot/raspberrypi-loader" -EGIT_REPO_URI="https://github.com/raspberrypi/firmware" +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/raspberrypi/firmware" + EGIT_CLONE_TYPE="shallow" +else + SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="-* ~arm" + S="${WORKDIR}/firmware-${PV}" +fi RESTRICT="binchecks strip" @@ -42,8 +43,8 @@ pkg_preinst() { src_install() { insinto /boot - cd boot - doins bootcode.bin COPYING.linux fixup*.dat LICENCE.broadcom start*elf + cd boot || die + doins bootcode.bin fixup*.dat start*elf doins *.dtb doins -r overlays newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt @@ -52,4 +53,8 @@ src_install() { readme.gentoo_create_doc } +pkg_postinst() { + readme.gentoo_print_elog +} + DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest index 7022b8f98e88..1219da9b2806 100644 --- a/sys-boot/syslinux/Manifest +++ b/sys-boot/syslinux/Manifest @@ -1,6 +1,7 @@ AUX syslinux-3.86-nopie.patch 551 BLAKE2B a9084a7d4898e8f3fc9d152adcab15b0b294df0c79c26dc166fe942d48086f59ef806502e317ee82a47b2e1dd24b1b545ba3e241c1ad7e87d601b11f6d23ba71 SHA512 340a458817f45ac6a81721745e470c30e2ac02aa10ed174e77ea224fba4f1919cb9faf9c5fac2233d5b081a43339bb3dc0c35420afb3a9c134c754835ff89582 AUX syslinux-4.05-nopie.patch 519 BLAKE2B 9ffea4b38c2f6de65883b256d83b270a4f3e3642827e4de9b711d396a1f3d386f9d894802cf22fcc7c64e8f3528ebfcb252e5db47f4bea586fcb4e110eb581ef SHA512 75160574c024bd841cd5e098d81f89c8532153cfd98beb17ca1549e0bdd7106d6494e8436e56560d3e501318fd8109b5f5765d244dcdfcbfc5306d35f9cbb4a8 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549 +AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a DIST syslinux-3.86.tar.bz2 3735823 BLAKE2B b5c03462183bc1be37d82c4995da2911e5c70d08eefb9f01c731e1d77e2df9c1ac29fcea6f58a94bc67094af8e415993783929979209a74826e773e9c35ba803 SHA512 6231f233e5f5ac26aa7e4bfd2704e2a4081350a3f3f21b5ec88a13cf992528c2796dbdfdf6cc2cc7a9543828650ae46de3685e5e55fac3a6ad520430220d1073 DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 @@ -10,5 +11,5 @@ EBUILD syslinux-3.86.ebuild 1470 BLAKE2B caa769b29ff3b1eec3cbe6dfaa592a7e13d497b EBUILD syslinux-4.07.ebuild 1766 BLAKE2B 7deb22867d34e77ddfe38fd91a483bd219a9ca642ecd1b505f451928f8a9eb0f5fbe07b0e4548e814fccf8b871ecba519c7c2df79b8635dd6541f17269692b05 SHA512 34cd4118736926d0254a7bf0d7e18b12c3b151549057cb2559ff9517fec5aee7e02889c934a8bcb2f0801fd9ab5121eec3a86b8d116e0421d09263e6c70d3363 EBUILD syslinux-5.10.ebuild 2219 BLAKE2B f0ac630efca67b5600c267e3aa7f17c4c227437bc0e9afac60cefaf46aaa30d78c57582e716060bd9b3a6e57e2bf2a84f002804d94be484be11d019fc98a163c SHA512 2c04378b5d5d89e2d92ed1bb8d9cd8752ef8aa5abf77098110f6df39c79e420c66dc6ab1fbababd36c60d84fba3ad442d3bf04d053bd8333d18f16b464839939 EBUILD syslinux-6.03.ebuild 3410 BLAKE2B fdfef0f6d7e65af38cce92bb82cc75a582e97a753b7fbe1dd3b42c2ff31408b8c43c8c4502145d2684cdd33526a7b33ae9c2475c8e011a5a25fd4e041af68109 SHA512 f6a265acbf4e53c4bb142db3a36cef199edfface74fcf2d9755ffa5289c7716c5604055ae822e19f5d6ac4d9d5d94edb6398a0beb2640c61375b8e41a4944cbe -EBUILD syslinux-6.04_pre1.ebuild 3419 BLAKE2B 7b0608a5920926be6d83cc6083164f386781f081bc68ac917c534be6d0849e90df7c0ae42b9ad8df63cb6e04734d2cd53cdcc4f19639db93fa045266cf8a0ea0 SHA512 48688c01d97c1deeb29765758236802631bd0c6422cb804b223b7eba5dfcf9a3b6e341f866eb3a232e2445aaf2713d04b8bcdbdeedfa216f08cfbd39f24abae8 +EBUILD syslinux-6.04_pre1.ebuild 3478 BLAKE2B 1ac8784af49e9c7d4aa1ddad6b839421b91b561e3137e3f999bd61e77187b129b6717397df8ed734245cd9de1c7df2cde38ad0d40cc046a970074af1ca1781d2 SHA512 5247a0696b81fa4d78df0e50753456086d88fdc15b5bcdd7ef33a54dc67a1a941abdd1dea1c9de35d487c39981642665963489ce5741da18a6eee2fb28ac992e MISC metadata.xml 330 BLAKE2B bfb2aae9b13d232ca01f0ed74b99385c056ecbf59dba80999ff840c7885450158b44d32bdb9ec51f078e1d3c3f839cf6f9bf6432b0998aa62538d39dfc0a3850 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch new file mode 100644 index 000000000000..db9b7d0a137b --- /dev/null +++ b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch @@ -0,0 +1,304 @@ +Author: Lukas Schwaighofer +Description: Force the linker to put all sections into a single PT_LOAD + segment. This is required when using binutils >= 2.31 which writes two PT_LOAD + segments by default. This is not supported by the wrapper.c script used to + convert the shared object into an elf binary. +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html + +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..5b4589d 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..cad28a8 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild index 026381ff5364..5ad853d33dbf 100644 --- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild +++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild @@ -45,6 +45,7 @@ src_prepare() { rm -f gethostip #bug 137081 epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928 + epatch "${FILESDIR}"/${P}-singleloadsegment.patch #662678 # Don't prestrip or override user LDFLAGS, bug #305783 local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 7bed43799dc5..4f6b94eb652a 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,15 +1,9 @@ -AUX 233-Force-libsystemd-shared-to-be-static.patch 601 BLAKE2B 2473eb2d2a355e468a7d994637ae10f22f08001b57e5e05ccef7636754ca448f46513fc33a54e8349b7444676bad6c0f03f5f7943f37a65e914efbb27f4ed321 SHA512 05e666114764a97d20bf115e1b114035fc882b101ad01bde8864a31385886e0711e4b37e03d713052aa985503cf7a94eeb5d28c33cc4a504cbb4fc263998d4e1 -AUX 235-libshared-static.patch 968 BLAKE2B 8979c8fa294d1dc3a0356e32ff1a6d15bd3b3a93d5f9bacbbd137bbc38931ae5ec383ecc9ca237e62b80353ac36cd1c0b8df96ff1afd86e1a43c2601574fae01 SHA512 b37a097a14a455f91e1f1f2b00782aa5f1af4e201bbc9c2ebd69b4bb426cabc9d169733f70e09caf8fa36ae62f3eb44d5f7b805bb242310d18c94230f18835ee AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46 AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e -DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e -DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 -DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f -EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8 -EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d -EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1 +DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e EBUILD systemd-boot-239.ebuild 2424 BLAKE2B ec26000bf32d10242e876af86e401d249c64c58519bd2855d793d2809395b72355f4656e5a1ab5a68c0c10dff9a9fe7bc0034449a357c5322db7ad05d1078d54 SHA512 c5d2be59f5ff81923f86330f4ddba7449663ddcba332fa39373e541a92c032f481a860defaf1ea7e7306b700f7fa16ee105bf7ac517afa4dbd3670c87ddb8730 +EBUILD systemd-boot-241.ebuild 2366 BLAKE2B 36679a7987086e2e43213c7aacda8f8336d01ef2a777a8866613b9a40a6571fef279c368366efb5712b8b9305ccf648a7156fc5310d52736410cb45426d65b3b SHA512 13d20e7f96054ce489151a8c2232d5fabcb10865e5b7222e46a933752c6fd911708f4a8320a54fe4fad70b443eeaaf41688bcbe6953512067ae984f4712af4b6 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe diff --git a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch deleted file mode 100644 index b837890f6162..000000000000 --- a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5aefd5fddd2af5f979ece96cda8ed1ab0492709c Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Tue, 30 May 2017 14:05:41 -0400 -Subject: [PATCH] Force libsystemd-shared to be static - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 2a5610740..4e95cb316 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1145,7 +1145,7 @@ libshared_la_LIBADD = \ - $(BLKID_LIBS) \ - $(LIBCRYPTSETUP_LIBS) - --rootlibexec_LTLIBRARIES += \ -+noinst_LTLIBRARIES += \ - libsystemd-shared.la - - libsystemd_shared_la_SOURCES = \ --- -2.13.0 - diff --git a/sys-boot/systemd-boot/files/235-libshared-static.patch b/sys-boot/systemd-boot/files/235-libshared-static.patch deleted file mode 100644 index 2a0bf678539b..000000000000 --- a/sys-boot/systemd-boot/files/235-libshared-static.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -1505,9 +1505,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 - exe = executable('bootctl', - 'src/boot/bootctl.c', - include_directories : includes, -- link_with : [libshared], -+ link_with : [libshared_static], - dependencies : [libblkid], -- install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] - endif -diff --git a/src/shared/meson.build b/src/shared/meson.build -index 883821352..b560e65c9 100644 ---- a/src/shared/meson.build -+++ b/src/shared/meson.build -@@ -157,5 +157,6 @@ libshared_static = static_library( - libshared_name, - shared_sources, - basic_sources, -+ libsystemd_internal_sources, - include_directories : includes, - dependencies : libshared_deps) diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild b/sys-boot/systemd-boot/systemd-boot-233.ebuild deleted file mode 100644 index 313b919e089d..000000000000 --- a/sys-boot/systemd-boot/systemd-boot-233.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs - -DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" -SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="test" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.27.1 -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - >=dev-util/intltool-0.50 - dev-util/gperf - >=sys-boot/gnu-efi-3.0.2 - sys-libs/libcap - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" - -S="${WORKDIR}/systemd-${PV}" - -PATCHES=( - "${FILESDIR}"/233-Force-libsystemd-shared-to-be-static.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)" - cc_cv_CFLAGS__flto=no - cc_cv_LDFLAGS__Wl__fuse_ld_gold=no - --enable-blkid - --enable-efi - --enable-gnuefi - --disable-acl - --disable-apparmor - --disable-audit - --disable-bzip2 - --disable-elfutils - --disable-gcrypt - --disable-gnutls - --disable-kmod - --disable-libcryptsetup - --disable-libcurl - --disable-libidn - --disable-lz4 - --disable-microhttpd - --disable-myhostname - --disable-pam - --disable-qrencode - --disable-seccomp - --disable-selinux - --disable-xkbcommon - --disable-xz - --disable-zlib - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - local targets=( - bootctl - man/bootctl.1 - man/kernel-install.8 - '$(bootlib_DATA)' - ) - emake built-sources - echo "gentoo: ${targets[*]}" | emake -f Makefile -f - gentoo -} - -src_install() { - local args=( - DESTDIR="${D%/}" - - # bootctl - bin_PROGRAMS=bootctl - install-binPROGRAMS - - # kernel-install - install-dist_binSCRIPTS - install-dist_kernelinstallSCRIPTS - - man_MANS="man/bootctl.1 man/kernel-install.8" - install-man1 - install-man8 - - install-bootlibDATA - ) - emake "${args[@]}" - einstalldocs -} diff --git a/sys-boot/systemd-boot/systemd-boot-235.ebuild b/sys-boot/systemd-boot/systemd-boot-235.ebuild deleted file mode 100644 index ff86b01e7556..000000000000 --- a/sys-boot/systemd-boot/systemd-boot-235.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson toolchain-funcs - -DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" -SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="test" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30 -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - >=dev-util/intltool-0.50 - dev-util/gperf - >=sys-boot/gnu-efi-3.0.2 - sys-libs/libcap - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" - -S="${WORKDIR}/systemd-${PV}" - -PATCHES=( - "${FILESDIR}/235-libshared-static.patch" -) - -src_configure() { - local emesonargs=( - -D blkid=true - -D efi=true - -D gnu-efi=true - -D efi-cc="$(tc-getCC)" - -D efi-ld="$(tc-getLD)" - - -D acl=false - -D apparmor=false - -D audit=false - -D bzip2=false - -D elfutils=false - -D gcrypt=false - -D gnutls=false - -D kmod=false - -D libcryptsetup=false - -D libcurl=false - -D libidn=false - -D libidn2=false - -D libiptc=false - -D lz4=false - -D microhttpd=false - -D myhostname=false - -D pam=false - -D qrencode=false - -D seccomp=false - -D selinux=false - -D xkbcommon=false - -D xz=false - ) - meson_src_configure -} - -set_efi_arch() { - case "$(tc-arch)" in - amd64) efi_arch=x64 ;; - arm) efi_arch=arm ;; - arm64) efi_arch=aa64 ;; - x86) efi_arch=x86 ;; - esac -} - -src_compile() { - local efi_arch - set_efi_arch - local targets=( - bootctl - man/bootctl.1 - man/kernel-install.8 - src/boot/efi/linux${efi_arch}.efi.stub - src/boot/efi/systemd-boot${efi_arch}.efi - ) - eninja -C "${BUILD_DIR}" "${targets[@]}" || die -} - -src_install() { - local efi_arch - set_efi_arch - dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install - doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8} - exeinto usr/lib/kernel/install.d - doexe src/kernel-install/{50-depmod,90-loaderentry}.install - insinto usr/lib/systemd/boot/efi - doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi} - einstalldocs -} diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild b/sys-boot/systemd-boot/systemd-boot-237.ebuild deleted file mode 100644 index 48d61ac38b29..000000000000 --- a/sys-boot/systemd-boot/systemd-boot-237.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson toolchain-funcs - -DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" -SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RESTRICT="test" - -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30 -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - >=dev-util/intltool-0.50 - dev-util/gperf - >=sys-boot/gnu-efi-3.0.2 - sys-libs/libcap - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" - -S="${WORKDIR}/systemd-${PV}" - -PATCHES=( - "${FILESDIR}/237-libshared-static.patch" -) - -src_configure() { - local emesonargs=( - -D blkid=true - -D efi=true - -D gnu-efi=true - -D efi-cc="$(tc-getCC)" - -D efi-ld="$(tc-getLD)" - -D split-usr=true - -D rootprefix="${EPREFIX:-/}" - - -D acl=false - -D apparmor=false - -D audit=false - -D bzip2=false - -D elfutils=false - -D gcrypt=false - -D gnutls=false - -D kmod=false - -D libcryptsetup=false - -D libcurl=false - -D libidn=false - -D libidn2=false - -D libiptc=false - -D lz4=false - -D microhttpd=false - -D myhostname=false - -D pam=false - -D qrencode=false - -D seccomp=false - -D selinux=false - -D xkbcommon=false - -D xz=false - ) - meson_src_configure -} - -set_efi_arch() { - case "$(tc-arch)" in - amd64) efi_arch=x64 ;; - arm) efi_arch=arm ;; - arm64) efi_arch=aa64 ;; - x86) efi_arch=x86 ;; - esac -} - -src_compile() { - local efi_arch - set_efi_arch - local targets=( - bootctl - man/bootctl.1 - man/kernel-install.8 - src/boot/efi/linux${efi_arch}.efi.stub - src/boot/efi/systemd-boot${efi_arch}.efi - ) - eninja -C "${BUILD_DIR}" "${targets[@]}" || die -} - -src_install() { - local efi_arch - set_efi_arch - dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install - doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8} - exeinto usr/lib/kernel/install.d - doexe src/kernel-install/{50-depmod,90-loaderentry}.install - insinto usr/lib/systemd/boot/efi - doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi} - einstalldocs -} diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild b/sys-boot/systemd-boot/systemd-boot-241.ebuild new file mode 100644 index 000000000000..f30a18426987 --- /dev/null +++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild @@ -0,0 +1,115 @@ +# Copyright 2016-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs + +DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" +SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +RESTRICT="test" + +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + >=dev-util/intltool-0.50 + dev-util/gperf + dev-util/patchelf + virtual/pkgconfig +" +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30 +" +DEPEND="${COMMON_DEPEND} + >=sys-boot/gnu-efi-3.0.2 + sys-libs/libcap +" +RDEPEND="${COMMON_DEPEND} + !sys-apps/systemd +" + +S="${WORKDIR}/systemd-${PV}" + +PATCHES=( + "${FILESDIR}/237-libshared-static.patch" +) + +src_configure() { + local emesonargs=( + -Dblkid=true + -Defi=true + -Dgnu-efi=true + -Defi-cc="$(tc-getCC)" + -Defi-ld="$(tc-getLD)" + -Dsplit-usr=true + -Drootprefix="${EPREFIX:-/}" + + -Dacl=false + -Dapparmor=false + -Daudit=false + -Dbzip2=false + -Delfutils=false + -Dgcrypt=false + -Dgnutls=false + -Dkmod=false + -Dlibcryptsetup=false + -Dlibcurl=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dlz4=false + -Dmicrohttpd=false + -Dmyhostname=false + -Dpam=false + -Dqrencode=false + -Dseccomp=false + -Dselinux=false + -Dxkbcommon=false + -Dxz=false + ) + meson_src_configure +} + +set_efi_arch() { + case "$(tc-arch)" in + amd64) efi_arch=x64 ;; + arm) efi_arch=arm ;; + arm64) efi_arch=aa64 ;; + x86) efi_arch=x86 ;; + esac +} + +src_compile() { + local efi_arch + set_efi_arch + local targets=( + bootctl + man/bootctl.1 + man/kernel-install.8 + src/boot/efi/linux${efi_arch}.efi.stub + src/boot/efi/systemd-boot${efi_arch}.efi + ) + cd "${BUILD_DIR}" || die + eninja "${targets[@]}" + patchelf --remove-rpath bootctl || die +} + +src_install() { + local efi_arch + set_efi_arch + dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install + doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8} + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/{50-depmod,90-loaderentry}.install + insinto usr/lib/systemd/boot/efi + doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi} + einstalldocs +} -- cgit v1.2.3