From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-java/
Date: Fri, 18 Dec 2020 20:06:49 +0000 (UTC) [thread overview]
Message-ID: <1608321985.e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906.gyakovlev@gentoo> (raw)
commit: e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906
Author: Boleyn Su <boleyn.su <AT> gmail <DOT> com>
AuthorDate: Tue Dec 1 09:50:15 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 20:06:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ebf322
Fix postinst script of sys-apps/baselayout-java
The old postinst will not work for binpkg. This CL fixes it.
Closes: https://bugs.gentoo.org/757837
Signed-off-by: Boleyn Su <boleynsu <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/18469
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index 23ba5272869..803fe0c5eac 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -28,7 +28,7 @@ src_install() {
exeinto /etc/ca-certificates/update.d
newexe - java-cacerts <<-_EOF_
#!/bin/sh
- exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}"/etc/ssl/certs/java/cacerts
+ exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EPREFIX}/etc/ssl/certs/java/cacerts"
_EOF_
}
@@ -44,6 +44,6 @@ pkg_postinst() {
# so jdk ebuilds can create symlink to in into security directory
if [[ ! -f "${EROOT}"/etc/ssl/certs/java/cacerts ]]; then
einfo "Generating java cacerts file from system ca-certificates"
- "${EROOT}"/etc/ca-certificates/update.d/java-cacerts || die
+ trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}/etc/ssl/certs/java/cacerts" || die
fi
}
next reply other threads:[~2020-12-18 20:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 20:06 Georgy Yakovlev [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-18 18:52 [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-java/ Miroslav Šulc
2025-06-17 0:20 Sam James
2025-06-17 0:20 Sam James
2025-06-17 0:20 Sam James
2025-06-17 0:20 Sam James
2025-05-17 18:16 Miroslav Šulc
2023-06-30 10:12 Sam James
2022-05-01 20:47 Georgy Yakovlev
2021-01-06 15:26 Fabian Groffen
2019-10-25 18:55 Georgy Yakovlev
2019-06-22 9:38 Sergei Trofimovich
2019-06-21 11:07 Agostino Sarubbo
2019-06-21 8:03 Agostino Sarubbo
2019-05-09 23:20 Georgy Yakovlev
2019-05-09 23:05 Georgy Yakovlev
2019-04-26 5:30 Georgy Yakovlev
2018-06-04 10:06 Patrice Clement
2017-01-26 21:50 James Le Cuirot
2016-09-17 14:42 Patrice Clement
2016-05-18 9:05 Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1608321985.e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906.gyakovlev@gentoo \
--to=gyakovlev@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox