[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/
commit: 979528fd1a15ddb2c202bbf30890cdcc6ef8d0a5 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 5 19:01:07 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 5 19:01:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979528fd sys-boot/systemd-boot: drop 245 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/systemd-boot/Manifest | 1 - .../systemd-boot/files/237-libshared-static.patch | 15 --- sys-boot/systemd-boot/systemd-boot-245.ebuild | 120 - 3 files changed, 136 deletions(-) diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 9b4446a019c..209a35c38f4 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,2 +1 @@ -DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch b/sys-boot/systemd-boot/files/237-libshared-static.patch deleted file mode 100644 index 9966a5f7916..000 --- a/sys-boot/systemd-boot/files/237-libshared-static.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-245.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild deleted file mode 100644 index 7767ac23cf9..000 --- a/sys-boot/systemd-boot/systemd-boot-245.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2016-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit meson python-any-r1 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 ~arm64" -IUSE="" -RESTRICT="test" - -BDEPEND=" - ${PYTHON_DEPS} - 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-0.10 - 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() { - # https://bugs.gentoo.org/725794 - tc-export OBJCOPY - - local emesonargs=( - -Dblkid=true - -Defi=true - -Dgnu-efi=true - -Defi-cc="$(tc-getCC)" - -Defi-ld="$(tc-getLD)" - -Defi-libdir="/usr/$(get_libdir)" - -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 - -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 ;;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/
commit: cd7fdd79aaea10bf089059344681d49f86599973 Author: Mike Gilbert gentoo org> AuthorDate: Sun Mar 31 16:23:48 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Mar 31 16:41:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7fdd79 sys-boot/systemd-boot: remove old Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/systemd-boot/Manifest | 3 - .../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 6 files changed, 381 deletions(-) diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 7270e8b5f4a..7948d4c26aa 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,4 +1 @@ -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 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 b837890f616..000 --- 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 2a0bf678539..000 --- 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 313b919e089..000 --- 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 syste
[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/
commit: 6713479f9affb2b5e2231d135219c16ce3f03778 Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 29 03:01:49 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 30 01:15:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6713479f sys-boot/systemd-boot: glibc-2.28 compat for stat.h Closes: https://bugs.gentoo.org/669846 Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/systemd-boot/files/239-stat-0.patch | 108 ++ sys-boot/systemd-boot/files/239-stat-1.patch | 74 ++ sys-boot/systemd-boot/systemd-boot-239.ebuild | 2 + 3 files changed, 184 insertions(+) diff --git a/sys-boot/systemd-boot/files/239-stat-0.patch b/sys-boot/systemd-boot/files/239-stat-0.patch new file mode 100644 index 000..e136b703a2f --- /dev/null +++ b/sys-boot/systemd-boot/files/239-stat-0.patch @@ -0,0 +1,108 @@ +From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger +Date: Sun, 15 Jul 2018 22:43:35 -0700 +Subject: [PATCH] build-sys: Detect whether struct statx is defined in + sys/stat.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a +definition for struct statx, in which case include file linux/stat.h should be +avoided, in order to prevent a duplicate definition. + +In file included from ../src/basic/missing.h:18, +from ../src/basic/util.h:28, +from ../src/basic/hashmap.h:10, +from ../src/shared/bus-util.h:12, +from ../src/libsystemd/sd-bus/bus-creds.c:11: +/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ + struct statx { + ^ +In file included from /usr/include/sys/stat.h:446, +from ../src/basic/util.h:19, +from ../src/basic/hashmap.h:10, +from ../src/shared/bus-util.h:12, +from ../src/libsystemd/sd-bus/bus-creds.c:11: +/usr/include/bits/statx.h:36:8: note: originally defined here + struct statx + ^ + +Extend our meson.build to look for struct statx when only sys/stat.h is +included and, in that case, do not include linux/stat.h anymore. + +Tested that systemd builds correctly when using a glibc version that includes a +definition for struct statx. + +glibc Fedora RPM update: +https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae + +glibc upstream commit: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd +--- + meson.build| 5 + + src/basic/missing.h| 5 - + src/basic/xattr-util.c | 1 - + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index dd904c7148..68423bdfa5 100644 +--- a/meson.build b/meson.build +@@ -425,6 +425,7 @@ decl_headers = ''' + #include + ''' + # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail ++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time + + foreach decl : ['char16_t', + 'char32_t', +@@ -439,6 +440,10 @@ foreach decl : ['char16_t', + conf.set10('HAVE_' + decl.underscorify().to_upper(), have) + endforeach + ++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' ++#include ++''', args : '-D_GNU_SOURCE') > 0) ++ + foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], + ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], + ['IFLA_VRF_TABLE', 'linux/if_link.h'], +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 71a07d0574..14ad3d4914 100644 +--- a/src/basic/missing.h b/src/basic/missing.h +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -25,6 +24,10 @@ + #include + #include + ++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#include ++#endif ++ + #if HAVE_AUDIT + #include + #endif +diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c +index c5c55ea846..0ee0979837 100644 +--- a/src/basic/xattr-util.c b/src/basic/xattr-util.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include +-- +2.19.1 + diff --git a/sys-boot/systemd-boot/files/239-stat-1.patch b/sys-boot/systemd-boot/files/239-stat-1.patch new file mode 100644 index 000..1104de3c9c1 --- /dev/null +++ b/sys-boot/systemd-boot/files/239-stat-1.patch @@ -0,0 +1,74 @@ +From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 18 Jul 2018 17:26:17 +0200 +Subject: [PATCH] meson: unify linux/stat.h check with other checks and use + _GNU_SOURCE + +Using _GNU_SOURCE is
[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/
commit: b0b74ce3b8aa90a952db8dd1062e4a0a9865f3b6 Author: Mike Gilbert gentoo org> AuthorDate: Mon Nov 20 19:10:55 2017 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Nov 20 19:14:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b74ce3 sys-boot/systemd-boot: bump to 235 Closes: https://bugs.gentoo.org/638238 Package-Manager: Portage-2.3.14_p5, Repoman-2.3.6 sys-boot/systemd-boot/Manifest | 1 + .../systemd-boot/files/235-libshared-static.patch | 24 + sys-boot/systemd-boot/systemd-boot-235.ebuild | 108 + 3 files changed, 133 insertions(+) diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index 5848388fa13..25ff219e75d 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1 +1,2 @@ DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176 +DIST systemd-235.tar.gz 6586406 SHA256 25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 WHIRLPOOL 05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6c1caf5afb17502555cc52fe06cd diff --git a/sys-boot/systemd-boot/files/235-libshared-static.patch b/sys-boot/systemd-boot/files/235-libshared-static.patch new file mode 100644 index 000..2a0bf678539 --- /dev/null +++ b/sys-boot/systemd-boot/files/235-libshared-static.patch @@ -0,0 +1,24 @@ +--- 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-235.ebuild b/sys-boot/systemd-boot/systemd-boot-235.ebuild new file mode 100644 index 000..ff86b01e755 --- /dev/null +++ b/sys-boot/systemd-boot/systemd-boot-235.ebuild @@ -0,0 +1,108 @@ +# 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 +
[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/
commit: e297bb1001aaa9a87abb86f28c4ac786d7c97b45 Author: Mike Gilbert gentoo org> AuthorDate: Tue May 30 18:50:50 2017 + Commit: Mike Gilbert gentoo org> CommitDate: Tue May 30 18:51:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e297bb10 sys-boot/systemd-boot: bump to 233 Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 sys-boot/systemd-boot/Manifest | 1 + .../233-Force-libsystemd-shared-to-be-static.patch | 25 + sys-boot/systemd-boot/systemd-boot-233.ebuild | 110 + 3 files changed, 136 insertions(+) diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index e2bcea5e83a..71c131fed62 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,2 +1,3 @@ DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1 DIST systemd-232.tar.gz 4529048 SHA256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1 WHIRLPOOL f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980 +DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176 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 new file mode 100644 index 000..b837890f616 --- /dev/null +++ b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch @@ -0,0 +1,25 @@ +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/systemd-boot-233.ebuild b/sys-boot/systemd-boot/systemd-boot-233.ebuild new file mode 100644 index 000..52aa812768a --- /dev/null +++ b/sys-boot/systemd-boot/systemd-boot-233.ebuild @@ -0,0 +1,110 @@ +# 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="" + +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 + --disa