[meta-oracle-java][PATCH 0/6] kirkstone compatibility

[meta-oracle-java][PATCH 0/6] kirkstone compatibility

[Roland Hieber]

Hi,

the meta-oracle-java layer no longer builds with kirkstone due to the
new override syntax. While at it, I've included some general fixes.

I suggest to add a new branch 'honister' on the commit "oracle-jse:
update dependency from gtk+ to gtk+3" in case anyone still wants to
build the layer with older releases, as the next commit "convert to new
override syntax" is the first one that breaks compatibility.

Cheers,

 - Roland

Roland Hieber (6):
  README: fix mailing list address and other typos
  oracle-jse-jre: fix python indentation
  set LAYERSERIES_COMPAT
  oracle-jse: update dependency from gtk+ to gtk+3
  convert to new override syntax
  bump LAYERSERIES_COMPAT after bitbake syntax change

 README                                        |  6 ++--
 conf/layer.conf                               |  2 +-
 .../oracle-java/oracle-jse-jdk.inc            |  8 +++---
 .../oracle-java/oracle-jse-jre_1.8.0.bb       | 28 +++++++++----------
 recipes-devtools/oracle-java/oracle-jse.inc   | 16 +++++------
 5 files changed, 30 insertions(+), 30 deletions(-)

-- 
2.30.2

[meta-oracle-java][PATCH 1/6] README: fix mailing list address and other typos

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 1f2c1380f676..b375f310aed4 100644
--- a/README
+++ b/README
@@ -19,11 +19,11 @@ LICENSE_FLAGS_WHITELIST += "oracle_java"
 
 Notes
 =====
-The download URLs mentioned in the SRCURI of the oracle-java recipes
+The download URLs mentioned in the SRC_URI of the oracle-java recipes
 may show fetch issues with the built in bitbake wget fetcher. This is caused
 by the pre-requirement of clicking the "accept license" button on the oracle
 download webpage. So if you see fetch issues for the oracle java recipes,
-then you can overcome the issue by opening the SRCURI links manually in a web
+then you can overcome the issue by opening the SRC_URI links manually in a web
 browser, downloading the tarballs, and storing in the bitbake download
 location. And the bitbake download location is specified by DL_DIR variable
 in build configuration file (conf/local.conf)
@@ -32,7 +32,7 @@ Where to Send Patches
 =====================
 Please submit any patches against this layer to the Yocto mailing list like:
 
-git send-email --to=yocto@yoctoproject.org -M -1 --subject-prefix="meta-oracle-java][PATCH"
+git send-email --to=yocto@lists.yoctoproject.org -M -1 --subject-prefix="meta-oracle-java][PATCH"
 
 Please substitute "PATCH" with "PATCH v2" if you are submitting a revised version after
 addressing feedback (or v3, v4 etc.)
-- 
2.30.2

[meta-oracle-java][PATCH 3/6] set LAYERSERIES_COMPAT

[Roland Hieber]

Bitbake override syntax has been changed incompatibly in Yocto 3.4
(honister), which we'll adapt in the next commit. This is therefore the
last commit that can be used with earlier Yocto releases.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 6bd7ae3edd22..70f7d10294e5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,4 +12,4 @@ BBFILE_COLLECTIONS += "oraclejava"
 BBFILE_PATTERN_oraclejava := "^${LAYERDIR}/"
 BBFILE_PRIORITY_oraclejava = "6"
 
-
+LAYERSERIES_COMPAT_oraclejava = "warrior zeus dunfell gatesgarth hardknott"
-- 
2.30.2

[meta-oracle-java][PATCH 4/6] oracle-jse: update dependency from gtk+ to gtk+3

[Roland Hieber]

GTK+ 2 is deprecated, and has not been included in OE-Core since commit
3c692e0d77e68908ab0e (2019-07-05, Ross Burton: "gtk+: remove GTK+ 2").
Java SE also builds with GTK+ 3, so update the dependency.

Link: https://github.com/openembedded/openembedded-core/commit/3c692e0d77e68908ab0e
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 recipes-devtools/oracle-java/oracle-jse.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
index ce8280c8cb51..c799c03033c6 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "\
 
 FETCHCMD_wget_append = " --no-check-certificate --no-cookies --header 'Cookie: oraclelicense=accept-securebackup-cookie' "
 
-RDEPENDS_${PN} += " libasound atk cairo gdk-pixbuf mesa gtk+ libxtst libxi"
+RDEPENDS_${PN} += " libasound atk cairo gdk-pixbuf mesa gtk+3 libxtst libxi"
 # get the java update version in the resulting package
 PR =. "u${PV_UPDATE}"
 S = "${WORKDIR}"
-- 
2.30.2

[meta-oracle-java][PATCH 5/6] convert to new override syntax

[Roland Hieber]

Since bitbake 1.52, which was included in Yocto 3.4 (honister), the
syntax for overrides has changed from using the '_' character to using
the ':' character, and the old syntax is no longer accepted. Run
poky/scripts/contrib/convert-overrides.py to convert the recipes
accordingly.

See https://docs.yoctoproject.org/3.4.3/migration-guides/migration-3.4.html#override-syntax-changes
for more information.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc |  8 ++++----
 recipes-devtools/oracle-java/oracle-jse.inc     | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index a7210d9ca475..17ebe039d697 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -11,7 +11,7 @@ DESCRIPTION = "This is the proprietary JDK from Sun/Oracle, with the Hotspot JVM
 JDK_JRE = "jdk"
 require oracle-jse.inc
 
-do_install_class-native() {
+do_install:class-native() {
 	install -d				${D}${libdir_jvm}
 	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
 
@@ -26,17 +26,17 @@ do_install_class-native() {
 
 BBCLASSEXTEND = "native"
 
-RPROVIDES_${PN} += "java2-development"
+RPROVIDES:${PN} += "java2-development"
 PROVIDES += "virtual/javac virtual/java-initial"
 
-pkg_postinst_${PN} () {
+pkg_postinst:${PN} () {
 	update-alternatives --install ${bindir}/jar   jar   ${JDK_HOME}/bin/jar 100
 	update-alternatives --install ${bindir}/java  java  ${JDK_HOME}/bin/java 100
 	update-alternatives --install ${bindir}/javac javac ${JDK_HOME}/bin/javac 100
 	update-alternatives --install ${bindir}/javah javah ${JDK_HOME}/bin/javah 100
 }
 
-pkg_prerm_${PN} () {
+pkg_prerm:${PN} () {
 	update-alternatives --remove jar   ${JDK_HOME}/bin/jar
 	update-alternatives --remove java  ${JDK_HOME}/bin/java
 	update-alternatives --remove javac ${JDK_HOME}/bin/javac
diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
index c799c03033c6..d853e77f6cfd 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "\
 	file://${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME-JAVAFX.txt;md5=4f31cd1a5d86744d5f00666d9a57ad2a \
 	"
 
-FETCHCMD_wget_append = " --no-check-certificate --no-cookies --header 'Cookie: oraclelicense=accept-securebackup-cookie' "
+FETCHCMD_wget:append = " --no-check-certificate --no-cookies --header 'Cookie: oraclelicense=accept-securebackup-cookie' "
 
-RDEPENDS_${PN} += " libasound atk cairo gdk-pixbuf mesa gtk+3 libxtst libxi"
+RDEPENDS:${PN} += " libasound atk cairo gdk-pixbuf mesa gtk+3 libxtst libxi"
 # get the java update version in the resulting package
 PR =. "u${PV_UPDATE}"
 S = "${WORKDIR}"
@@ -26,24 +26,24 @@ do_install () {
 # All the files are provided in a binaray package, and keeping all the
 # files in a single package causes packaging QA errors and warnings.
 # Avoid these packaging failure by skiping all the QA checks
-INSANE_SKIP_${PN} = "${ERROR_QA} ${WARN_QA}"
+INSANE_SKIP:${PN} = "${ERROR_QA} ${WARN_QA}"
 
 # Inhibit warnings about files being stripped, we can't do anything about it.
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 PACKAGES = "${PN}-sources ${PN}"
-FILES_${PN}-sources = "${JDK_HOME}/src.zip"
-FILES_${PN} = "${JDK_HOME}"
+FILES:${PN}-sources = "${JDK_HOME}/src.zip"
+FILES:${PN} = "${JDK_HOME}"
 
-RPROVIDES_${PN} = "java2-runtime java2-vm"
+RPROVIDES:${PN} = "java2-runtime java2-vm"
 PROVIDES += "virtual/java"
 
 inherit update-alternatives
 
-pkg_postinst_${PN} () {
+pkg_postinst:${PN} () {
 	update-alternatives --install ${bindir}/java java ${JDK_HOME}/bin/java 75
 }
 
-pkg_prerm_${PN} () {
+pkg_prerm:${PN} () {
 	update-alternatives --remove java ${JDK_HOME}/bin/java
 }
-- 
2.30.2

[meta-oracle-java][PATCH 6/6] bump LAYERSERIES_COMPAT after bitbake syntax change

[Roland Hieber]

After the bitbake override syntax change, we're no longer compatible
with Yocto releases older than honister.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 70f7d10294e5..d8d6226d2df6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,4 +12,4 @@ BBFILE_COLLECTIONS += "oraclejava"
 BBFILE_PATTERN_oraclejava := "^${LAYERDIR}/"
 BBFILE_PRIORITY_oraclejava = "6"
 
-LAYERSERIES_COMPAT_oraclejava = "warrior zeus dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_oraclejava = "honister kirkstone"
-- 
2.30.2