diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-27 16:19:55 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-28 08:41:08 +0100 |
| commit | bedcdc4cf921b70a8cfb16c6684668d0ac9e1942 (patch) | |
| tree | f8e97a36014e8bfb6dbbdc034d8ad25aeb16d592 /meta/recipes-devtools/dnf/dnf_git.bb | |
| parent | f60d261b682f1526fb7a754c425300954ef85042 (diff) | |
| download | openembedded-core-contrib-bedcdc4cf921b70a8cfb16c6684668d0ac9e1942.tar.gz | |
dnf: move the entire dnf/rpm4 stack to Python 3
[YOCTO #11180]
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf_git.bb')
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf_git.bb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-devtools/dnf/dnf_git.bb b/meta/recipes-devtools/dnf/dnf_git.bb index 3a2cb635e4..7d7f597e5a 100644 --- a/meta/recipes-devtools/dnf/dnf_git.bb +++ b/meta/recipes-devtools/dnf/dnf_git.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " SRC_URI = "git://github.com/rpm-software-management/dnf.git \ - file://0028-Use-backports.lzma-not-lzma.patch \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://0001-Do-not-prepend-installroot-to-logdir.patch \ @@ -18,24 +17,22 @@ SRCREV = "f0093d672d3069cfee8447973ae70ef615fd8886" S = "${WORKDIR}/git" -inherit cmake gettext bash-completion distutils-base systemd +inherit cmake gettext bash-completion distutils3-base systemd -DEPENDS += "libdnf librepo libcomps python-pygpgme python-iniparse" -# python 2.x only, drop when moving to python 3.x -DEPENDS += "python-backports-lzma" +DEPENDS += "libdnf librepo libcomps python3-pygpgme python3-iniparse" # manpages generation requires http://www.sphinx-doc.org/ -EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}" +EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}_class-target += "python-core python-codecs python-netclient python-email python-threading python-distutils librepo python-shell python-subprocess libcomps libdnf python-sqlite3 python-compression python-pygpgme python-backports-lzma python-rpm python-iniparse python-json python-importlib python-curses python-argparse" +RDEPENDS_${PN}_class-target += "python3-core python3-codecs python3-netclient python3-email python3-threading python3-distutils librepo python3-shell python3-subprocess libcomps libdnf python3-sqlite3 python3-compression python3-pygpgme python3-rpm python3-iniparse python3-json python3-importlib python3-curses python3-argparse python3-misc" # Create a symlink called 'dnf' as 'make install' does not do it, but # .spec file in dnf source tree does (and then Fedora and dnf documentation # says that dnf binary is plain 'dnf'). do_install_append() { - ln -s -r ${D}/${bindir}/dnf-2 ${D}/${bindir}/dnf - ln -s -r ${D}/${bindir}/dnf-automatic-2 ${D}/${bindir}/dnf-automatic + ln -s -r ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf + ln -s -r ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic } # Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in |