| 1 |
commit: b2434258e95a83bb316a87b8b532fcc14823f103 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 28 08:53:42 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 28 08:55:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2434258 |
| 7 |
|
| 8 |
dev-java/openjdk: QA: fix dosym usage |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/openjdk/openjdk-11.0.5_p10.ebuild | 4 ++-- |
| 14 |
dev-java/openjdk/openjdk-11.0.6.ebuild | 4 ++-- |
| 15 |
dev-java/openjdk/openjdk-8.222_p10.ebuild | 2 +- |
| 16 |
dev-java/openjdk/openjdk-8.232_p09.ebuild | 2 +- |
| 17 |
dev-java/openjdk/openjdk-8.242.ebuild | 2 +- |
| 18 |
5 files changed, 7 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild |
| 21 |
index 8be378782e3..e6429b52426 100644 |
| 22 |
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild |
| 23 |
+++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild |
| 24 |
@@ -233,7 +233,7 @@ src_install() { |
| 25 |
dodir "${dest}" |
| 26 |
cp -pPR * "${ddest}" || die |
| 27 |
|
| 28 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 29 |
+ dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 30 |
|
| 31 |
# must be done before running itself |
| 32 |
java-vm_set-pax-markings "${ddest}" |
| 33 |
@@ -248,7 +248,7 @@ src_install() { |
| 34 |
if use doc ; then |
| 35 |
docinto html |
| 36 |
dodoc -r "${S}"/build/*-release/images/docs/* |
| 37 |
- dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
| 38 |
+ dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
| 39 |
fi |
| 40 |
} |
| 41 |
|
| 42 |
|
| 43 |
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 44 |
index dc940a8919c..c5cf008ef3e 100644 |
| 45 |
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 46 |
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild |
| 47 |
@@ -233,7 +233,7 @@ src_install() { |
| 48 |
dodir "${dest}" |
| 49 |
cp -pPR * "${ddest}" || die |
| 50 |
|
| 51 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 52 |
+ dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 53 |
|
| 54 |
# must be done before running itself |
| 55 |
java-vm_set-pax-markings "${ddest}" |
| 56 |
@@ -248,7 +248,7 @@ src_install() { |
| 57 |
if use doc ; then |
| 58 |
docinto html |
| 59 |
dodoc -r "${S}"/build/*-release/images/docs/* |
| 60 |
- dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
| 61 |
+ dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
| 62 |
fi |
| 63 |
} |
| 64 |
|
| 65 |
|
| 66 |
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild |
| 67 |
index 7f674fb94cc..1374a9be223 100644 |
| 68 |
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild |
| 69 |
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild |
| 70 |
@@ -226,7 +226,7 @@ src_install() { |
| 71 |
dodir "${dest}" |
| 72 |
cp -pPR * "${ddest}" || die |
| 73 |
|
| 74 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 75 |
+ dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 76 |
|
| 77 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 78 |
java-vm_set-pax-markings "${ddest}" |
| 79 |
|
| 80 |
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild |
| 81 |
index 4fa1e0c103a..b3cd4c5a8ea 100644 |
| 82 |
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild |
| 83 |
+++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild |
| 84 |
@@ -226,7 +226,7 @@ src_install() { |
| 85 |
dodir "${dest}" |
| 86 |
cp -pPR * "${ddest}" || die |
| 87 |
|
| 88 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 89 |
+ dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 90 |
|
| 91 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 92 |
java-vm_set-pax-markings "${ddest}" |
| 93 |
|
| 94 |
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild |
| 95 |
index 803f0b77b68..b1a5c232283 100644 |
| 96 |
--- a/dev-java/openjdk/openjdk-8.242.ebuild |
| 97 |
+++ b/dev-java/openjdk/openjdk-8.242.ebuild |
| 98 |
@@ -200,7 +200,7 @@ src_install() { |
| 99 |
dodir "${dest}" |
| 100 |
cp -pPR * "${ddest}" || die |
| 101 |
|
| 102 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 103 |
+ dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
| 104 |
|
| 105 |
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 106 |
java-vm_set-pax-markings "${ddest}" |
Archives