summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2018-08-16 23:24:31 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2018-08-16 23:43:27 +0100
commitc11fb7afbf15b1a56588b1e0de97b6a1ebe3cb5b (patch)
tree070c85e65b1cb653e9443f8b66e913d46980fb5a /eclass
parenteclass/linux-build: Simplify retrieval of previous version (diff)
downloadportage-c11fb7afbf15b1a56588b1e0de97b6a1ebe3cb5b.tar.xz
eclass/linux-build: Remove outdated einfo
Diffstat (limited to 'eclass')
-rw-r--r--eclass/linux-build.eclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass
index 4442d31d..5a3159e3 100644
--- a/eclass/linux-build.eclass
+++ b/eclass/linux-build.eclass
@@ -125,22 +125,23 @@ _linux-build_pkg_setup-build-x509() {
for _v in $(_linux-build_get-portage-versions) ; do
einfo "Checking existence of ${PORTAGE_CONFIGROOT%/}/etc/ssl/private/${_v}.pem"
-
if [[ -e "${PORTAGE_CONFIGROOT%/}/etc/ssl/private/${_v}.pem" ]] ; then
+ eend 0
mkdir "${T}/certs"
+
+ einfo "Restoring x509 pair from ${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PF}"
cp --preserve=mode,ownership \
"${PORTAGE_CONFIGROOT%/}/etc/ssl/private/${_v}.pem" "${T}/certs/signing_key.pem" \
|| die "Failed to copy ${PORTAGE_CONFIGROOT%/}/etc/ssl/private/${_v}.pem"
- einfo "Use the following x509 pair for CONFIG_MODULE_SIG"
- einfo " ${PORTAGE_CONFIGROOT%/}/etc/ssl/private/${_v}.pem"
eend 0
-
- break
+ return 0
fi
eend 1
done
+
+ return 1
}
_linux-build_pkg_setup-build() {