Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/, profiles/, sys-boot/udk/files/
Date: Thu, 01 Oct 2020 15:13:19
Message-Id: 1601565174.a88a0d76f13e9526b8302e88f017e153ac08d72f.mgorny@gentoo
1 commit: a88a0d76f13e9526b8302e88f017e153ac08d72f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 15:09:25 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 15:12:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88a0d76
7
8 sys-boot/udk: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735482
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sys-boot/udk/Manifest | 3 -
15 sys-boot/udk/files/2015-makefile.template | 54 --------
16 sys-boot/udk/files/2015-tools_def.template | 42 ------
17 sys-boot/udk/files/udk-workspace.template | 63 ---------
18 sys-boot/udk/metadata.xml | 15 ---
19 sys-boot/udk/udk-2015-r1.ebuild | 203 -----------------------------
20 sys-boot/udk/udk-2018-r1.ebuild | 146 ---------------------
21 8 files changed, 527 deletions(-)
22
23 diff --git a/profiles/package.mask b/profiles/package.mask
24 index 14f662a9d3a..2d666da179a 100644
25 --- a/profiles/package.mask
26 +++ b/profiles/package.mask
27 @@ -603,7 +603,6 @@ dev-go/siphash
28 dev-cpp/icnc
29 dev-db/tokumx
30 net-fs/nfstest
31 -sys-boot/udk
32
33 # Piotr Karbowski <slashbeast@g.o> (2020-08-28)
34 # Temporary mask due to multiple reports of segfaults at startup, bug #739056
35
36 diff --git a/sys-boot/udk/Manifest b/sys-boot/udk/Manifest
37 deleted file mode 100644
38 index 5b45c5e5d81..00000000000
39 --- a/sys-boot/udk/Manifest
40 +++ /dev/null
41 @@ -1,3 +0,0 @@
42 -DIST UDK2015.Complete.MyWorkSpace.zip 121736982 BLAKE2B b37bd9ead6ce2c665128199249483ecbcb0f410077d0ca61820bdccb7ae71f6dad870a3cf2dad79f997ad9114678fab3c15a17227ae33aa1ff66f9187aa3a568 SHA512 7856a8f29296f817e8fd09d8eaf7207f4e25a13faa10936d1ceb10cb6a900be265379722c0ade0ef93b1c640fef8693667d2567962e3288b20ae77f607f03d39
43 -DIST udk-2018-docs.zip 79352781 BLAKE2B 9d08579d4645121cabb7ac52850de6492f9990240da9236064352df0595867bfc6952c9858865a8ce1d81982ec0e2440dc19930a75595454257294462adc60d6 SHA512 6ba2d961f20267cafb94bd020e8fe71e1392f1f2cdbc5c9f0a43212253ddf137b3e12cc789299dfd1ea099bb1541703b995ae20d28f0275395f5f85ed0656954
44 -DIST udk-2018.tar.gz 38642782 BLAKE2B a10171659451d7d3df737066ec0471db1e5055bd52556d4d0654b244e827512db8d88e2b74b4dfe0189f768e0eab7a705aa32a720e047555995cf339ea50c62f SHA512 8fd9316f08a5c30f8684b2fde73906a943bb067ec91699f41796e27679af73dbc38efaa100a57d4b835656b402d9c08896abc5c10fd0d607a7e0173b3d7a60b2
45
46 diff --git a/sys-boot/udk/files/2015-makefile.template b/sys-boot/udk/files/2015-makefile.template
47 deleted file mode 100644
48 index c8ae8b6b420..00000000000
49 --- a/sys-boot/udk/files/2015-makefile.template
50 +++ /dev/null
51 @@ -1,54 +0,0 @@
52 -TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
53 -EXEC = «MODULE».efi
54 -SRC = $(shell find $(TOP) -type f -name '*.c')
55 -OBJ = $(SRC:.c=.o)
56 -INC_DIR = /usr/include/«PACKAGE_NAME»
57 -LIB_DIR = /usr/lib
58 -«STATIC_LIBS»
59 -
60 -EFI_LDS = $(LIB_DIR)/GccBase.lds
61 -
62 -«MODULE_TYPE»
63 -«IMAGE_ENTRY_POINT»
64 -
65 -«CP»
66 -«RM»
67 -«CC»
68 -«DLINK»
69 -«OBJCOPY»
70 -«GENFW»
71 -
72 -CC_FLAGS = -g -fshort-wchar -fno-strict-aliasing -Wall -Werror \
73 - -Wno-array-bounds -ffunction-sections -fdata-sections -c -iquote$(TOP) \
74 - -include AutoGen.h -I$(INC_DIR) -DSTRING_ARRAY_NAME=«MODULE»Strings -m64 \
75 - -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS \
76 - -mno-red-zone -Wno-address -mcmodel=large -Wno-address \
77 - -Wno-unused-but-set-variable
78 -DLINK_FLAGS=-nostdlib -n -q --gc-sections --entry $(IMAGE_ENTRY_POINT) \
79 - -u $(IMAGE_ENTRY_POINT) -melf_x86_64 --oformat=elf64-x86-64 -L $(LIB_DIR) \
80 - --script=$(EFI_LDS) --defsym=PECOFF_HEADER_SIZE=«PECOFF_HEADER_SIZE»
81 -«OBJCOPY_FLAGS»
82 -«GENFW_FLAGS»
83 -
84 -all: $(EXEC)
85 -
86 -%.efi: $(OBJ)
87 - $(DLINK) -o $(@:.efi=.dll) $(DLINK_FLAGS) \
88 - --start-group $(STATIC_LIBRARY_FILES) $^ --end-group
89 - $(OBJCOPY) $(OBJCOPY_FLAGS) $(@:.efi=.dll)
90 - $(CP) $(@:.efi=.dll) $(@:.efi=.debug)
91 - $(OBJCOPY) --strip-unneeded -R .eh_frame $(@:.efi=.dll)
92 - $(OBJCOPY) --add-gnu-debuglink=$(@:.efi=.debug) $(@:.efi=.dll)
93 - $(GENFW) -e $(MODULE_TYPE) -o $@ $(@:.efi=.dll) $(GENFW_FLAGS)
94 - $(RM) $(@:.efi=.dll)
95 -
96 -%.o: %.c
97 - $(CC) $(CC_FLAGS) -o $@ $^
98 -
99 -clean:
100 - $(RM) *.o
101 -
102 -mrproper: clean
103 - $(RM) $(EXEC) $(EXEC:.efi=.debug)
104 -
105 -.PHONY: all clean mrproper
106
107 diff --git a/sys-boot/udk/files/2015-tools_def.template b/sys-boot/udk/files/2015-tools_def.template
108 deleted file mode 100644
109 index 5c866354a85..00000000000
110 --- a/sys-boot/udk/files/2015-tools_def.template
111 +++ /dev/null
112 @@ -1,42 +0,0 @@
113 -
114 -#################
115 -# My custom toolchain
116 -#################
117 -*_CUSTOM_*_*_FAMILY = GCC
118 -*_CUSTOM_*_MAKE_PATH = make
119 -*_CUSTOM_*_ASL_PATH = DEF(UNIX_IASL_BIN)
120 -*_CUSTOM_*_OBJCOPY_PATH = «OBJCOPY»
121 -*_CUSTOM_*_CC_PATH = «CC»
122 -*_CUSTOM_*_SLINK_PATH = «AR»
123 -*_CUSTOM_*_DLINK_PATH = «LD»
124 -*_CUSTOM_*_ASLDLINK_PATH = «LD»
125 -*_CUSTOM_*_ASM_PATH = «CC»
126 -*_CUSTOM_*_PP_PATH = «CC»
127 -*_CUSTOM_*_VFRPP_PATH = «CC»
128 -*_CUSTOM_*_ASLCC_PATH = «CC»
129 -*_CUSTOM_*_ASLPP_PATH = «CC»
130 -*_CUSTOM_*_RC_PATH = «OBJCOPY»
131 -*_CUSTOM_*_PP_FLAGS = DEF(GCC_PP_FLAGS)
132 -*_CUSTOM_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS)
133 -*_CUSTOM_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
134 -*_CUSTOM_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS)
135 -*_CUSTOM_*_APP_FLAGS =
136 -*_CUSTOM_*_ASL_FLAGS = DEF(IASL_FLAGS)
137 -*_CUSTOM_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
138 -*_CUSTOM_*_OBJCOPY_FLAGS =
139 -*_CUSTOM_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
140 -*_CUSTOM_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 -march=i386
141 -*_CUSTOM_IA32_CC_FLAGS = «CFLAGS» -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -D EFI32
142 -*_CUSTOM_IA32_ASLDLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry ReferenceAcpiTable -u ReferenceAcpiTable -m elf_i386
143 -*_CUSTOM_IA32_DLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -m elf_i386 --oformat=elf32-i386
144 -*_CUSTOM_IA32_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x220
145 -*_CUSTOM_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
146 -*_CUSTOM_IA32_NASM_FLAGS = -f elf32
147 -*_CUSTOM_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
148 -*_CUSTOM_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64
149 -*_CUSTOM_X64_CC_FLAGS = «CFLAGS» -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS
150 -*_CUSTOM_X64_ASLDLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry ReferenceAcpiTable -u ReferenceAcpiTable -m elf_x86_64
151 -*_CUSTOM_X64_DLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -m elf_x86_64 --oformat=elf64-x86-64
152 -*_CUSTOM_X64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x228
153 -*_CUSTOM_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
154 -*_CUSTOM_X64_NASM_FLAGS = -f elf64
155
156 diff --git a/sys-boot/udk/files/udk-workspace.template b/sys-boot/udk/files/udk-workspace.template
157 deleted file mode 100644
158 index e119c3ae1a3..00000000000
159 --- a/sys-boot/udk/files/udk-workspace.template
160 +++ /dev/null
161 @@ -1,63 +0,0 @@
162 -#!/bin/bash
163 -# Copyright 1999-2019 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -SCRIPT_NAME='udk-workspace'
167 -[ -n "${BASH_SOURCE}" ] && SCRIPT_NAME="${BASH_SOURCE}"
168 -
169 -show_usage() {
170 - if [ ! -z "${1}" ]; then
171 - echo "${1}" >&2
172 - echo >&2
173 - fi
174 - echo "Usage:"
175 - echo ". ${SCRIPT_NAME} [folder]"
176 - echo "where folder is the workspace folder - current directory is used if unspecified"
177 -}
178 -
179 -create_workspace() {
180 - local workspace_dir="${PWD}"
181 - if [ ! -z "${1}" ]; then
182 - workspace_dir="${1}"
183 - if ! mkdir -p "${1}"; then
184 - show_usage "Cannot create directory ${1}"
185 - return 1
186 - fi
187 - fi
188 -
189 - pushd "${workspace_dir}" >/dev/null
190 - if ! mkdir -p Conf; then
191 - show_usage "Cannot create configuration directory"
192 - return 1
193 - fi
194 - export WORKSPACE="${PWD}"
195 - popd >/dev/null
196 -}
197 -
198 -if [ "${1}" = "-h" ] || [ "${1}" = "--help" ]; then
199 - show_usage
200 - # Script may have been sourced
201 - return 0 2>/dev/null
202 - exit 0
203 -elif [ "${SCRIPT_NAME}" = "${0}" ]; then
204 - show_usage "Script must be sourced"
205 - exit 1
206 -elif [ $# -gt 1 ]; then
207 - show_usage "Too many arguments"
208 - return 1
209 -fi
210 -
211 -if ! create_workspace "${1}"; then
212 - return 1
213 -fi
214 -unset -f show_usage
215 -unset -f create_workspace
216 -shift $#
217 -
218 -export EDK_TOOLS_PATH="{EDK_BASE}/BaseTools"
219 -. "{EDK_BASE}/edksetup.sh"
220 -
221 -echo "Do not forget to call this script each time you open a new terminal or work on"
222 -echo "another workspace."
223 -echo "For more information, type:"
224 -echo "${SCRIPT_NAME} --help"
225
226 diff --git a/sys-boot/udk/metadata.xml b/sys-boot/udk/metadata.xml
227 deleted file mode 100644
228 index a9f04df71ec..00000000000
229 --- a/sys-boot/udk/metadata.xml
230 +++ /dev/null
231 @@ -1,15 +0,0 @@
232 -<?xml version='1.0' encoding='UTF-8'?>
233 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
234 -<pkgmetadata>
235 - <maintainer type="person">
236 - <email>sveyret@×××××.com</email>
237 - <name>Stéphane Veyret</name>
238 - </maintainer>
239 - <maintainer type="project">
240 - <email>proxy-maint@g.o</email>
241 - <name>Proxy Maintainers</name>
242 - </maintainer>
243 - <upstream>
244 - <remote-id type="github">tianocore/udk</remote-id>
245 - </upstream>
246 -</pkgmetadata>
247
248 diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
249 deleted file mode 100644
250 index 0e6388c5e43..00000000000
251 --- a/sys-boot/udk/udk-2015-r1.ebuild
252 +++ /dev/null
253 @@ -1,203 +0,0 @@
254 -# Copyright 1999-2020 Gentoo Authors
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -EAPI=7
258 -
259 -PYTHON_COMPAT=( python2_7 )
260 -PYTHON_REQ_USE="sqlite"
261 -
262 -inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs
263 -
264 -MY_V="${PN^^}${PV}"
265 -
266 -DESCRIPTION="Tianocore UEFI Development kit"
267 -HOMEPAGE=" https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
268 -SRC_URI="https://github.com/tianocore/${PN}/releases/download/${MY_V}/${MY_V}.Complete.MyWorkSpace.zip"
269 -
270 -LICENSE="BSD"
271 -SLOT="0"
272 -KEYWORDS="~amd64 ~x86"
273 -IUSE="doc examples"
274 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
275 -RESTRICT="strip"
276 -
277 -RDEPEND="${PYTHON_DEPS}"
278 -DEPEND="${RDEPEND}
279 - app-arch/unzip
280 - dev-lang/nasm"
281 -
282 -S="${WORKDIR}/MyWorkSpace"
283 -
284 -# Generated libs for EFI can contain WX sections
285 -QA_EXECSTACK="usr/lib*/libBaseLib.a:*"
286 -
287 -pkg_setup() {
288 - python_setup 'python2.7'
289 -
290 - if [[ ${ARCH} == "amd64" ]]; then
291 - ARCH=X64
292 - elif [[ ${ARCH} == "x86" ]]; then
293 - ARCH=IA32
294 - fi
295 -
296 - # We will create a custom toolchain with user defined settings
297 - TOOLCHAIN_TAG="CUSTOM"
298 -}
299 -
300 -src_unpack() {
301 - unpack ${A}
302 - unpack "${WORKDIR}/${MY_V}.MyWorkSpace.zip"
303 -
304 - pushd "${S}" || die
305 - unpack "${WORKDIR}/BaseTools(Unix).tar"
306 -
307 - local doc_name
308 - local f
309 - if use doc; then
310 - mkdir -p "${S}/doc" || die
311 - pushd "${S}/doc" >/dev/null || die
312 - for f in "${WORKDIR}/Documents/"*" Document.zip"; do
313 - doc_name=${f##*/}
314 - doc_name=${doc_name% Document.zip}
315 - if [[ -f "${WORKDIR}/Documents/${doc_name} Document.zip" ]]; then
316 - unpack "${WORKDIR}/Documents/${doc_name} Document.zip"
317 - mv "html" "${doc_name}" || die
318 - fi
319 - done
320 - popd >/dev/null || die
321 - fi
322 -
323 - popd >/dev/null || die
324 -}
325 -
326 -src_configure() {
327 - # Patch source file for permissive error (issue #639080)
328 - sed -e "s/\(mStringFileName == \)'\\\\0'/\1NULL/" \
329 - -i "${S}/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp" \
330 - || die "Failed to patch source file"
331 - sed -e "s/\((StringPtr != \)L'\\\\0'/\1NULL/" \
332 - -i "${S}/MdeModulePkg/Library/UefiHiiLib/HiiLib.c" \
333 - || die "Failed to patch source file"
334 - # Compile of Base Tools is required for further setting up the environment
335 - # Base tools does not like parallel make
336 - sed -e "s|^\(CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
337 - -i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \
338 - || die "Failed to update makefile header"
339 - local make_flags=(
340 - CC="$(tc-getCC)"
341 - CXX="$(tc-getCXX)"
342 - AS="$(tc-getAS)"
343 - AR="$(tc-getAR)"
344 - LD="$(tc-getLD)"
345 - )
346 - emake "${make_flags[@]}" -j1 -C BaseTools
347 - . edksetup.sh BaseTools
348 -
349 - # Update flags in UDK parameter files
350 - append-cflags -fshort-wchar -fno-strict-aliasing -c
351 - append-cflags $(test-flags-CC -ffunction-sections)
352 - append-cflags $(test-flags-CC -fdata-sections)
353 - append-cflags $(test-flags-CC -fno-stack-protector)
354 - append-cflags $(test-flags-CC -fno-asynchronous-unwind-tables)
355 - if [[ "${ARCH}" == "X64" ]]; then
356 - append-cflags $(test-flags-CC -m64) $(test-flags-CC -mno-red-zone)
357 - append-cflags $(test-flags-CC -mcmodel=large)
358 - else
359 - append-cflags $(test-flags-CC -m32) $(test-flags-CC -malign-double)
360 - fi
361 - sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
362 - -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
363 - -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${ARCH}|" \
364 - -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
365 - -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
366 - -i "${S}/Conf/target.txt" || die "Failed to configure target file"
367 - sed -e "s|«CC»|$(tc-getCC)|" \
368 - -e "s|«AR»|$(tc-getAR)|" \
369 - -e "s|«LD»|$(tc-getLD)|" \
370 - -e "s|«OBJCOPY»|$(tc-getOBJCOPY)|" \
371 - -e "s|«CFLAGS»|${CFLAGS}|" \
372 - "${FILESDIR}/${PV}-tools_def.template" >>"${S}/Conf/tools_def.txt" \
373 - || die "Failed to prepare tools definition file"
374 -}
375 -
376 -src_compile() {
377 - if use examples; then
378 - ewarn "Examples installation does not work anymore"
379 - ewarn "Try with a most recent version of the package"
380 - fi
381 -
382 - build libraries || die "Failed to compile environment"
383 -}
384 -
385 -src_install() {
386 - local f
387 - local build_dir="${S}/Build/MdeModule/RELEASE_${TOOLCHAIN_TAG}/${ARCH}"
388 -
389 - for f in "${build_dir}"/*/Library/*/*/OUTPUT/*.lib; do
390 - local fn="lib${f##*/}"
391 - newlib.a "${f}" "${fn%.lib}.a"
392 - done
393 - dolib.a "${S}/BaseTools/Scripts/GccBase.lds"
394 -
395 - insinto "/usr/include/${PN}"
396 - doins "${S}/MdePkg/Include/"*.h
397 - doins -r "${S}/MdePkg/Include/"{${ARCH}/.,Guid,IndustryStandard,Library,Pi,Ppi,Protocol,Uefi}
398 - local hfile
399 - while read -d '' -r hfile; do
400 - doins -r "${hfile}/."
401 - done < <(find "${S}" -name 'BaseTools' -prune -o -name 'MdePkg' -prune -o \
402 - -name 'CryptoPkg' -prune -o -type d -name Include -print0)
403 -
404 - dobin "${S}/BaseTools/Source/C/bin/GenFw"
405 -
406 - if use doc; then
407 - docinto "html"
408 - # Document installation may be very long, so split it and display message
409 - for f in "${S}"/doc/*; do
410 - ebegin "Install documentation for ${f##*/}"
411 - dodoc -r "${f}"
412 - eend $?
413 - done
414 - fi
415 -}
416 -
417 -##
418 -# Parameters:
419 -# 1 - Path where to search for source files.
420 -# 2 - Path where source files must be copied.
421 -copySourceFiles() {
422 - local dest_file
423 - while read -d '' -r filename; do
424 - dest_file="${2}${filename#${1}}"
425 - mkdir -p "${dest_file%/*}" || die
426 - mv "${filename}" "${dest_file}" || die
427 - done < <(find "${1}" -name '*.h' -print0 -o -name '*.c' -print0)
428 -}
429 -
430 -##
431 -# Parameters:
432 -# 1 - Path of the file to create.
433 -# 2 - Name of the module.
434 -# 3 - Path of the generated Makefile.
435 -createMakefile() {
436 - local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \
437 - | sed -e 's|^\s*\$(BIN_DIR).*/\([^/]*\)\.lib|\t-l\1|' -e 's|\\$|\\\\\\n|' | tr --delete '\n')
438 - local pecoff_header_size;
439 - [[ $ARCH == X64 ]] && pecoff_header_size='0x228' || pecoff_header_size='0x220'
440 - sed -e "s|«MODULE»|${2}|" \
441 - -e "s|«PACKAGE_NAME»|${PN}|" \
442 - -e "s|«STATIC_LIBS»|${static_libs}|" \
443 - -e "s|«MODULE_TYPE»|$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1)|" \
444 - -e "s|«IMAGE_ENTRY_POINT»|$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3})|" \
445 - -e "s|«CP»|$(grep -e '^CP\s*=' ${3})|" \
446 - -e "s|«RM»|$(grep -e '^RM\s*=' ${3})|" \
447 - -e "s|«CC»|$(grep -e '^CC\s*=' ${3})|" \
448 - -e "s|«DLINK»|$(grep -e '^DLINK\s*=' ${3})|" \
449 - -e "s|«OBJCOPY»|$(grep -e '^OBJCOPY\s*=' ${3})|" \
450 - -e "s|«GENFW»|$(grep -e '^GENFW\s*=' ${3})|" \
451 - -e "s|«PECOFF_HEADER_SIZE»|${pecoff_header_size}|" \
452 - -e "s|«OBJCOPY_FLAGS»|$(grep -e '^OBJCOPY_FLAGS\s*=' ${3})|" \
453 - -e "s|«GENFW_FLAGS»|$(grep -e '^GENFW_FLAGS\s*=' ${3})|" \
454 - "${FILESDIR}/${PV}-makefile.template" >${1} \
455 - || die "Failed to create Makefile"
456 -}
457
458 diff --git a/sys-boot/udk/udk-2018-r1.ebuild b/sys-boot/udk/udk-2018-r1.ebuild
459 deleted file mode 100644
460 index 3ad3971c96a..00000000000
461 --- a/sys-boot/udk/udk-2018-r1.ebuild
462 +++ /dev/null
463 @@ -1,146 +0,0 @@
464 -# Copyright 1999-2020 Gentoo Authors
465 -# Distributed under the terms of the GNU General Public License v2
466 -
467 -EAPI=7
468 -
469 -PYTHON_COMPAT=( python2_7 )
470 -PYTHON_REQ_USE="sqlite"
471 -
472 -inherit multiprocessing python-single-r1 toolchain-funcs
473 -
474 -DESCRIPTION="Tianocore UEFI Development kit"
475 -HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
476 -
477 -if [[ ${PV} == *9999* ]]; then
478 - inherit git-r3
479 - EGIT_REPO_URI="https://github.com/tianocore/edk2.git"
480 - KEYWORDS=""
481 -else
482 - MY_V="${PN^^}${PV}"
483 - SRC_URI="https://github.com/tianocore/edk2/archive/v${MY_V}.tar.gz -> ${P}.tar.gz
484 - doc? ( https://github.com/tianocore/edk2/releases/download/v${MY_V}/${MY_V}.Documents.zip -> ${P}-docs.zip )"
485 - S="${WORKDIR}/edk2-v${MY_V}"
486 - KEYWORDS="~amd64 ~x86"
487 -fi
488 -
489 -LICENSE="BSD-2"
490 -SLOT="0"
491 -IUSE="doc"
492 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
493 -RESTRICT="strip"
494 -
495 -RDEPEND="${PYTHON_DEPS}"
496 -DEPEND="${RDEPEND}
497 - >=dev-lang/nasm-2.14.02
498 - >=sys-power/iasl-20160729
499 - doc? ( app-arch/unzip )"
500 -
501 -DOCDIR="${WORKDIR}/Documents"
502 -
503 -# EFI pre-build libs
504 -QA_PREBUILT="
505 - usr/lib/${P}/BeagleBoardPkg/Debugger_scripts/rvi_dummy.axf
506 - usr/lib/${P}/ArmPkg/Library/GccLto/*.a
507 -"
508 -# GenBiosId is built upstream
509 -# VfrCompile does not use LDFLAGS but next upsteam version should change this
510 -QA_FLAGS_IGNORED="
511 - usr/lib/udk-2018/BaseTools/Source/C/bin/VfrCompile
512 - usr/lib/${P}/Vlv2TbltDevicePkg/GenBiosId
513 -"
514 -
515 -pkg_setup() {
516 - if use x86; then
517 - EFIARCH=IA32
518 - elif use amd64; then
519 - EFIARCH=X64
520 - fi
521 -
522 - # Select toolchain within predefined ones
523 - if tc-is-gcc; then
524 - TOOLCHAIN_TAG="GCC5"
525 - elif tc-is-clang; then
526 - TOOLCHAIN_TAG="CLANG38"
527 - else
528 - TOOLCHAIN_TAG="ELFGCC"
529 - fi
530 -}
531 -
532 -src_unpack() {
533 - default
534 -
535 - local doc_name
536 - local f
537 - if use doc; then
538 - pushd "${DOCDIR}" >/dev/null || die
539 - rm -f *.chm || die
540 - for f in *.zip; do
541 - unpack "${DOCDIR}/${f}"
542 - mv html "${f%.zip}" || die
543 - done
544 - rm -f *.zip || die
545 - popd >/dev/null || die
546 - fi
547 -}
548 -
549 -src_configure() {
550 - sed -e "s|^\(BUILD_CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
551 - -e "s|^\(BUILD_LFLAGS\s*=\).*$|\1 ${LDFLAGS}|" \
552 - -e "s|^\(BUILD_CXXFLAGS\s*=\).*$|\1 ${CXXFLAGS} -Wno-unused-result|" \
553 - -i "BaseTools/Source/C/Makefiles/header.makefile" \
554 - || die "Failed to update makefile header"
555 -}
556 -
557 -src_compile() {
558 - local make_flags=(
559 - BUILD_CC="$(tc-getBUILD_CC)"
560 - BUILD_CXX="$(tc-getBUILD_CXX)"
561 - BUILD_AS="$(tc-getBUILD_AS)"
562 - BUILD_AR="$(tc-getBUILD_AR)"
563 - BUILD_LD="$(tc-getBUILD_LD)"
564 - )
565 - # Base tools does not like parallel make
566 - emake "${make_flags[@]}" -j1 -C BaseTools
567 -
568 - # Update template parameter files
569 - sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
570 - -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
571 - -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${EFIARCH}|" \
572 - -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
573 - -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
574 - -i "BaseTools/Conf/target.template" || die "Failed to configure target file"
575 -
576 - # Clean unneeded files
577 - find . -name '*.bat' -o -name '*.exe' -exec rm -f {} \; || die
578 - find ./BaseTools/Source/C -mindepth 1 -maxdepth 1 \! -name 'bin' -exec rm -rf {} \; || die
579 -
580 - # Upsteam hack (symbolic link) should only be created if needed
581 - rm "${S}/EmulatorPkg/Unix/Host/X11IncludeHack" || die
582 -
583 - # Create workspace script file
584 - sed -e "s|{EDK_BASE}|${EPREFIX}/usr/lib/${P}|" \
585 - "${FILESDIR}"/udk-workspace.template \
586 - > "${T}/udk-workspace" || die "Failed to build udk-workspace"
587 -}
588 -
589 -src_install() {
590 - dobin "${T}/udk-workspace"
591 -
592 - # Use mkdir && cp here as doins does not preserve execution bits
593 - mkdir -p "${ED}/usr/lib/${P}" || die
594 - cp -pR "${S}"/* "${D}/usr/lib/${P}" || die
595 - dosym "${P}" "/usr/lib/${PN}"
596 -
597 - local HTML_DOCS
598 - use doc && HTML_DOCS=( "${DOCDIR}"/. )
599 - einstalldocs
600 -}
601 -
602 -pkg_postinst() {
603 - elog "To create a new workspace, execute:"
604 - elog " . udk-workspace [workspace_dir]"
605 - elog "You can link appropriate packages to your workspace. For example,"
606 - elog "in order to build MdeModulePkg and examples, you can try:"
607 - elog " ln -s \"${EROOT}/usr/lib/${P}/\"Mde{Module,}Pkg ."
608 - elog " build -a ${EFIARCH} all"
609 -}