commit: 06d369db6410ed60d7739fe8f8737da338a173e4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Feb 12 16:54:49 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Feb 12 16:55:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d369db
sys-boot/systemd-boot: bump to 237 Closes: https://bugs.gentoo.org/647316 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 sys-boot/systemd-boot/Manifest | 1 + .../systemd-boot/files/237-libshared-static.patch | 15 +++ sys-boot/systemd-boot/systemd-boot-237.ebuild | 110 +++++++++++++++++++++ 3 files changed, 126 insertions(+) diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 8e5e9a536b2..04a2c669219 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch b/sys-boot/systemd-boot/files/237-libshared-static.patch new file mode 100644 index 00000000000..9966a5f7916 --- /dev/null +++ b/sys-boot/systemd-boot/files/237-libshared-static.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index 36a62d280..87f8da29b 100644 +--- a/meson.build ++++ b/meson.build +@@ -1662,9 +1662,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, libsystemd_static], + dependencies : [libblkid], +- install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] + endif diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild b/sys-boot/systemd-boot/systemd-boot-237.ebuild new file mode 100644 index 00000000000..48d61ac38b2 --- /dev/null +++ b/sys-boot/systemd-boot/systemd-boot-237.ebuild @@ -0,0 +1,110 @@ +# 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 +}
