diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-27 16:13:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-29 21:21:53 +0000 |
commit | 71cc4c0c00db870590e7619b01db793b1ca88f87 (patch) | |
tree | df1db916070e7b1f4573013d6cb3d03dbd826ca3 | |
parent | c4257ed8b1040a5a0e9a95846d81961741239116 (diff) | |
download | poky-71cc4c0c00db870590e7619b01db793b1ca88f87.tar.gz |
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.
(From OE-Core rev: 2edd826531d79744d7b2114c5f24296966d51781)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.20.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf.inc | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.16.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/python-numpy/python3-numpy_1.19.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-mako_1.1.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 1 | ||||
-rw-r--r-- | meta/recipes-extended/perl/libtimedate-perl_2.30.bb | 1 | ||||
-rw-r--r-- | meta/recipes-support/itstool/itstool_2.0.6.bb | 1 |
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" | |||
6 | require dbus.inc | 6 | require dbus.inc |
7 | 7 | ||
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive" |
9 | RDEPENDS_dbus_class-native = "" | ||
10 | RDEPENDS_dbus_class-nativesdk = "" | ||
11 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" |
12 | ALLOW_EMPTY_dbus-ptest = "1" | 10 | ALLOW_EMPTY_dbus-ptest = "1" |
13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 11 | 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 \ | |||
32 | perl-module-thread-queue \ | 32 | perl-module-thread-queue \ |
33 | perl-module-threads \ | 33 | perl-module-threads \ |
34 | " | 34 | " |
35 | RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" | 35 | RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native" |
36 | RDEPENDS_${PN}_class-nativesdk = "\ | ||
37 | nativesdk-gnu-config \ | ||
38 | nativesdk-m4 \ | ||
39 | nativesdk-perl \ | ||
40 | nativesdk-perl-module-bytes \ | ||
41 | nativesdk-perl-module-carp \ | ||
42 | nativesdk-perl-module-constant \ | ||
43 | nativesdk-perl-module-data-dumper \ | ||
44 | nativesdk-perl-module-errno \ | ||
45 | nativesdk-perl-module-exporter \ | ||
46 | nativesdk-perl-module-file-basename \ | ||
47 | nativesdk-perl-module-file-compare \ | ||
48 | nativesdk-perl-module-file-copy \ | ||
49 | nativesdk-perl-module-file-find \ | ||
50 | nativesdk-perl-module-file-glob \ | ||
51 | nativesdk-perl-module-file-path \ | ||
52 | nativesdk-perl-module-file-spec \ | ||
53 | nativesdk-perl-module-file-spec-unix \ | ||
54 | nativesdk-perl-module-file-stat \ | ||
55 | nativesdk-perl-module-getopt-long \ | ||
56 | nativesdk-perl-module-io-file \ | ||
57 | nativesdk-perl-module-overloading \ | ||
58 | nativesdk-perl-module-posix \ | ||
59 | nativesdk-perl-module-symbol \ | ||
60 | nativesdk-perl-module-thread-queue \ | ||
61 | nativesdk-perl-module-threads \ | ||
62 | " | ||
63 | 36 | ||
64 | inherit autotools texinfo | 37 | inherit autotools texinfo |
65 | 38 | ||
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} += "\ | |||
17 | perl-module-vars " | 17 | perl-module-vars " |
18 | 18 | ||
19 | RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" | 19 | RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" |
20 | RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" | ||
21 | 20 | ||
22 | SRC_URI += "file://python-libdir.patch \ | 21 | SRC_URI += "file://python-libdir.patch \ |
23 | file://buildtest.patch \ | 22 | 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 \ | |||
53 | ldd \ | 53 | ldd \ |
54 | " | 54 | " |
55 | 55 | ||
56 | RDEPENDS_${PN}_class-native = "" | ||
57 | |||
58 | BBCLASSEXTEND = "native nativesdk" | 56 | 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 \ | |||
15 | ${PYTHON_PN}-threading \ | 15 | ${PYTHON_PN}-threading \ |
16 | " | 16 | " |
17 | 17 | ||
18 | RDEPENDS_${PN}_class-native = "" | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | 18 | 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" | |||
69 | 69 | ||
70 | # isn't getting picked up by shlibs code | 70 | # isn't getting picked up by shlibs code |
71 | RDEPENDS_${PN} += "tcl-lib" | 71 | RDEPENDS_${PN} += "tcl-lib" |
72 | RDEPENDS_${PN}_class-native = "" | ||
73 | RDEPENDS_${PN}-ptest += "libgcc" | 72 | RDEPENDS_${PN}-ptest += "libgcc" |
74 | 73 | ||
75 | BBCLASSEXTEND = "native nativesdk" | 74 | 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 | |||
13 | 13 | ||
14 | BBCLASSEXTEND = "native" | 14 | BBCLASSEXTEND = "native" |
15 | 15 | ||
16 | RDEPENDS_${PN}_class-native = "" | ||
17 | RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" | 16 | RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" |
18 | RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-utf8" | 17 | RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-utf8" |
19 | 18 | ||
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 | |||
18 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
19 | 19 | ||
20 | RDEPENDS_${PN} += "libxml2-python" | 20 | RDEPENDS_${PN} += "libxml2-python" |
21 | RDEPENDS_${PN}_class-native = "" | ||