[gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2016-11-06 16:24 Göktürk Yüksek
  0 siblings, 0 replies; 8+ messages in thread
From: Göktürk Yüksek @ 2016-11-06 16:24 UTC (permalink / raw
  To: gentoo-commits

commit:     914bc84817b90e9b38840602e03220e6e49f0dbc
Author:     Stéphane Veyret <stephane.veyret <AT> neptura <DOT> org>
AuthorDate: Sun Nov  6 15:32:07 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 16:23:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914bc848

sys-boot/udk: Put French first as temporary workaround, bug #599060

Portage local use flag creation is buggy and using the last seen language, so keep english last.

Package-Manager: portage-2.3.0

 sys-boot/udk/metadata.xml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys-boot/udk/metadata.xml b/sys-boot/udk/metadata.xml
index c07291a..f414fe5 100644
--- a/sys-boot/udk/metadata.xml
+++ b/sys-boot/udk/metadata.xml
@@ -9,20 +9,12 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Tianocore UEFI Development Kit, a stable release of portions of the
-		EDK II project.
-	</longdescription>
 	<longdescription lang="fr">
 		Kit de développement UEFI Tianocore, une version stable de portions du
 		projet EDK II.
 	</longdescription>
-	<use lang="en">
-		<flag name="doc">Install EDK II documentation.</flag>
-		<flag name="examples">Install usage examples.</flag>
-	</use>
-	<use lang="fr">
-		<flag name="doc">Installer la documentation EDK II.</flag>
-		<flag name="examples">Installer les exemples d'utilisation.</flag>
-	</use>
+	<longdescription lang="en">
+		Tianocore UEFI Development Kit, a stable release of portions of the
+		EDK II project.
+	</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2017-04-23 21:01 David Seifert
  0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2017-04-23 21:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b0db4186ca9a9921ddad8d1c60bb349e7106a531
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 20:51:03 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 21:00:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0db4186

sys-boot/udk: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-boot/udk/udk-2015.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-boot/udk/udk-2015.ebuild b/sys-boot/udk/udk-2015.ebuild
index 8061f63ed8c..0d0ea384e54 100644
--- a/sys-boot/udk/udk-2015.ebuild
+++ b/sys-boot/udk/udk-2015.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,21 +8,23 @@ PYTHON_REQ_USE="sqlite"
 
 inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs versionator
 
+MY_V="${PN^^}$(get_version_component_range 1)"
+
 DESCRIPTION="Tianocore UEFI Development kit"
 HOMEPAGE="http://www.tianocore.org/edk2/"
-MY_V="${PN^^}$(get_version_component_range 1)"
 SRC_URI="https://github.com/tianocore/${PN}/releases/download/${MY_V}/${MY_V}.Complete.MyWorkSpace.zip"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
-
-DEPEND="app-arch/unzip
-	dev-lang/nasm
-	${PYTHON_DEPS}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-lang/nasm"
+
 S="${WORKDIR}/MyWorkSpace"
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2017-08-13 12:53 Patrice Clement
  0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2017-08-13 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5b762c7b7a468d84580cca5d03b7f8261918d4c9
Author:     charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Sun Aug 13 12:06:06 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 12:53:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b762c7b

sys-boot/udk: HOMEPAGE (avoid redirect).

Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5403

 sys-boot/udk/udk-2015.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/udk/udk-2015.ebuild b/sys-boot/udk/udk-2015.ebuild
index 0d0ea384e54..877b99c94eb 100644
--- a/sys-boot/udk/udk-2015.ebuild
+++ b/sys-boot/udk/udk-2015.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs versionato
 MY_V="${PN^^}$(get_version_component_range 1)"
 
 DESCRIPTION="Tianocore UEFI Development kit"
-HOMEPAGE="http://www.tianocore.org/edk2/"
+HOMEPAGE=" https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
 SRC_URI="https://github.com/tianocore/${PN}/releases/download/${MY_V}/${MY_V}.Complete.MyWorkSpace.zip"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2019-05-01 21:42 Georgy Yakovlev
  0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2019-05-01 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f9c41f936caf99abb18910db5c68ff68a49c50f9
Author:     Stéphane Veyret <sveyret <AT> gmail <DOT> com>
AuthorDate: Tue Apr  9 13:34:10 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:41:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c41f93

sys-boot/udk: Correct issues with latest compiler versions

Signed-off-by: Stéphane VEYRET <sveyret <AT> gmail.com>
Closes: https://bugs.gentoo.org/633946
Closes: https://bugs.gentoo.org/639080
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../udk/{udk-2015.ebuild => udk-2015-r1.ebuild}    | 124 +++++++--------------
 1 file changed, 40 insertions(+), 84 deletions(-)

diff --git a/sys-boot/udk/udk-2015.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
similarity index 57%
rename from sys-boot/udk/udk-2015.ebuild
rename to sys-boot/udk/udk-2015-r1.ebuild
index 877b99c94eb..fbb8ad18187 100644
--- a/sys-boot/udk/udk-2015.ebuild
+++ b/sys-boot/udk/udk-2015-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs versionator
+inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs
 
-MY_V="${PN^^}$(get_version_component_range 1)"
+MY_V="${PN^^}${PV}"
 
 DESCRIPTION="Tianocore UEFI Development kit"
 HOMEPAGE=" https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="strip"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
@@ -27,18 +28,20 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/MyWorkSpace"
 
+# Generated libs for EFI can contain WX sections
+QA_EXECSTACK="usr/lib*/libBaseLib.a:*"
+
 pkg_setup() {
 	python_setup 'python2.7'
 
-	local uname_arch=$(uname -m | sed -e 's:i[3456789]86:IA32:')
-	if [[ ${uname_arch} == "x86_64" ]] || [[ ${uname_arch} == "amd64" ]] ; then
-		export ARCH=X64
-	else
-		export ARCH=${uname_arch}
+	if [[ ${ARCH} == "amd64" ]]; then
+		ARCH=X64
+	elif [[ ${ARCH} == "x86" ]]; then
+		ARCH=IA32
 	fi
 
 	# We will create a custom toolchain with user defined settings
-	export TOOLCHAIN_TAG="CUSTOM"
+	TOOLCHAIN_TAG="CUSTOM"
 }
 
 src_unpack() {
@@ -54,10 +57,11 @@ src_unpack() {
 		mkdir -p "${S}/doc" || die
 		pushd "${S}/doc" >/dev/null || die
 		for f in "${WORKDIR}/Documents/"*" Document.zip"; do
-			doc_name=$(echo ${f} | sed -e 's:^.*/\([^/]*\) Document[.]zip$:\1:')
+			doc_name=${f##*/}
+			doc_name=${doc_name% Document.zip}
 			if [[ -f "${WORKDIR}/Documents/${doc_name} Document.zip" ]]; then
 				unpack "${WORKDIR}/Documents/${doc_name} Document.zip"
-				mv "${S}/doc/html" "${S}/doc/${doc_name}" || die
+				mv "html" "${doc_name}" || die
 			fi
 		done
 		popd >/dev/null || die
@@ -67,14 +71,16 @@ src_unpack() {
 }
 
 src_configure() {
+	# Patch source file for permissive error (issue #639080)
+	sed -e "s/\(mStringFileName == \)'\\\\0'/\1NULL/" \
+		-i "${S}/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp" \
+		|| die "Failed to patch source file"
+	sed -e "s/\((StringPtr != \)L'\\\\0'/\1NULL/" \
+		-i "${S}/MdeModulePkg/Library/UefiHiiLib/HiiLib.c" \
+		|| die "Failed to patch source file"
 	# Compile of Base Tools is required for further setting up the environment
 	# Base tools does not like parallel make
-	local cflags_save=${CFLAGS}
-	append-cflags $(test-flags-CC -MD) $(test-flags-CC -fshort-wchar)
-	append-cflags $(test-flags-CC -fno-strict-aliasing)
-	append-cflags $(test-flags-CC -nostdlib) $(test-flags-CC -c)
-	append-cflags $(test-flags-CC -fPIC)
-	sed -e "s:^\(CFLAGS\s*=\).*$:\1 ${CFLAGS}:" \
+	sed -e "s:^\(CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
 		-i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \
 		|| die "Failed to update makefile header"
 	local make_flags=(
@@ -88,9 +94,7 @@ src_configure() {
 	. edksetup.sh BaseTools
 
 	# Update flags in UDK parameter files
-	CFLAGS=${cflags_save}
-	append-cflags $(test-flags-CC -fshort-wchar)
-	append-cflags $(test-flags-CC -fno-strict-aliasing) $(test-flags-CC -c)
+	append-cflags -fshort-wchar -fno-strict-aliasing -c
 	append-cflags $(test-flags-CC -ffunction-sections)
 	append-cflags $(test-flags-CC -fdata-sections)
 	append-cflags $(test-flags-CC -fno-stack-protector)
@@ -117,14 +121,12 @@ src_configure() {
 }
 
 src_compile() {
-	local build_target
 	if use examples; then
-		build_target=all
-	else
-		build_target=libraries
+		ewarn "Examples installation does not work anymore"
+		ewarn "Try with a most recent version of the package"
 	fi
 
-	build ${build_target} || die "Failed to compile environment"
+	build libraries || die "Failed to compile environment"
 }
 
 src_install() {
@@ -132,24 +134,19 @@ src_install() {
 	local build_dir="${S}/Build/MdeModule/RELEASE_${TOOLCHAIN_TAG}/${ARCH}"
 
 	for f in "${build_dir}"/*/Library/*/*/OUTPUT/*.lib; do
-		newlib.a "${f}" lib$(basename "${f}" .lib).a
+		local fn="lib${f##*/}"
+		newlib.a "${f}" "${fn%.lib}.a"
 	done
-	dolib "${S}/BaseTools/Scripts/GccBase.lds"
+	dolib.a "${S}/BaseTools/Scripts/GccBase.lds"
 
-	local include_dest="/usr/include/${PN}"
-	for f in "" /Guid /IndustryStandard /Library /Pi /Ppi /Protocol /Uefi; do
-		insinto "${include_dest}${f}"
-		doins "${S}/MdePkg/Include${f}"/*.h
-	done
-	insinto "${include_dest}"
-	doins "${S}/MdePkg/Include/${ARCH}"/*.h
+	insinto "/usr/include/${PN}"
+	doins "${S}/MdePkg/Include/"*.h
+	doins -r "${S}/MdePkg/Include/"{${ARCH}/.,Guid,IndustryStandard,Library,Pi,Ppi,Protocol,Uefi}
 	local hfile
-	find "${S}" -name 'BaseTools' -prune -o -name 'MdePkg' -prune -o \
-		-name 'CryptoPkg' -prune -o -type d -name Include \
-		-exec find {} -maxdepth 0 \; \
-		| while read hfile; do
-		doins -r "${hfile}"/*
-	done
+	while read -d '' -r hfile; do
+		doins -r "${hfile}/."
+	done < <(find "${S}" -name 'BaseTools' -prune -o -name 'MdePkg' -prune -o \
+		-name 'CryptoPkg' -prune -o -type d -name Include -print0)
 
 	dobin "${S}/BaseTools/Source/C/bin/GenFw"
 
@@ -157,52 +154,11 @@ src_install() {
 		docinto "html"
 		# Document installation may be very long, so split it and display message
 		for f in "${S}"/doc/*; do
-			ebegin "Installing documentation for $(basename ${f}), please wait"
+			ebegin "Install documentation for ${f##*/}"
 			dodoc -r "${f}"
 			eend $?
 		done
 	fi
-
-	local ex_rebuild_dir
-	local ex_name
-	local ex_build_dir
-	if use examples; then
-		ex_rebuild_dir="${S}/${P}-exemples"
-		for f in "${S}/MdeModulePkg/Application"/*; do
-			ex_name=$(basename "${f}")
-			ebegin "Preparing ${ex_name} example"
-			mkdir -p "${ex_rebuild_dir}/${ex_name}" || die
-			ex_build_dir="${build_dir}/MdeModulePkg/Application"
-			ex_build_dir="${ex_build_dir}/${ex_name}/${ex_name}"
-
-			copySourceFiles "${f}" "${ex_rebuild_dir}/${ex_name}"
-			copySourceFiles "${ex_build_dir}/DEBUG" "${ex_rebuild_dir}/${ex_name}"
-			createMakefile "${ex_rebuild_dir}/${ex_name}/Makefile" \
-				"${ex_name}" "${ex_build_dir}/GNUmakefile"
-
-			tar -C "${ex_rebuild_dir}" -cf "${ex_rebuild_dir}/${ex_name}.tar" \
-				"${ex_name}" || die
-
-			eend $? "Failed to create example file"
-		done
-		docinto "examples"
-		dodoc "${ex_rebuild_dir}"/*.tar
-	fi
-
-# TODO * QA Notice: The following files contain writable and executable sections
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:Thunk16.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:SwitchStack.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:SetJump.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:LongJump.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:EnableDisableInterrupts.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:DisablePaging64.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:CpuId.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:CpuIdEx.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:EnableCache.obj
-# TODO * !WX --- --- usr/lib64/libBaseLib.a:DisableCache.obj
-# TODO * QA Notice: Package triggers severe warnings which indicate that it
-# TODO *            may exhibit random runtime failures.
-# TODO * /usr/include/bits/string3.h:90:70: warning: call to void* __builtin___memset_chk(void*, int, long unsigned int, long unsigned int) will always overflow destination buffer
 }
 
 ##
@@ -213,7 +169,7 @@ copySourceFiles() {
 	local dest_file
 	while read -d '' -r filename; do
 		dest_file="${2}${filename#${1}}"
-		mkdir -p $(dirname "${dest_file}") || die
+		mkdir -p "${dest_file%/*}" || die
 		mv "${filename}" "${dest_file}" || die
 	done < <(find "${1}" -name '*.h' -print0 -o -name '*.c' -print0)
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2019-12-30 22:55 Sergei Trofimovich
  0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich @ 2019-12-30 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a146f0815d76cbcfecb1ade2d470ad1adcb63ee6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 22:55:40 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 22:55:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a146f081

sys-boot/udk: use ASCII whitespace

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-boot/udk/udk-2015-r1.ebuild | 4 ++--
 sys-boot/udk/udk-2018.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
index fbb8ad18187..ec568865288 100644
--- a/sys-boot/udk/udk-2015-r1.ebuild
+++ b/sys-boot/udk/udk-2015-r1.ebuild
@@ -162,7 +162,7 @@ src_install() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path where to search for source files.
 # 2 - Path where source files must be copied.
 copySourceFiles() {
@@ -175,7 +175,7 @@ copySourceFiles() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path of the file to create.
 # 2 - Name of the module.
 # 3 - Path of the generated Makefile.

diff --git a/sys-boot/udk/udk-2018.ebuild b/sys-boot/udk/udk-2018.ebuild
index d89fdb55e27..66b0fc8e9e9 100644
--- a/sys-boot/udk/udk-2018.ebuild
+++ b/sys-boot/udk/udk-2018.ebuild
@@ -171,7 +171,7 @@ src_install() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path where to search for source files.
 # 2 - Path where source files must be copied.
 copySourceFiles() {
@@ -184,7 +184,7 @@ copySourceFiles() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path of the file to create.
 # 2 - Name of the module.
 # 3 - Path of the generated Makefile.


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2020-04-30 12:00 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2020-04-30 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2fa93f1257ee4c9727b8398fe76467a416961e91
Author:     Stéphane Veyret <stephane <AT> neptura <DOT> org>
AuthorDate: Wed Apr 29 16:40:40 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 11:59:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa93f12

sys-boot/udk: Remove colon from sed

Closes: https://bugs.gentoo.org/710816
Signed-off-by: Stéphane Veyret <stephane <AT> neptura.org>
Closes: https://github.com/gentoo/gentoo/pull/15568
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-boot/udk/udk-2015-r1.ebuild | 54 ++++++++++++++++++++---------------------
 sys-boot/udk/udk-2018-r1.ebuild | 20 +++++++--------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
index ec568865288..0e6388c5e43 100644
--- a/sys-boot/udk/udk-2015-r1.ebuild
+++ b/sys-boot/udk/udk-2015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -80,7 +80,7 @@ src_configure() {
 		|| die "Failed to patch source file"
 	# Compile of Base Tools is required for further setting up the environment
 	# Base tools does not like parallel make
-	sed -e "s:^\(CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
+	sed -e "s|^\(CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
 		-i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \
 		|| die "Failed to update makefile header"
 	local make_flags=(
@@ -105,17 +105,17 @@ src_configure() {
 	else
 		append-cflags $(test-flags-CC -m32) $(test-flags-CC -malign-double)
 	fi
-	sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \
-		-e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \
-		-e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${ARCH}:" \
-		-e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \
-		-e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
+	sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
+		-e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
+		-e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${ARCH}|" \
+		-e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
+		-e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
 		-i "${S}/Conf/target.txt" || die "Failed to configure target file"
-	sed -e "s:«CC»:$(tc-getCC):" \
-		-e "s:«AR»:$(tc-getAR):" \
-		-e "s:«LD»:$(tc-getLD):" \
-		-e "s:«OBJCOPY»:$(tc-getOBJCOPY):" \
-		-e "s:«CFLAGS»:${CFLAGS}:" \
+	sed -e "s|«CC»|$(tc-getCC)|" \
+		-e "s|«AR»|$(tc-getAR)|" \
+		-e "s|«LD»|$(tc-getLD)|" \
+		-e "s|«OBJCOPY»|$(tc-getOBJCOPY)|" \
+		-e "s|«CFLAGS»|${CFLAGS}|" \
 		"${FILESDIR}/${PV}-tools_def.template" >>"${S}/Conf/tools_def.txt" \
 		|| die "Failed to prepare tools definition file"
 }
@@ -181,23 +181,23 @@ copySourceFiles() {
 # 3 - Path of the generated Makefile.
 createMakefile() {
 	local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \
-		| sed -e 's:^\s*\$(BIN_DIR).*/\([^/]*\)\.lib:\t-l\1:' -e 's:\\$:\\\\\\n:' | tr --delete '\n')
+		| sed -e 's|^\s*\$(BIN_DIR).*/\([^/]*\)\.lib|\t-l\1|' -e 's|\\$|\\\\\\n|' | tr --delete '\n')
 	local pecoff_header_size;
 	[[ $ARCH == X64 ]] && pecoff_header_size='0x228' || pecoff_header_size='0x220'
-	sed -e "s:«MODULE»:${2}:" \
-		-e "s:«PACKAGE_NAME»:${PN}:" \
-		-e "s:«STATIC_LIBS»:${static_libs}:" \
-		-e "s:«MODULE_TYPE»:$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1):" \
-		-e "s:«IMAGE_ENTRY_POINT»:$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3}):" \
-		-e "s:«CP»:$(grep -e '^CP\s*=' ${3}):" \
-		-e "s:«RM»:$(grep -e '^RM\s*=' ${3}):" \
-		-e "s:«CC»:$(grep -e '^CC\s*=' ${3}):" \
-		-e "s:«DLINK»:$(grep -e '^DLINK\s*=' ${3}):" \
-		-e "s:«OBJCOPY»:$(grep -e '^OBJCOPY\s*=' ${3}):" \
-		-e "s:«GENFW»:$(grep -e '^GENFW\s*=' ${3}):" \
-		-e "s:«PECOFF_HEADER_SIZE»:${pecoff_header_size}:" \
-		-e "s:«OBJCOPY_FLAGS»:$(grep -e '^OBJCOPY_FLAGS\s*=' ${3}):" \
-		-e "s:«GENFW_FLAGS»:$(grep -e '^GENFW_FLAGS\s*=' ${3}):" \
+	sed -e "s|«MODULE»|${2}|" \
+		-e "s|«PACKAGE_NAME»|${PN}|" \
+		-e "s|«STATIC_LIBS»|${static_libs}|" \
+		-e "s|«MODULE_TYPE»|$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1)|" \
+		-e "s|«IMAGE_ENTRY_POINT»|$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3})|" \
+		-e "s|«CP»|$(grep -e '^CP\s*=' ${3})|" \
+		-e "s|«RM»|$(grep -e '^RM\s*=' ${3})|" \
+		-e "s|«CC»|$(grep -e '^CC\s*=' ${3})|" \
+		-e "s|«DLINK»|$(grep -e '^DLINK\s*=' ${3})|" \
+		-e "s|«OBJCOPY»|$(grep -e '^OBJCOPY\s*=' ${3})|" \
+		-e "s|«GENFW»|$(grep -e '^GENFW\s*=' ${3})|" \
+		-e "s|«PECOFF_HEADER_SIZE»|${pecoff_header_size}|" \
+		-e "s|«OBJCOPY_FLAGS»|$(grep -e '^OBJCOPY_FLAGS\s*=' ${3})|" \
+		-e "s|«GENFW_FLAGS»|$(grep -e '^GENFW_FLAGS\s*=' ${3})|" \
 		"${FILESDIR}/${PV}-makefile.template" >${1} \
 		|| die "Failed to create Makefile"
 }

diff --git a/sys-boot/udk/udk-2018-r1.ebuild b/sys-boot/udk/udk-2018-r1.ebuild
index 89f40f3e1a5..3ad3971c96a 100644
--- a/sys-boot/udk/udk-2018-r1.ebuild
+++ b/sys-boot/udk/udk-2018-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -84,9 +84,9 @@ src_unpack() {
 }
 
 src_configure() {
-	sed -e "s:^\(BUILD_CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
-		-e "s:^\(BUILD_LFLAGS\s*=\).*$:\1 ${LDFLAGS}:" \
-		-e "s:^\(BUILD_CXXFLAGS\s*=\).*$:\1 ${CXXFLAGS} -Wno-unused-result:" \
+	sed -e "s|^\(BUILD_CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
+		-e "s|^\(BUILD_LFLAGS\s*=\).*$|\1 ${LDFLAGS}|" \
+		-e "s|^\(BUILD_CXXFLAGS\s*=\).*$|\1 ${CXXFLAGS} -Wno-unused-result|" \
 		-i "BaseTools/Source/C/Makefiles/header.makefile" \
 		|| die "Failed to update makefile header"
 }
@@ -103,11 +103,11 @@ src_compile() {
 	emake "${make_flags[@]}" -j1 -C BaseTools
 
 	# Update template parameter files
-	sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \
-		-e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \
-		-e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${EFIARCH}:" \
-		-e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \
-		-e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
+	sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
+		-e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
+		-e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${EFIARCH}|" \
+		-e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
+		-e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
 		-i "BaseTools/Conf/target.template" || die "Failed to configure target file"
 
 	# Clean unneeded files
@@ -118,7 +118,7 @@ src_compile() {
 	rm "${S}/EmulatorPkg/Unix/Host/X11IncludeHack" || die
 
 	# Create workspace script file
-	sed -e "s:{EDK_BASE}:${EPREFIX}/usr/lib/${P}:" \
+	sed -e "s|{EDK_BASE}|${EPREFIX}/usr/lib/${P}|" \
 		"${FILESDIR}"/udk-workspace.template \
 		> "${T}/udk-workspace" || die "Failed to build udk-workspace"
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2020-04-30 12:00 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2020-04-30 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     27d0310e603662ed408224e545d02df01bc08ade
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 11:59:34 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 11:59:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d0310e

sys-boot/udk: RedundantLongDescription

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-boot/udk/metadata.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sys-boot/udk/metadata.xml b/sys-boot/udk/metadata.xml
index 422810daaa8..a9f04df71ec 100644
--- a/sys-boot/udk/metadata.xml
+++ b/sys-boot/udk/metadata.xml
@@ -9,14 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="fr">
-		Kit de développement UEFI Tianocore, une version stable de portions du
-		projet EDK II.
-	</longdescription>
-	<longdescription lang="en">
-		Tianocore UEFI Development Kit, a stable release of portions of the
-		EDK II project.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">tianocore/udk</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
@ 2020-04-30 12:00 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2020-04-30 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d7d30a8e046ed0007ddb43df4491eb11b417e40a
Author:     Stéphane Veyret <stephane <AT> neptura <DOT> org>
AuthorDate: Wed Apr 29 16:40:00 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 11:59:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d30a8e

sys-boot/udk: Remove bad version

Signed-off-by: Stéphane Veyret <stephane <AT> neptura.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-boot/udk/udk-2018.ebuild | 212 -------------------------------------------
 1 file changed, 212 deletions(-)

diff --git a/sys-boot/udk/udk-2018.ebuild b/sys-boot/udk/udk-2018.ebuild
deleted file mode 100644
index 66b0fc8e9e9..00000000000
--- a/sys-boot/udk/udk-2018.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs
-
-DESCRIPTION="Tianocore UEFI Development kit"
-HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2.git"
-	KEYWORDS=""
-else
-	MY_V="${PN^^}${PV}"
-	SRC_URI="https://github.com/tianocore/edk2/archive/v${MY_V}.tar.gz -> ${P}.tar.gz
-		doc? ( https://github.com/tianocore/edk2/releases/download/v${MY_V}/${MY_V}.Documents.zip -> ${P}-docs.zip )"
-	S="${WORKDIR}/edk2-v${MY_V}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="strip"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/nasm-2.14.02
-	>=sys-power/iasl-20160729
-	doc? ( app-arch/unzip )"
-
-DOCDIR="${WORKDIR}/Documents"
-
-# Generated libs for EFI can contain WX sections
-QA_EXECSTACK="
-	usr/lib*/libBaseLib.a:*
-	usr/lib*/libBaseIoLibIntrinsic.a:*
-"
-
-pkg_setup() {
-	if [[ ${ARCH} == "amd64" ]]; then
-		ARCH=X64
-	elif [[ ${ARCH} == "x86" ]]; then
-		ARCH=IA32
-	fi
-
-	# Select toolchain within predefined ones
-	if tc-is-gcc; then
-		TOOLCHAIN_TAG="GCC5"
-	elif tc-is-clang; then
-		TOOLCHAIN_TAG="CLANG38"
-	else
-		TOOLCHAIN_TAG="ELFGCC"
-	fi
-}
-
-src_unpack() {
-	default
-
-	local doc_name
-	local f
-	if use doc; then
-		pushd "${DOCDIR}" >/dev/null || die
-		rm -f *.chm || die
-		for f in *.zip; do
-			unpack "${DOCDIR}/${f}"
-			mv html "${f%.zip}" || die
-		done
-		rm -f *.zip || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	# Compile of Base Tools is required for further setting up the environment
-	# Base tools does not like parallel make
-	sed -e "s:^\(BUILD_CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
-		-i "BaseTools/Source/C/Makefiles/header.makefile" \
-		|| die "Failed to update makefile header"
-	local make_flags=(
-		BUILD_CC="$(tc-getBUILD_CC)"
-		BUILD_CXX="$(tc-getBUILD_CXX)"
-		BUILD_AS="$(tc-getBUILD_AS)"
-		BUILD_AR="$(tc-getBUILD_AR)"
-		BUILD_LD="$(tc-getBUILD_LD)"
-	)
-	emake "${make_flags[@]}" -j1 -C BaseTools
-	. edksetup.sh
-
-	# Update UDK parameter files
-	sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \
-		-e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \
-		-e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${ARCH}:" \
-		-e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \
-		-e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
-		-i "Conf/target.txt" || die "Failed to configure target file"
-	sed -e "s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 $(tc-getCC):" \
-		-e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
-		-e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-		-e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-		-e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
-		-i "Conf/tools_def.txt" \
-		|| die "Failed to prepare tools definition file"
-}
-
-src_compile() {
-	build $(usex examples all libraries) || die "Failed to compile environment"
-
-# TODO * /var/tmp/portage/sys-apps/sandbox-2.10-r1/work/sandbox-2.10/libsandbox/trace.c:_do_ptrace():74: failure (Operation not permitted):
-# TODO * ISE:_do_ptrace: ptrace(PTRACE_TRACEME, ..., 0x0000000000000000, 0x0000000000000000): Operation not permitted
-}
-
-src_install() {
-	local f
-	local build_dir="${S}/Build/MdeModule/RELEASE_${TOOLCHAIN_TAG}/${ARCH}"
-
-	for f in "${build_dir}"/*/Library/*/*/OUTPUT/*.lib; do
-		local fn="lib${f##*/}"
-		newlib.a "${f}" "${fn%.lib}.a"
-	done
-
-	insinto "/usr/share/${P}"
-	doins "${S}/BaseTools/Scripts/GccBase.lds"
-
-	insinto "/usr/include/${PN}"
-	doins "${S}/MdePkg/Include/"*.h
-	doins -r "${S}/MdePkg/Include/"{${ARCH}/.,Guid,IndustryStandard,Library,Pi,Ppi,Protocol,Uefi}
-	local hfile
-	while read -d '' -r hfile; do
-		doins -r "${hfile}/."
-	done < <(find "${S}" -name 'BaseTools' -prune -o -name 'MdePkg' -prune -o \
-		-name 'CryptoPkg' -prune -o -type d -name Include -print0)
-
-	dobin "${S}/BaseTools/Source/C/bin/GenFw"
-
-	local HTML_DOCS
-	use doc && HTML_DOCS=( "${DOCDIR}"/. )
-	einstalldocs
-
-	local ex_rebuild_dir
-	local ex_name
-	local ex_build_dir
-	if use examples; then
-		ex_rebuild_dir="${S}/${P}-exemples"
-		for f in "${S}/MdeModulePkg/Application"/*; do
-			ex_name="${f##*/}"
-			ebegin "Install ${ex_name} example"
-			mkdir -p "${ex_rebuild_dir}/${ex_name}" || die
-			ex_build_dir="${build_dir}/MdeModulePkg/Application"
-			ex_build_dir="${ex_build_dir}/${ex_name}/${ex_name}"
-
-			copySourceFiles "${f}" "${ex_rebuild_dir}/${ex_name}"
-			copySourceFiles "${ex_build_dir}/DEBUG" "${ex_rebuild_dir}/${ex_name}"
-			createMakefile "${ex_rebuild_dir}/${ex_name}/Makefile" \
-				"${ex_name}" "${ex_build_dir}/GNUmakefile"
-
-			tar -C "${ex_rebuild_dir}" -cf "${ex_rebuild_dir}/${ex_name}.tar" \
-				"${ex_name}" || die
-
-			eend $?
-		done
-		docinto "examples"
-		dodoc "${ex_rebuild_dir}"/*.tar
-	fi
-}
-
-##
-# Parameters:
-# 1 - Path where to search for source files.
-# 2 - Path where source files must be copied.
-copySourceFiles() {
-	local dest_file
-	while read -d '' -r filename; do
-		dest_file="${2}${filename#${1}}"
-		mkdir -p "${dest_file%/*}" || die
-		mv "${filename}" "${dest_file}" || die
-	done < <(find "${1}" \( -name '*.h' -o -name '*.c' \) -print0)
-}
-
-##
-# Parameters:
-# 1 - Path of the file to create.
-# 2 - Name of the module.
-# 3 - Path of the generated Makefile.
-createMakefile() {
-	local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \
-		| sed -e 's:^\s*\$(BIN_DIR).*/\([^/]*\)\.lib:\t-l\1:' -e 's:\\$:\\\\\\n:' \
-		| tr --delete '\n')
-	local pecoff_header_size=$(grep -e '--defsym=PECOFF_HEADER_SIZE=' ${3} \
-		| sed -e 's/^.*--defsym=PECOFF_HEADER_SIZE=\(\S*\).*$/\1/')
-	local variables=$(grep -e '^IMAGE_ENTRY_POINT\s*=' -e '^CP\s*=' \
-		-e '^RM\s*=' -e '^CC\s*=' -e '^DLINK\s*=' -e '^OBJCOPY\s*=' \
-		-e '^GENFW\s*=' -e '^CC_FLAGS\s*=' -e '^DLINK_FLAGS\s*=' \
-		-e '^OBJCOPY_FLAGS\s*=' -e '^GENFW_FLAGS\s*=' ${3} \
-		| sed -e 's:$:\\n:' | tr --delete '\n')
-	sed -e "s:«MODULE»:${2}:" \
-		-e "s:«PACKAGE_NAME»:${PN}:" \
-		-e "s:«LIB_DIR»:$(get_libdir):" \
-		-e "s:«EFI_LDS»:/usr/share/${P}/GccBase.lds:" \
-		-e "s:«STATIC_LIBS»:${static_libs}:" \
-		-e "s:«MODULE_TYPE»:$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1):" \
-		-e "s:«VARIABLES»:${variables}:" \
-		-e "s:«PECOFF_HEADER_SIZE»:${pecoff_header_size}:" \
-		"${FILESDIR}/${PV}-makefile.template" >${1} \
-		|| die "Failed to create Makefile"
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-04-30 12:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-30 22:55 [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2020-04-30 12:00 Joonas Niilola
2020-04-30 12:00 Joonas Niilola
2020-04-30 12:00 Joonas Niilola
2019-05-01 21:42 Georgy Yakovlev
2017-08-13 12:53 Patrice Clement
2017-04-23 21:01 David Seifert
2016-11-06 16:24 Göktürk Yüksek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox