diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-boot | |
parent | db063b515939ab15261136b24e4bc44386335c0c (diff) |
gentoo resync : 30.09.2020
Diffstat (limited to 'sys-boot')
-rw-r--r-- | sys-boot/Manifest.gz | bin | 6391 -> 6389 bytes | |||
-rw-r--r-- | sys-boot/elilo/Manifest | 4 | ||||
-rw-r--r-- | sys-boot/elilo/elilo-3.16-r4.ebuild | 93 | ||||
-rw-r--r-- | sys-boot/elilo/files/elilo-3.16-FLAGS.patch | 19 | ||||
-rw-r--r-- | sys-boot/elilo/metadata.xml | 6 | ||||
-rw-r--r-- | sys-boot/gnu-efi/Manifest | 2 | ||||
-rw-r--r-- | sys-boot/gnu-efi/metadata.xml | 4 |
7 files changed, 119 insertions, 9 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz Binary files differindex 3bc104a2e9b8..8654c8cfca6b 100644 --- a/sys-boot/Manifest.gz +++ b/sys-boot/Manifest.gz diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest index 3a3c9bf48065..d50459770de2 100644 --- a/sys-boot/elilo/Manifest +++ b/sys-boot/elilo/Manifest @@ -1,3 +1,4 @@ +AUX elilo-3.16-FLAGS.patch 626 BLAKE2B cb140edefc093de92eb0af2ec2ec88d8fa3d3cd80a12811b5d657df9feae1c04da734ea933e9bbee11ab82815da5a573dfbd2ffbf68d7b9816609e7b207aa51c SHA512 69331902b4939fe349475aee84d1758cf973b7c015c9b092a7624d48235c0f6751082045cb2074eb90f0d42596d260c816e2a6fe075edeb134e4cd785f6e3e03 AUX elilo-3.16-elilo-loop.patch 299 BLAKE2B 5fe27b5b89d18adace762e2691854140437c5d33281d8b4e6573303b9d80913fa59283ae231213dda985dc9751c019db0a070e77284c56ed3871d799897b3c69 SHA512 6480d3e9403bc54b4a923e77df049eeb42929020f222450e32c12d4dcb09b098aa52924be0ebdda95e01ee8d0ced624ec96c3977cc1213b66dc5a8639797bc20 AUX elilo-3.16-gnu-efi-3.0.6-ia64.patch 3796 BLAKE2B 9008b004b24b390f46d6b05cf9e9ae0627d4ed930b9965d0295e700ea0c7617f2ac3e1da0b583ab931e8a7bffc0bf8452eb19318d7d1d256a5d4781cde4e710e SHA512 c2ec3ba0d2f5ee3447363a44d9d7863eb323095c40f72243241f608437fd9e2b17ee603666a1103f14a0c66cae025e8f9be09c27d8fb57554f480209a02f39e5 AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da20844929d0f1749e121b2e05cf8eda2af082ad8c02476cabf864258133964b0fb02ab3ed9969202fe62392718e7e047 SHA512 4cb593ac6b56bbe63b1ff632d00ef1192dc28c9a5af355e740b9ee41697fb48766ccb678636c66ecdb05d7cdf8d16b0a14d99e0347022bbe1cb6ec9be09bfcf8 @@ -5,4 +6,5 @@ AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f EBUILD elilo-3.16-r3.ebuild 2147 BLAKE2B 75c075dedc5088c60c0d2866b0ca5ca9c217b55ccc07adaad42449e2de0f09203d263310f6c306462df8de0f347de0f45906f2add2d6ed76549fbf4965b7955c SHA512 620e673baa83e75f762c131f97051a00df4ca85e80139461eca0785eb64d0dbe14106ed20c6b0c66ed7b87ffa57dd85bbb21cd41d8d00187b92ec5304a510ce6 -MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87 +EBUILD elilo-3.16-r4.ebuild 2247 BLAKE2B 5a82f2db1261e1040f60999dc344a172941fe97ede55fbb295187205446268cc937ab4ecdafa37202fe9c5b8756d1a48d1acb365b83c2b5a578ae2e04c22b214 SHA512 7e9d4cf9c269b3cafd7d46c304f44fd79d45026ff78ac11f952a06316b4bfb51c131786df1e4a375657ab33568971353ff0e250c1236a501a55725196cb860c6 +MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624 diff --git a/sys-boot/elilo/elilo-3.16-r4.ebuild b/sys-boot/elilo/elilo-3.16-r4.ebuild new file mode 100644 index 000000000000..c4cd5a90dd8a --- /dev/null +++ b/sys-boot/elilo/elilo-3.16-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs eutils multilib + +DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64" +HOMEPAGE="https://sourceforge.net/projects/elilo/" +SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz + mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" +IUSE="" + +# gnu-efi contains only static libs, so there's no run-time dep on it +DEPEND=">=sys-boot/gnu-efi-3.0g + dev-util/patchutils" +# dosfstools[compat] to enable 'dosfsck' symlink +RDEPEND="sys-boot/efibootmgr + sys-fs/dosfstools[compat]" + +S="${WORKDIR}/${P}-source" + +PATCHES=( + "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665 + "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch + "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch + "${FILESDIR}"/${PN}-3.16-FLAGS.patch +) + +src_unpack() { + unpack ${A} ./${P}-source.tar.gz + mv debian "${S}"/ || die +} + +src_prepare() { + default + + case $(tc-arch) in + ia64) iarch=ia64 ;; + x86) iarch=ia32 ;; + amd64) iarch=x86_64 ;; + *) die "unknown architecture: $(tc-arch)" ;; + esac + + # Now Gentooize it. + sed -i \ + -e '1s:/bin/sh:/bin/bash:' \ + -e "s:##VERSION##:${PV}:" \ + -e 's:Debian GNU/:Gentoo :g' \ + -e 's:Debian:Gentoo:g' \ + -e 's:debian:gentoo:g' \ + -e "s:dpkg --print-architecture:echo ${iarch}:" \ + debian/elilo.sh || die +} + +src_compile() { + # "prefix" on the next line specifies where to find gcc, as, ld, + # etc. It's not the usual meaning of "prefix". By blanking it we + # allow PATH to be searched. + local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" + emake -j1 \ + prefix= \ + AS="$(tc-getAS)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + HOSTARCH=${iarch} \ + ARCH=${iarch} \ + EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \ + GNUEFILIB="${libdir}" \ + EFILIB="${libdir}" \ + EFICRT0="${libdir}" \ + NATIVE_CFLAGS="${CFLAGS}" \ + NATIVE_LDFLAGS="${LDFLAGS}" +} + +src_install() { + exeinto /usr/lib/elilo + doexe elilo.efi + + newsbin debian/elilo.sh elilo + dosbin tools/eliloalt + + insinto /etc + newins "${FILESDIR}"/elilo.conf.sample elilo.conf + + dodoc docs/* "${FILESDIR}"/elilo.conf.sample + doman debian/*.[0-9] +} diff --git a/sys-boot/elilo/files/elilo-3.16-FLAGS.patch b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch new file mode 100644 index 000000000000..a77e44d0b186 --- /dev/null +++ b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch @@ -0,0 +1,19 @@ +eliloalt is a rare native tool. Allow user to explicitly pass +standart optimization flags via + $ make NATIIVE_CFLAGS=${CFLAGS} NATIVE_LDFLAGS +https://bugs.gentoo.org/744931 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -42,10 +42,10 @@ all: $(TARGET) + # redefine local rule (we build a Linux/ia64 binary here) + # + %.o: %.c +- $(CC) $(OPTIMFLAGS) $(DEBUGFLAGS) -c $< -o $@ ++ $(CC) $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(DEBUGFLAGS) -c $< -o $@ + + $(TARGET): %:%.o +- $(CC) -o $@ $(OPTIMFLAGS) $(DEBUGFLAGS) $^ ++ $(CC) -o $@ $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(DEBUGFLAGS) $^ + + clean: + $(RM) -f $(TARGET) $(FILES) diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml index e9138bcbce78..0b9c119b3c0e 100644 --- a/sys-boot/elilo/metadata.xml +++ b/sys-boot/elilo/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ia64@gentoo.org</email> - <name>Gentoo Linux IA-64 Development</name> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> </maintainer> <upstream> <remote-id type="sourceforge">elilo</remote-id> diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index 8a1b1885a3ad..91388b608fb8 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -3,4 +3,4 @@ DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368 EBUILD gnu-efi-3.0.11.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d -MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8 +MISC metadata.xml 323 BLAKE2B 621b04fe06119fa67e9406565c94647f5fcd9158903eb23a1673de7c02107c90fc56ddc420791c3a1a28e8e854b6a978a1abc6549ebce51d6c3ea5e1eef82c67 SHA512 a47915e6e99550f7b295118899cbdd6f79716c867e66a0d330cd3e7c5a21bba736dcfea54a6432da4c7f1478b0119e55c698162bb9ca6a1fe4cbdf3808995d93 diff --git a/sys-boot/gnu-efi/metadata.xml b/sys-boot/gnu-efi/metadata.xml index 493998b4dac8..d89d934c554e 100644 --- a/sys-boot/gnu-efi/metadata.xml +++ b/sys-boot/gnu-efi/metadata.xml @@ -5,10 +5,6 @@ <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> - <maintainer type="project"> - <email>ia64@gentoo.org</email> - <name>Gentoo Linux IA-64 Development</name> - </maintainer> <upstream> <remote-id type="sourceforge">gnu-efi</remote-id> </upstream> |