public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/
@ 2020-01-27 20:53 99% Georgy Yakovlev
  0 siblings, 0 replies; 1+ results
From: Georgy Yakovlev @ 2020-01-27 20:53 UTC (permalink / raw
  To: gentoo-commits

commit:     620acfba497e31a8ac19ad5a1cbcc4a0bb8b6447
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 20:40:49 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 20:52:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=620acfba

dev-java/openjdk-bin: QA: fix absolute dosym

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild   | 4 ++--
 dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild   | 4 ++--
 dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild | 4 ++--
 dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild    | 4 ++--
 dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
index 52b3d9d67df..50bf2b6b9cc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
@@ -86,12 +86,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask

diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
index c629d40f486..a8cbd6ba1b4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
@@ -87,12 +87,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask

diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index 1c48331fa58..49f6e257858 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -80,12 +80,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask

diff --git a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
index 9225c3e2202..f4558fbf91e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
@@ -80,12 +80,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask

diff --git a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
index c3d90d685e6..01ed27ee1ac 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
@@ -78,12 +78,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask


^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-27 20:53 99% [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/ Georgy Yakovlev

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