aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-27 16:13:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-29 21:21:27 +0000
commit2edd826531d79744d7b2114c5f24296966d51781 (patch)
tree654f48ad612b97f9b008227cb72a251ecb3eb11a
parentfd6a007efa7cb45101a66f294af81d9d33bb3fab (diff)
downloadopenembedded-core-contrib-2edd826531d79744d7b2114c5f24296966d51781.tar.gz
openembedded-core-contrib-2edd826531d79744d7b2114c5f24296966d51781.tar.bz2
openembedded-core-contrib-2edd826531d79744d7b2114c5f24296966d51781.zip
meta: Clean up various class-native* RDEPENDS overrides
With PACKAGES functioning more correctly for native recipes combined with classextend improvements over the years, there are various overrides of RDEPENDS which look unecessary now, clean them up. There some some minor changes in dependencies, specifically: "python3-numpy-native.do_populate_sysroot" -> "python3-native.do_populate_sysroot" "python3-mako-native.do_populate_sysroot" -> "python3-native.do_populate_sysroot" "itstool-native.do_populate_sysroot" -> "libxml2-native.do_populate_sysroot" however there are already: XXX-native.do_prepare_recipe_ssysroot -> YYY-native.do_populate_sysroot mappings from DEPENDS so this is effectively a null op. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus_1.12.20.bb2
-rw-r--r--meta/recipes-devtools/autoconf/autoconf.inc29
-rw-r--r--meta/recipes-devtools/automake/automake_1.16.2.bb1
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb2
-rw-r--r--meta/recipes-devtools/python/python3-mako_1.1.4.bb2
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.11.bb1
-rw-r--r--meta/recipes-extended/perl/libtimedate-perl_2.30.bb1
-rw-r--r--meta/recipes-support/itstool/itstool_2.0.6.bb1
8 files changed, 1 insertions, 38 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.20.bb b/meta/recipes-core/dbus/dbus_1.12.20.bb
index 09049301cc..32e7d9cfa3 100644
--- a/meta/recipes-core/dbus/dbus_1.12.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.20.bb
@@ -6,8 +6,6 @@ SECTION = "base"
require dbus.inc
DEPENDS = "expat virtual/libintl autoconf-archive"
-RDEPENDS_dbus_class-native = ""
-RDEPENDS_dbus_class-nativesdk = ""
PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
ALLOW_EMPTY_dbus-ptest = "1"
RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 787f30a097..a4db7ca38f 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -32,34 +32,7 @@ RDEPENDS_${PN} = "m4 gnu-config \
perl-module-thread-queue \
perl-module-threads \
"
-RDEPENDS_${PN}_class-native = "m4-native gnu-config-native"
-RDEPENDS_${PN}_class-nativesdk = "\
- nativesdk-gnu-config \
- nativesdk-m4 \
- nativesdk-perl \
- nativesdk-perl-module-bytes \
- nativesdk-perl-module-carp \
- nativesdk-perl-module-constant \
- nativesdk-perl-module-data-dumper \
- nativesdk-perl-module-errno \
- nativesdk-perl-module-exporter \
- nativesdk-perl-module-file-basename \
- nativesdk-perl-module-file-compare \
- nativesdk-perl-module-file-copy \
- nativesdk-perl-module-file-find \
- nativesdk-perl-module-file-glob \
- nativesdk-perl-module-file-path \
- nativesdk-perl-module-file-spec \
- nativesdk-perl-module-file-spec-unix \
- nativesdk-perl-module-file-stat \
- nativesdk-perl-module-getopt-long \
- nativesdk-perl-module-io-file \
- nativesdk-perl-module-overloading \
- nativesdk-perl-module-posix \
- nativesdk-perl-module-symbol \
- nativesdk-perl-module-thread-queue \
- nativesdk-perl-module-threads \
- "
+RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native"
inherit autotools texinfo
diff --git a/meta/recipes-devtools/automake/automake_1.16.2.bb b/meta/recipes-devtools/automake/automake_1.16.2.bb
index fd8ed0ed3b..08ec034626 100644
--- a/meta/recipes-devtools/automake/automake_1.16.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.16.2.bb
@@ -17,7 +17,6 @@ RDEPENDS_${PN} += "\
perl-module-vars "
RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native"
-RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf"
SRC_URI += "file://python-libdir.patch \
file://buildtest.patch \
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb
index 5037d2a422..b619bf6f32 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb
@@ -53,6 +53,4 @@ RDEPENDS_${PN}-ptest += "${PYTHON_PN}-pytest \
ldd \
"
-RDEPENDS_${PN}_class-native = ""
-
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-mako_1.1.4.bb b/meta/recipes-devtools/python/python3-mako_1.1.4.bb
index 531fc6a3c0..1645f37da4 100644
--- a/meta/recipes-devtools/python/python3-mako_1.1.4.bb
+++ b/meta/recipes-devtools/python/python3-mako_1.1.4.bb
@@ -15,6 +15,4 @@ RDEPENDS_${PN} = "${PYTHON_PN}-html \
${PYTHON_PN}-threading \
"
-RDEPENDS_${PN}_class-native = ""
-
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index 74bdb098c6..d011202081 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -69,7 +69,6 @@ ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
# isn't getting picked up by shlibs code
RDEPENDS_${PN} += "tcl-lib"
-RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}-ptest += "libgcc"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
index 7219c7d11e..d42eadb586 100644
--- a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
+++ b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
@@ -13,7 +13,6 @@ inherit cpan ptest-perl
BBCLASSEXTEND = "native"
-RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local"
RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-utf8"
diff --git a/meta/recipes-support/itstool/itstool_2.0.6.bb b/meta/recipes-support/itstool/itstool_2.0.6.bb
index 5f358f463d..c52aa7941a 100644
--- a/meta/recipes-support/itstool/itstool_2.0.6.bb
+++ b/meta/recipes-support/itstool/itstool_2.0.6.bb
@@ -18,4 +18,3 @@ SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa91
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN} += "libxml2-python"
-RDEPENDS_${PN}_class-native = ""