diff options
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/Manifest.gz | bin | 6221 -> 6220 bytes | |||
| -rw-r--r-- | sys-boot/systemd-boot/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/systemd-boot/files/249-libshared-static.patch | 27 | ||||
| -rw-r--r-- | sys-boot/systemd-boot/files/249.9-cross-compile.patch | 23 | ||||
| -rw-r--r-- | sys-boot/systemd-boot/systemd-boot-249.9.ebuild | 131 |
5 files changed, 0 insertions, 185 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz Binary files differindex 406d4139b355..5b929fee4801 100644 --- a/sys-boot/Manifest.gz +++ b/sys-boot/Manifest.gz diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest index b70b5d2eac71..da285316610e 100644 --- a/sys-boot/systemd-boot/Manifest +++ b/sys-boot/systemd-boot/Manifest @@ -1,6 +1,2 @@ -AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f -AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194 -DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 -EBUILD systemd-boot-249.9.ebuild 2866 BLAKE2B e769da9ec703348ef505df75cf9f2e1f308e8875c01022efc5dd8f9e8edde39c07d33851f91ad1bbbe3831901010d2c4a9d4ea9b4e4adf709cc14f06986faeaf SHA512 fc16cf363ff03778a5109952ca8110d41e5cfa8a241fda47cdaecf75a788e560f1ceec22427d9e8cb63adb95339a365f5087308c642a474c70fd2a64b5bec836 EBUILD systemd-boot-250-r1.ebuild 302 BLAKE2B 6d967192962d2235ae0a635eeee50babfdbb9d0a42f98d226904a1784d75fa67c6d13f0c401666e3d63c5d1fce035f8a557088cf2da39b21be81d0d5a85f0562 SHA512 44036cd593cceda8a87935747c4bfdc003bea875ec98817075546b311dcc431d69e1215e0f0c00becbe992cbf89509a31fac3cd2ce96abbfa17a63a9f49f3b7a MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8 diff --git a/sys-boot/systemd-boot/files/249-libshared-static.patch b/sys-boot/systemd-boot/files/249-libshared-static.patch deleted file mode 100644 index c08e451af9fc..000000000000 --- a/sys-boot/systemd-boot/files/249-libshared-static.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eac425295227c5deda4536fd647ecf11b643e1ca Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 29 Aug 2021 09:22:33 -0400 -Subject: [PATCH] Link bootctl against libshared_static - ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 738879eb21..96042b6906 100644 ---- a/meson.build -+++ b/meson.build -@@ -2150,9 +2150,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 - '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 += executable( --- -2.33.0 - diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch b/sys-boot/systemd-boot/files/249.9-cross-compile.patch deleted file mode 100644 index e063d303c7d8..000000000000 --- a/sys-boot/systemd-boot/files/249.9-cross-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Tue, 21 Dec 2021 20:10:09 +0900 -Subject: [PATCH] meson: fix cross compiling - -(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 02495d16c9..c76cab535d 100644 ---- a/meson.build -+++ b/meson.build -@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>')) - conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>')) - conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>')) - conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>')) --conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>')) -+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>')) - - decl_headers = ''' - #include <uchar.h> diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild deleted file mode 100644 index 0a48d6771a9b..000000000000 --- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2016-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -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/" -if [[ ${PV} == *.* ]]; then - SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz" - S="${WORKDIR}/systemd-stable-${PV}" -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - S="${WORKDIR}/systemd-${PV}" -fi - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -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 - sys-devel/gettext - dev-util/gperf - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') -" - -python_check_deps() { - python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" -} - -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 -" - -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" - -PATCHES=( - "${FILESDIR}/249-libshared-static.patch" - "${FILESDIR}/249.9-cross-compile.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 ;; - 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,elf}.stub - src/boot/efi/systemd-boot${efi_arch}.efi - ) - meson_src_compile "${targets[@]}" -} - -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/*.install - insinto usr/lib/systemd/boot/efi - doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.{efi,elf}.stub,systemd-boot${efi_arch}.efi} - einstalldocs -} |