recipes: Start WORKDIR -> UNPACKDIR transition
PATCH 1/1 recipes: Start WORKDIR -> UNPACKDIR transition
From: Wang Mingyu <[email protected]>
Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.
Signed-off-by Wang Mingyu <[email protected]>
--- recipes-core/ant/ant-native_1.8.1.bb | 4 ++-- recipes-core/antlr/antlr_2.7.7.bb | 4 ++-- recipes-core/cup/cup_0.10k.bb | 6 +++--- recipes-core/ecj/ecj-bootstrap-native.bb | 2 +- recipes-core/ecj/ecj-initial-native.bb | 2 +- recipes-core/ecj/libecj-bootstrap.inc | 2 +- recipes-core/icedtea/icedtea7-native.inc | 8 ++++---- recipes-core/jakarta-libs/avalon-framework-api_4.3.bb | 2 +- recipes-core/jikes/jikes-initial-native.bb | 2 +- recipes-core/jlex/jlex_1.2.6.bb | 4 ++-- recipes-core/junit/junit4_4.3.1.bb | 2 +- recipes-core/rhino/rhino_1.7r4.bb | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-)
recipes-core/ant/ant-native_1.8.1.bb +2 -2
@@ -54,12 +54,12 @@ do_compile() { oe_makeclasspath cp -s ecj-bootstrap jsch bsf xalan2 xercesImpl resolver gnumail gnujaf bcel regexp log4j1.2 antlr oro junit jdepend commons-net commons-logging cp=${STAGING_DATADIR_JAVA_NATIVE}/ant.jar:${STAGING_DATADIR}/classpath/tools.zip:$cp - sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant + sed -i -e"s|@JAR_FILE@|$cp|" ${UNPACKDIR}/ant } do_install:append() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/ant ${D}${bindir} + install -m 0755 ${UNPACKDIR}/ant ${D}${bindir} } SRC_URI[md5sum] = "9e5960bd586d9425c46199cdd20a6fbc"
recipes-core/antlr/antlr_2.7.7.bb +2 -2
@@ -10,7 +10,7 @@ SRC_URI:append:class-native = " file://runantlr" inherit java-library do_configure:class-native() { - sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr + sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${UNPACKDIR}/runantlr } do_compile() {
@@ -23,7 +23,7 @@ do_compile() { do_install:class-native() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/ + install -m 0755 ${UNPACKDIR}/runantlr ${D}${bindir}/ } SRC_URI[md5sum] = "01cc9a2a454dd33dcd8c856ec89af090"
recipes-core/cup/cup_0.10k.bb +3 -3
@@ -1,7 +1,7 @@ SUMMARY = "Lexical analyzer generator for Java" AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian" LICENSE = "CUP" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33" RDEPENDS:${PN} = "java2-runtime"
@@ -21,7 +21,7 @@ do_configure() { -e "s|OE_STAGING_BINDIR|${bindir}|" \ -e "s|OE_STAGING_DATADIR_JAVA|${data_java}|" \ -e "s|OE_CUP_JAR|${BP}.jar|" \ - ${WORKDIR}/cup + ${UNPACKDIR}/cup } do_compile() {
@@ -34,7 +34,7 @@ do_compile() { do_install:append() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/cup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/cup ${D}${bindir} } PACKAGES = "${PN}"
recipes-core/ecj/ecj-bootstrap-native.bb +1 -1
@@ -18,7 +18,7 @@ PROVIDES = "virtual/javac-native" SRC_URI = "file://ecj.in" -S = "${WORKDIR}" +S = "${UNPACKDIR}" JAR = "ecj-bootstrap.jar"
recipes-core/ecj/ecj-initial-native.bb +1 -1
@@ -12,7 +12,7 @@ DEPENDS = "libecj-bootstrap-native" SRC_URI = "file://ecj-initial.in" -S = "${WORKDIR}" +S = "${UNPACKDIR}" inherit native
recipes-core/ecj/libecj-bootstrap.inc +1 -1
@@ -11,7 +11,7 @@ INC_PR = "r5" inherit java native -S = "${WORKDIR}" +S = "${UNPACKDIR}" JAR = "ecj-bootstrap-${PV}.jar"
recipes-core/icedtea/icedtea7-native.inc +4 -4
@@ -105,7 +105,7 @@ do_configure:prepend() { # Automatically copy everything that starts with "icedtea" and ends with # ".patch" into the patches directory. - find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; + find ${UNPACKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; # Prepare JDK-like directory with Classpath' files which we can treat as a # SYSTEM_GCJ_DIR afterwards.
@@ -154,9 +154,9 @@ do_configure:append() { ${POST_CONFIGURE_CLEAN_X11} oe_runmake patch-boot - patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch - patch -p1 < ${WORKDIR}/sigsegv.patch - patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch + patch -p1 < ${UNPACKDIR}/jaxws_fix_NullPointerException.patch + patch -p1 < ${UNPACKDIR}/sigsegv.patch + patch -p1 < ${UNPACKDIR}/vframeArray_Fix_sigsegv.patch } EXTRA_OEMAKE = ' \
recipes-core/jakarta-libs/avalon-framework-api_4.3.bb +1 -1
@@ -15,7 +15,7 @@ do_compile() { mkdir -p build # Allow reaching method definitions from logkit (stupid cyclic dependency). - srcpath=src/java:${WORKDIR}/logkit-1.2.2-dev/src/java + srcpath=src/java:${UNPACKDIR}/logkit-1.2.2-dev/src/java javac -encoding ISO-8859-1 -sourcepath $srcpath -d build `find src/java -name "*.java"`
recipes-core/jikes/jikes-initial-native.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" DEPENDS = "jikes-native classpath-initial-native" -S = "${WORKDIR}" +S = "${UNPACKDIR}" inherit native
recipes-core/jlex/jlex_1.2.6.bb +2 -2
@@ -16,14 +16,14 @@ SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Mai file://jlex \ " -S = "${WORKDIR}" +S = "${UNPACKDIR}" do_configure() { sed -i \ -e "s|OE_STAGING_BINDIR|${bindir}|" \ -e "s|OE_STAGING_DATADIR_JAVA|${datadir_java}|" \ -e "s|OE_JLEX_JAR|${BP}.jar|" \ - ${WORKDIR}/jlex + ${UNPACKDIR}/jlex } do_compile() {
recipes-core/junit/junit4_4.3.1.bb +1 -1
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.junit.org" SRC_URI = "http://downloads.sourceforge.net/junit/junit-${PV}-src.jar" -S = "${WORKDIR}" +S = "${UNPACKDIR}" inherit java-library
recipes-core/rhino/rhino_1.7r4.bb +2 -2
@@ -43,6 +43,6 @@ do_compile() { do_install:append() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/rhino ${D}${bindir} - install -m 0755 ${WORKDIR}/rhino-jsc ${D}${bindir} + install -m 0755 ${UNPACKDIR}/rhino ${D}${bindir} + install -m 0755 ${UNPACKDIR}/rhino-jsc ${D}${bindir} }
Signature · 1 line
2.34.1