diff mbox series

[meta-java] Yocto 5.1 (styhead): S = ${WORKDIR} no longer supported

Message ID 20240528233920.464989-1-geoffhp@gmail.com
State New
Headers show
Series [meta-java] Yocto 5.1 (styhead): S = ${WORKDIR} no longer supported | expand

Commit Message

Geoff Parker May 28, 2024, 11:39 p.m. UTC 
From: Geoff Parker <geoffrey.parker@arthrex.com>

Fix errors during parse due to S = ${WORKDIR}
https://docs.yoctoproject.org/next/migration-guides/migration-5.1.html#workdir-changes :

    S = ${WORKDIR} no longer supported

    If a recipe has S set to be WORKDIR, this is no longer supported,
    and an error will be issued. The recipe should be changed to:

    S = "${WORKDIR}/sources"
    UNPACKDIR = "${S}"

    Any WORKDIR references where files from SRC_URI are referenced
    should be changed to S. These are commonly in do_compile,
    do_compile, do_install and LIC_FILES_CHKSUM.

Signed-off-by: Geoff Parker <geoffhp@gmail.com>
---
 recipes-core/ecj/ecj-bootstrap-native.bb   | 3 ++-
 recipes-core/ecj/ecj-initial-native.bb     | 3 ++-
 recipes-core/ecj/libecj-bootstrap.inc      | 3 ++-
 recipes-core/jikes/jikes-initial-native.bb | 3 ++-
 recipes-core/jlex/jlex_1.2.6.bb            | 3 ++-
 recipes-core/junit/junit4_4.3.1.bb         | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb
index 874bd99..250df91 100644
--- a/recipes-core/ecj/ecj-bootstrap-native.bb
+++ b/recipes-core/ecj/ecj-bootstrap-native.bb
@@ -18,7 +18,8 @@  PROVIDES = "virtual/javac-native"
 
 SRC_URI = "file://ecj.in"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 JAR = "ecj-bootstrap.jar"
 
diff --git a/recipes-core/ecj/ecj-initial-native.bb b/recipes-core/ecj/ecj-initial-native.bb
index d75b7a0..4d1c0ea 100644
--- a/recipes-core/ecj/ecj-initial-native.bb
+++ b/recipes-core/ecj/ecj-initial-native.bb
@@ -12,7 +12,8 @@  DEPENDS = "libecj-bootstrap-native"
 
 SRC_URI = "file://ecj-initial.in"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit native
 
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 2f3cc97..266e40e 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -11,7 +11,8 @@  INC_PR = "r5"
 
 inherit java native
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 JAR = "ecj-bootstrap-${PV}.jar"
 
diff --git a/recipes-core/jikes/jikes-initial-native.bb b/recipes-core/jikes/jikes-initial-native.bb
index 063525d..a5bbe12 100644
--- a/recipes-core/jikes/jikes-initial-native.bb
+++ b/recipes-core/jikes/jikes-initial-native.bb
@@ -3,7 +3,8 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 DEPENDS = "jikes-native classpath-initial-native"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit native
 
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 48ec357..0160a2c 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -16,7 +16,8 @@  SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Mai
            file://jlex \
           "
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_configure() {
   sed -i \
diff --git a/recipes-core/junit/junit4_4.3.1.bb b/recipes-core/junit/junit4_4.3.1.bb
index b2cd4d9..994c5bf 100644
--- a/recipes-core/junit/junit4_4.3.1.bb
+++ b/recipes-core/junit/junit4_4.3.1.bb
@@ -6,7 +6,8 @@  HOMEPAGE = "http://www.junit.org"
 
 SRC_URI = "http://downloads.sourceforge.net/junit/junit-${PV}-src.jar"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit java-library