diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /sys-boot/systemd-boot | |
parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) |
gentoo resync : 05.04.2019
Diffstat (limited to 'sys-boot/systemd-boot')
-rw-r--r-- | sys-boot/systemd-boot/Manifest | 10 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch | 25 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/235-libshared-static.patch | 24 | ||||
-rw-r--r-- | sys-boot/systemd-boot/systemd-boot-233.ebuild | 111 | ||||
-rw-r--r-- | sys-boot/systemd-boot/systemd-boot-235.ebuild | 108 | ||||
-rw-r--r-- | sys-boot/systemd-boot/systemd-boot-241.ebuild (renamed from sys-boot/systemd-boot/systemd-boot-237.ebuild) | 79 |
6 files changed, 44 insertions, 313 deletions
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 <floppym@gentoo.org> -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-241.ebuild index 48d61ac38b29..f30a18426987 100644 --- a/sys-boot/systemd-boot/systemd-boot-237.ebuild +++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2016-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit meson toolchain-funcs @@ -15,19 +15,22 @@ KEYWORDS="~amd64" IUSE="" RESTRICT="test" -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30 -" -DEPEND="${COMMON_DEPEND} +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 - virtual/pkgconfig " RDEPEND="${COMMON_DEPEND} !sys-apps/systemd @@ -41,36 +44,36 @@ PATCHES=( 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:-/}" + -Dblkid=true + -Defi=true + -Dgnu-efi=true + -Defi-cc="$(tc-getCC)" + -Defi-ld="$(tc-getLD)" + -Dsplit-usr=true + -Drootprefix="${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 + -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 } @@ -94,7 +97,9 @@ src_compile() { src/boot/efi/linux${efi_arch}.efi.stub src/boot/efi/systemd-boot${efi_arch}.efi ) - eninja -C "${BUILD_DIR}" "${targets[@]}" || die + cd "${BUILD_DIR}" || die + eninja "${targets[@]}" + patchelf --remove-rpath bootctl || die } src_install() { |