[oe] [meta-java] [PATCH] recipes: Start WORKDIR -> UNPACKDIR transition

All of lore.kernel.org
 help / color / mirror / Atom feed

* [oe] [meta-java] [PATCH] recipes: Start WORKDIR -> UNPACKDIR transition
@ 2024-06-14 18:24 wangmy
  2024-06-18 10:32 ` Jermain Horsman
  0 siblings, 1 reply; 2+ messages in thread
From: wangmy @ 2024-06-14 18:24 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Wang Mingyu

From: Wang Mingyu <wangmy@fujitsu.com>

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 <wangmy@fujitsu.com>
---
 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(-)

diff --git a/recipes-core/ant/ant-native_1.8.1.bb b/recipes-core/ant/ant-native_1.8.1.bb
index 8814039..d44e663 100644
--- a/recipes-core/ant/ant-native_1.8.1.bb
+++ b/recipes-core/ant/ant-native_1.8.1.bb
@@ -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"
diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb
index d744201..c585ca4 100644
--- a/recipes-core/antlr/antlr_2.7.7.bb
+++ b/recipes-core/antlr/antlr_2.7.7.bb
@@ -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"
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index ce81453..ac69ff4 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -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}"
diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb
index 874bd99..bf229ca 100644
--- a/recipes-core/ecj/ecj-bootstrap-native.bb
+++ b/recipes-core/ecj/ecj-bootstrap-native.bb
@@ -18,7 +18,7 @@ PROVIDES = "virtual/javac-native"
 
 SRC_URI = "file://ecj.in"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 JAR = "ecj-bootstrap.jar"
 
diff --git a/recipes-core/ecj/ecj-initial-native.bb b/recipes-core/ecj/ecj-initial-native.bb
index d75b7a0..115f4a0 100644
--- a/recipes-core/ecj/ecj-initial-native.bb
+++ b/recipes-core/ecj/ecj-initial-native.bb
@@ -12,7 +12,7 @@ DEPENDS = "libecj-bootstrap-native"
 
 SRC_URI = "file://ecj-initial.in"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 inherit native
 
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 2f3cc97..25edbad 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -11,7 +11,7 @@ INC_PR = "r5"
 
 inherit java native
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 JAR = "ecj-bootstrap-${PV}.jar"
 
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index d6f8fd7..8bd404f 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -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 = ' \
diff --git a/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb
index 081cfe7..b03251f 100644
--- a/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb
+++ b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb
@@ -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"`
 
diff --git a/recipes-core/jikes/jikes-initial-native.bb b/recipes-core/jikes/jikes-initial-native.bb
index 063525d..e9f5819 100644
--- a/recipes-core/jikes/jikes-initial-native.bb
+++ b/recipes-core/jikes/jikes-initial-native.bb
@@ -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
 
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 48ec357..8b2f14c 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -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() {
diff --git a/recipes-core/junit/junit4_4.3.1.bb b/recipes-core/junit/junit4_4.3.1.bb
index b2cd4d9..97e8f1b 100644
--- a/recipes-core/junit/junit4_4.3.1.bb
+++ b/recipes-core/junit/junit4_4.3.1.bb
@@ -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
 
diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb
index d645e8a..30b228d 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -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}
 }
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [meta-java] [PATCH] recipes: Start WORKDIR -> UNPACKDIR transition
  2024-06-14 18:24 [oe] [meta-java] [PATCH] recipes: Start WORKDIR -> UNPACKDIR transition wangmy
@ 2024-06-18 10:32 ` Jermain Horsman
  0 siblings, 0 replies; 2+ messages in thread
From: Jermain Horsman @ 2024-06-18 10:32 UTC (permalink / raw)
  To: openembedded-devel

The mailing list was recently updated (see https://lists.yoctoproject.org/g/yocto-patches/message/9),
so this should be sent to yocto-patches@lists.yoctoproject.org.

Sincerely,

Jermain Horsman


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-06-18 10:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-14 18:24 [oe] [meta-java] [PATCH] recipes: Start WORKDIR -> UNPACKDIR transition wangmy
2024-06-18 10:32 ` Jermain Horsman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.