diff options
| author | Jacob Kroon <jacob.kroon@gmail.com> | 2020-03-30 08:51:00 +0200 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2020-04-09 17:25:09 +0200 |
| commit | 95d56a63cdbf1ed9db99a1f02075568fd45a668b (patch) | |
| tree | 5cc5b0f4462ee8a3482764473620f48e325a5f78 | |
| parent | 50515729c8937bf02d4b2d92a7c5e22f4416229e (diff) | |
| download | meta-java-zeus.tar.gz | |
Revert "recipes: rename distro_features_check to features_check"zeus
The corresponding changes in oe-core has not been backported to zeus.
This reverts commit d2e962a795e8713e5443659669842298453d938f.
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
| -rw-r--r-- | recipes-core/cacao/cacao_2d6f6c14daf9.bb | 2 | ||||
| -rw-r--r-- | recipes-core/classpath/classpath_0.99.bb | 2 | ||||
| -rw-r--r-- | recipes-core/jamvm/jamvm.inc | 2 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes-core/cacao/cacao_2d6f6c14daf9.bb b/recipes-core/cacao/cacao_2d6f6c14daf9.bb index 0e50b68..6783894 100644 --- a/recipes-core/cacao/cacao_2d6f6c14daf9.bb +++ b/recipes-core/cacao/cacao_2d6f6c14daf9.bb | |||
| @@ -19,7 +19,7 @@ S = "${WORKDIR}/cacaovm-cacao-staging-${PV}" | |||
| 19 | SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa" | 19 | SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa" |
| 20 | SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd" | 20 | SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd" |
| 21 | 21 | ||
| 22 | inherit java autotools-brokensep update-alternatives pkgconfig features_check | 22 | inherit java autotools-brokensep update-alternatives pkgconfig distro_features_check |
| 23 | 23 | ||
| 24 | REQUIRED_DISTRO_FEATURES = "x11" | 24 | REQUIRED_DISTRO_FEATURES = "x11" |
| 25 | REQUIRED_DISTRO_FEATURES_class-native := "" | 25 | REQUIRED_DISTRO_FEATURES_class-native := "" |
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 5b9d904..714503a 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require classpath.inc | 1 | require classpath.inc |
| 2 | 2 | ||
| 3 | inherit features_check | 3 | inherit distro_features_check |
| 4 | 4 | ||
| 5 | REQUIRED_DISTRO_FEATURES = "x11" | 5 | REQUIRED_DISTRO_FEATURES = "x11" |
| 6 | 6 | ||
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index b03a5b9..d47b2f1 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc | |||
| @@ -15,7 +15,7 @@ RPROVIDES_${PN}_class-native = "" | |||
| 15 | 15 | ||
| 16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
| 17 | 17 | ||
| 18 | inherit java autotools update-alternatives pkgconfig relative_symlinks features_check | 18 | inherit java autotools update-alternatives pkgconfig relative_symlinks distro_features_check |
| 19 | 19 | ||
| 20 | REQUIRED_DISTRO_FEATURES_class-target = "x11" | 20 | REQUIRED_DISTRO_FEATURES_class-target = "x11" |
| 21 | 21 | ||
diff --git a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb index d774cc2..cb670cb 100644 --- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | |||
| 4 | 4 | ||
| 5 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:" | 5 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:" |
| 6 | 6 | ||
| 7 | inherit features_check | 7 | inherit distro_features_check |
| 8 | 8 | ||
| 9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
| 10 | 10 | ||