summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-02-17 10:35:54 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-02-17 10:35:54 +0000
commit463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sys-boot
parentc8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
gentoo resync : 17.02.2021
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/Manifest.gzbin6222 -> 6227 bytes
-rw-r--r--sys-boot/elilo/Manifest3
-rw-r--r--sys-boot/elilo/elilo-3.16-r4.ebuild3
-rw-r--r--sys-boot/elilo/files/elilo-3.16-ARCH.patch12
4 files changed, 16 insertions, 2 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 66a08f6a551a..e9fd0279475f 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 41454b85097c..7ff061594d45 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,3 +1,4 @@
+AUX elilo-3.16-ARCH.patch 635 BLAKE2B aeb93f3e3dd108a26764991e3c2b5eec8f7ea5b8214c45cbabb6b2af2a6847a0d4ccf3abba21653bbc2b5911e949229ed9653d2392548548b1a1600547cd3a90 SHA512 9e6fa1d388ba156db77114caf65669c37c78ae850256b64ee8f53b8448142e600e2dbcf7a73c26dbb248faeed76efeba7697bfa9af90c63ae9d138a1091434e4
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
@@ -5,5 +6,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
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-r4.ebuild 2247 BLAKE2B 5a82f2db1261e1040f60999dc344a172941fe97ede55fbb295187205446268cc937ab4ecdafa37202fe9c5b8756d1a48d1acb365b83c2b5a578ae2e04c22b214 SHA512 7e9d4cf9c269b3cafd7d46c304f44fd79d45026ff78ac11f952a06316b4bfb51c131786df1e4a375657ab33568971353ff0e250c1236a501a55725196cb860c6
+EBUILD elilo-3.16-r4.ebuild 2284 BLAKE2B 728b52fb57c1435959f4a769a2b55969bc40558d7abde72c8b3e2a6d718e3c582a728cf4248381fdf168fdfe05c45cb2b42d178e94e06465109936ddbe1a69fd SHA512 6769c816f4317fcc2de722771673880aa51fafd3cf0810b7bbbfc5ae5cccca86bed1c4932509ccc9a079ebadf096d0b1de36c7d1b91bc1b32e08871e292722aa
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
index c4cd5a90dd8a..2670fdcaf7a1 100644
--- a/sys-boot/elilo/elilo-3.16-r4.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
"${FILESDIR}"/${PN}-3.16-FLAGS.patch
+ "${FILESDIR}"/${PN}-3.16-ARCH.patch
)
src_unpack() {
diff --git a/sys-boot/elilo/files/elilo-3.16-ARCH.patch b/sys-boot/elilo/files/elilo-3.16-ARCH.patch
new file mode 100644
index 000000000000..935cf7adbe4e
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-ARCH.patch
@@ -0,0 +1,12 @@
+Allow for easier override from make's commandline.
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -64,7 +64,7 @@ TOPDIR =
+ ALLSUBDIRS = ia32 ia64 x86_64 fs choosers devschemes tools
+
+ HOSTARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
+-ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
++ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
+ INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(TOPDIR)/efi110
+ CPPFLAGS = -DCONFIG_$(ARCH)
+