| 1 |
commit: d9582a1af26803b8984c38d8f9a7482a9c110270 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 07:56:18 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 10:13:32 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=d9582a1a |
| 7 |
|
| 8 |
movl, meta.sh: query portage related variables at runtime. |
| 9 |
|
| 10 |
java-ebuilder.conf | 2 -- |
| 11 |
scripts/meta.sh | 1 + |
| 12 |
scripts/movl | 6 +++++- |
| 13 |
3 files changed, 6 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/java-ebuilder.conf b/java-ebuilder.conf |
| 16 |
index 1bf7e33..f391484 100644 |
| 17 |
--- a/java-ebuilder.conf |
| 18 |
+++ b/java-ebuilder.conf |
| 19 |
@@ -1,5 +1,3 @@ |
| 20 |
-PORTDIR=/usr/portage |
| 21 |
-PORTAGE_TMPDIR=/var/tmp |
| 22 |
# JAVA_OVERLAY_DIR=/var/lib/layman/java |
| 23 |
POMDIR=/var/lib/java-ebuilder/poms |
| 24 |
MAVEN_OVERLAY_DIR=/var/lib/java-ebuilder/maven |
| 25 |
|
| 26 |
diff --git a/scripts/meta.sh b/scripts/meta.sh |
| 27 |
index 10c317f..935330f 100755 |
| 28 |
--- a/scripts/meta.sh |
| 29 |
+++ b/scripts/meta.sh |
| 30 |
@@ -5,6 +5,7 @@ |
| 31 |
# example: |
| 32 |
# ( echo 1.0; tail -n +2 cache | parallel -j -2 meta.sh; ) > cache.1 |
| 33 |
source /etc/java-ebuilder.conf |
| 34 |
+: ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} |
| 35 |
|
| 36 |
pkg=$(awk -F ":" '{print $1"/"$2"-"$3}' <<< $1) |
| 37 |
spkg=$(cut -d: -f2 <<< $1) |
| 38 |
|
| 39 |
diff --git a/scripts/movl b/scripts/movl |
| 40 |
index 10ecfcc..a4d1bac 100755 |
| 41 |
--- a/scripts/movl |
| 42 |
+++ b/scripts/movl |
| 43 |
@@ -22,6 +22,10 @@ clean() { |
| 44 |
} |
| 45 |
|
| 46 |
build() { |
| 47 |
+ : ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} |
| 48 |
+ : ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} |
| 49 |
+ export PORTAGE_TMPDIR |
| 50 |
+ |
| 51 |
if [[ ! -f "${CACHEDIR}"/cache.0 ]]; then |
| 52 |
# 1. Generate cache of java related packages from portage tree. |
| 53 |
[[ -f "${CACHEDIR}"/cache.raw0 ]] || \ |
| 54 |
@@ -39,7 +43,7 @@ build() { |
| 55 |
[[ -f "${CACHEDIR}"/cache.raw1 ]] || \ |
| 56 |
java-ebuilder --refresh-cache -t "${JAVA_OVERLAY_DIR}" --cache-file "${CACHEDIR}"/cache.raw1 |
| 57 |
pushd "${CACHEDIR}" > /dev/null |
| 58 |
- tail -n +2 cache.raw1 | parallel -j -1 scripts/meta.sh > cache.1 |
| 59 |
+ tail -n +2 cache.raw1 | parallel -j -1 /usr/lib/java-ebuilder/meta.sh > cache.1 |
| 60 |
popd > /dev/null |
| 61 |
else |
| 62 |
touch "${CACHEDIR}"/cache.1 |
Archives