1 |
commit: 979528fd1a15ddb2c202bbf30890cdcc6ef8d0a5 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 5 19:01:07 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 5 19:01:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979528fd |
7 |
|
8 |
sys-boot/systemd-boot: drop 245 |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
sys-boot/systemd-boot/Manifest | 1 - |
13 |
.../systemd-boot/files/237-libshared-static.patch | 15 --- |
14 |
sys-boot/systemd-boot/systemd-boot-245.ebuild | 120 --------------------- |
15 |
3 files changed, 136 deletions(-) |
16 |
|
17 |
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest |
18 |
index 9b4446a019c..209a35c38f4 100644 |
19 |
--- a/sys-boot/systemd-boot/Manifest |
20 |
+++ b/sys-boot/systemd-boot/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012 |
23 |
DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c |
24 |
|
25 |
diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch b/sys-boot/systemd-boot/files/237-libshared-static.patch |
26 |
deleted file mode 100644 |
27 |
index 9966a5f7916..00000000000 |
28 |
--- a/sys-boot/systemd-boot/files/237-libshared-static.patch |
29 |
+++ /dev/null |
30 |
@@ -1,15 +0,0 @@ |
31 |
-diff --git a/meson.build b/meson.build |
32 |
-index 36a62d280..87f8da29b 100644 |
33 |
---- a/meson.build |
34 |
-+++ b/meson.build |
35 |
-@@ -1662,9 +1662,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 |
36 |
- exe = executable('bootctl', |
37 |
- 'src/boot/bootctl.c', |
38 |
- include_directories : includes, |
39 |
-- link_with : [libshared], |
40 |
-+ link_with : [libshared_static, libsystemd_static], |
41 |
- dependencies : [libblkid], |
42 |
-- install_rpath : rootlibexecdir, |
43 |
- install : true) |
44 |
- public_programs += [exe] |
45 |
- endif |
46 |
|
47 |
diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild |
48 |
deleted file mode 100644 |
49 |
index 7767ac23cf9..00000000000 |
50 |
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,120 +0,0 @@ |
53 |
-# Copyright 2016-2021 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI=7 |
57 |
-PYTHON_COMPAT=( python3_{7..9} ) |
58 |
- |
59 |
-inherit meson python-any-r1 toolchain-funcs |
60 |
- |
61 |
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)" |
62 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/" |
63 |
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" |
64 |
- |
65 |
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
66 |
-SLOT="0" |
67 |
-KEYWORDS="~amd64 ~arm64" |
68 |
-IUSE="" |
69 |
-RESTRICT="test" |
70 |
- |
71 |
-BDEPEND=" |
72 |
- ${PYTHON_DEPS} |
73 |
- app-text/docbook-xml-dtd:4.2 |
74 |
- app-text/docbook-xml-dtd:4.5 |
75 |
- app-text/docbook-xsl-stylesheets |
76 |
- dev-libs/libxslt:0 |
77 |
- >=dev-util/intltool-0.50 |
78 |
- dev-util/gperf |
79 |
- >=dev-util/patchelf-0.10 |
80 |
- virtual/pkgconfig |
81 |
-" |
82 |
-COMMON_DEPEND=" |
83 |
- >=sys-apps/util-linux-2.30 |
84 |
-" |
85 |
-DEPEND="${COMMON_DEPEND} |
86 |
- >=sys-boot/gnu-efi-3.0.2 |
87 |
- sys-libs/libcap |
88 |
-" |
89 |
-RDEPEND="${COMMON_DEPEND} |
90 |
- !sys-apps/systemd |
91 |
-" |
92 |
- |
93 |
-S="${WORKDIR}/systemd-${PV}" |
94 |
- |
95 |
-PATCHES=( |
96 |
- "${FILESDIR}/237-libshared-static.patch" |
97 |
-) |
98 |
- |
99 |
-src_configure() { |
100 |
- # https://bugs.gentoo.org/725794 |
101 |
- tc-export OBJCOPY |
102 |
- |
103 |
- local emesonargs=( |
104 |
- -Dblkid=true |
105 |
- -Defi=true |
106 |
- -Dgnu-efi=true |
107 |
- -Defi-cc="$(tc-getCC)" |
108 |
- -Defi-ld="$(tc-getLD)" |
109 |
- -Defi-libdir="/usr/$(get_libdir)" |
110 |
- -Dsplit-usr=true |
111 |
- -Drootprefix="${EPREFIX:-/}" |
112 |
- |
113 |
- -Dacl=false |
114 |
- -Dapparmor=false |
115 |
- -Daudit=false |
116 |
- -Dbzip2=false |
117 |
- -Delfutils=false |
118 |
- -Dgcrypt=false |
119 |
- -Dgnutls=false |
120 |
- -Dkmod=false |
121 |
- -Dlibcryptsetup=false |
122 |
- -Dlibcurl=false |
123 |
- -Dlibidn=false |
124 |
- -Dlibidn2=false |
125 |
- -Dlibiptc=false |
126 |
- -Dlz4=false |
127 |
- -Dmicrohttpd=false |
128 |
- -Dpam=false |
129 |
- -Dqrencode=false |
130 |
- -Dseccomp=false |
131 |
- -Dselinux=false |
132 |
- -Dxkbcommon=false |
133 |
- -Dxz=false |
134 |
- ) |
135 |
- meson_src_configure |
136 |
-} |
137 |
- |
138 |
-set_efi_arch() { |
139 |
- case "$(tc-arch)" in |
140 |
- amd64) efi_arch=x64 ;; |
141 |
- arm) efi_arch=arm ;; |
142 |
- arm64) efi_arch=aa64 ;; |
143 |
- x86) efi_arch=x86 ;; |
144 |
- esac |
145 |
-} |
146 |
- |
147 |
-src_compile() { |
148 |
- local efi_arch |
149 |
- set_efi_arch |
150 |
- local targets=( |
151 |
- bootctl |
152 |
- man/bootctl.1 |
153 |
- man/kernel-install.8 |
154 |
- src/boot/efi/linux${efi_arch}.efi.stub |
155 |
- src/boot/efi/systemd-boot${efi_arch}.efi |
156 |
- ) |
157 |
- cd "${BUILD_DIR}" || die |
158 |
- eninja "${targets[@]}" |
159 |
- patchelf --remove-rpath bootctl || die |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- local efi_arch |
164 |
- set_efi_arch |
165 |
- dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install |
166 |
- doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8} |
167 |
- exeinto usr/lib/kernel/install.d |
168 |
- doexe src/kernel-install/{50-depmod,90-loaderentry}.install |
169 |
- insinto usr/lib/systemd/boot/efi |
170 |
- doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi} |
171 |
- einstalldocs |
172 |
-} |