diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-14 17:04:52 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-23 21:38:23 +0300 |
| commit | 358dfea6a0767d615d9f6f00ea3a78e6ba86d850 (patch) | |
| tree | 5afba2df92dedcabfc02543382f38b20df1b8bdc | |
| parent | 1b933da8a732fd969dc230fb07442fbafa6a1dca (diff) | |
| download | openbmc-358dfea6a0767d615d9f6f00ea3a78e6ba86d850.tar.xz | |
dunfell: fix up inherits for python3
Most of these recipes are no longer needed but bitbake still verifies
the inherit clauses for them. python2 has been removed so need these to
all use the corresponding python3 classes.
(From meta-phosphor rev: d55b42ae26bf5198efeb38db9eed8166139408bd)
Change-Id: Idf5fee957d8d0f3128a766a8007c3053fc1464d9
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
5 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass index 16dbc58dc..e69126365 100644 --- a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass @@ -3,7 +3,7 @@ inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "python-dbus python-pygobject" +RDEPENDS_${PN} += "python3-dbus python3-pygobject" INSTALL_NAME ?= "${PN}" SCRIPT_NAME ?= "${INSTALL_NAME}.py" diff --git a/meta-phosphor/classes/skeleton-python.bbclass b/meta-phosphor/classes/skeleton-python.bbclass index 83fef5405..b81edac9c 100644 --- a/meta-phosphor/classes/skeleton-python.bbclass +++ b/meta-phosphor/classes/skeleton-python.bbclass @@ -1,4 +1,4 @@ -inherit setuptools +inherit setuptools3 do_compile_class-native() { : diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb index 1274c1240..a0383d5fd 100644 --- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb +++ b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb @@ -7,8 +7,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit allarch -inherit setuptools -inherit python-dir +inherit setuptools3 +inherit python3-dir PACKAGE_BEFORE_PN = " \ ${PN}-ns \ diff --git a/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb index 73ac563dc..cf0eb5db5 100644 --- a/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb +++ b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb @@ -34,7 +34,7 @@ S = "${WORKDIR}/pygobject-${PV}" EXTRA_OECONF += "--disable-introspection" -inherit autotools distutils-base pkgconfig +inherit autotools distutils3-base pkgconfig # necessary to let the call for python-config succeed export BUILD_SYS diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 7037ef92b..8db94b0c3 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit allarch inherit obmc-phosphor-systemd -inherit setuptools +inherit setuptools3 RDEPENDS_${PN} += " \ python-netserver \ |