diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2016-10-06 16:56:18 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2016-10-06 19:13:32 +0900 |
| commit | d9582a1af26803b8984c38d8f9a7482a9c110270 (patch) | |
| tree | 3f2f49f09e3bbb884a8ce01f98fc4283c438bfc8 | |
| parent | movl: add digest. tree.sh: generate cache before ebuild generation. (diff) | |
| download | java-ebuilder-d9582a1a.tar.gz java-ebuilder-d9582a1a.tar.bz2 java-ebuilder-d9582a1a.zip | |
movl, meta.sh: query portage related variables at runtime.
| -rw-r--r-- | java-ebuilder.conf | 2 | ||||
| -rwxr-xr-x | scripts/meta.sh | 1 | ||||
| -rwxr-xr-x | scripts/movl | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/java-ebuilder.conf b/java-ebuilder.conf index 1bf7e33..f391484 100644 --- a/java-ebuilder.conf +++ b/java-ebuilder.conf @@ -1,5 +1,3 @@ -PORTDIR=/usr/portage -PORTAGE_TMPDIR=/var/tmp # JAVA_OVERLAY_DIR=/var/lib/layman/java POMDIR=/var/lib/java-ebuilder/poms MAVEN_OVERLAY_DIR=/var/lib/java-ebuilder/maven diff --git a/scripts/meta.sh b/scripts/meta.sh index 10c317f..935330f 100755 --- a/scripts/meta.sh +++ b/scripts/meta.sh @@ -5,6 +5,7 @@ # example: # ( echo 1.0; tail -n +2 cache | parallel -j -2 meta.sh; ) > cache.1 source /etc/java-ebuilder.conf +: ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} pkg=$(awk -F ":" '{print $1"/"$2"-"$3}' <<< $1) spkg=$(cut -d: -f2 <<< $1) diff --git a/scripts/movl b/scripts/movl index 10ecfcc..a4d1bac 100755 --- a/scripts/movl +++ b/scripts/movl @@ -22,6 +22,10 @@ clean() { } build() { + : ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} + : ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)} + export PORTAGE_TMPDIR + if [[ ! -f "${CACHEDIR}"/cache.0 ]]; then # 1. Generate cache of java related packages from portage tree. [[ -f "${CACHEDIR}"/cache.raw0 ]] || \ @@ -39,7 +43,7 @@ build() { [[ -f "${CACHEDIR}"/cache.raw1 ]] || \ java-ebuilder --refresh-cache -t "${JAVA_OVERLAY_DIR}" --cache-file "${CACHEDIR}"/cache.raw1 pushd "${CACHEDIR}" > /dev/null - tail -n +2 cache.raw1 | parallel -j -1 scripts/meta.sh > cache.1 + tail -n +2 cache.raw1 | parallel -j -1 /usr/lib/java-ebuilder/meta.sh > cache.1 popd > /dev/null else touch "${CACHEDIR}"/cache.1 |