Skip to contentSkip to conversation

Revert "recipes: rename distro_features_check to features_check"

PATCH Applied Jacob Kroon 2 participants 2 messages Mar 30, 2020 – Apr 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "recipes: rename distro_features_check to features_check"

The corresponding changes in oe-core has not been backported to zeus.

This reverts commit d2e962a795e8713e5443659669842298453d938f.

---
 recipes-core/cacao/cacao_2d6f6c14daf9.bb      | 2 +-
 recipes-core/classpath/classpath_0.99.bb      | 2 +-
 recipes-core/jamvm/jamvm.inc                  | 2 +-
 recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
recipes-core/cacao/cacao_2d6f6c14daf9.bb +1 -1
index 0e50b68..6783894 100644
@@ -19,7 +19,7 @@ S = "${WORKDIR}/cacaovm-cacao-staging-${PV}"
 SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa"
 SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd"
 
-inherit java autotools-brokensep update-alternatives pkgconfig features_check
+inherit java autotools-brokensep update-alternatives pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 REQUIRED_DISTRO_FEATURES_class-native := ""
recipes-core/classpath/classpath_0.99.bb +1 -1
index 5b9d904..714503a 100644
@@ -1,6 +1,6 @@
 require classpath.inc
 
-inherit features_check
+inherit distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
recipes-core/jamvm/jamvm.inc +1 -1
index b03a5b9..d47b2f1 100644
@@ -15,7 +15,7 @@ RPROVIDES_${PN}_class-native = ""
 
 BBCLASSEXTEND = "native"
 
-inherit java autotools update-alternatives pkgconfig relative_symlinks features_check
+inherit java autotools update-alternatives pkgconfig relative_symlinks distro_features_check
 
 REQUIRED_DISTRO_FEATURES_class-target = "x11"
 
recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +1 -1
index d774cc2..cb670cb 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:"
 
-inherit features_check
+inherit distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
Signature · 1 line
2.25.1
#1 lore raw

Hi Jacob,

Quoted 5 lines · Jacob Kroon

The corresponding changes in oe-core has not been backported to zeus.

This reverts commit d2e962a795e8713e5443659669842298453d938f.

Thank you for this catch!

Pushed to zeus.

regards;rl

Quoted 63 lines
---
 recipes-core/cacao/cacao_2d6f6c14daf9.bb      | 2 +-
 recipes-core/classpath/classpath_0.99.bb      | 2 +-
 recipes-core/jamvm/jamvm.inc                  | 2 +-
 recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
recipes-core/cacao/cacao_2d6f6c14daf9.bb +1 -1
index 0e50b68..6783894 100644
@@ -19,7 +19,7 @@ S = "${WORKDIR}/cacaovm-cacao-staging-${PV}"
 SRC_URI[md5sum] = "5157d0bb9eb1332f7a6b6186eaac01aa"
 SRC_URI[sha256sum] = "34b51d660d69c2a83225fd75eab5e1fac002fb5974cb4a74b7478baf923a76cd"
 
-inherit java autotools-brokensep update-alternatives pkgconfig features_check
+inherit java autotools-brokensep update-alternatives pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 REQUIRED_DISTRO_FEATURES_class-native := ""
recipes-core/classpath/classpath_0.99.bb +1 -1
index 5b9d904..714503a 100644
@@ -1,6 +1,6 @@
 require classpath.inc
 
-inherit features_check
+inherit distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
recipes-core/jamvm/jamvm.inc +1 -1
index b03a5b9..d47b2f1 100644
@@ -15,7 +15,7 @@ RPROVIDES_${PN}_class-native = ""
 
 BBCLASSEXTEND = "native"
 
-inherit java autotools update-alternatives pkgconfig relative_symlinks features_check
+inherit java autotools update-alternatives pkgconfig relative_symlinks distro_features_check
 
 REQUIRED_DISTRO_FEATURES_class-target = "x11"
 
recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +1 -1
index d774cc2..cb670cb 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-7:"
 
-inherit features_check
+inherit distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
Signature · 1 line
2.25.1