From 685d7ec1114fa2ec4aa44f7e29d1e159f7899d4d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Aug 2017 14:44:58 +0300 Subject: dnf: update to 2.6.3 Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...ever-check-after-the-etc-dnf-vars-substit.patch | 37 ---------------- .../dnf/0030-Run-python-scripts-using-env.patch | 13 +----- meta/recipes-devtools/dnf/dnf_2.5.1.bb | 50 ---------------------- meta/recipes-devtools/dnf/dnf_2.6.3.bb | 49 +++++++++++++++++++++ 4 files changed, 50 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch delete mode 100644 meta/recipes-devtools/dnf/dnf_2.5.1.bb create mode 100644 meta/recipes-devtools/dnf/dnf_2.6.3.bb diff --git a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch b/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch deleted file mode 100644 index daf058bbae..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3d0cdd8af1b415712eeb00e377c307001684ad06 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 21 Jun 2017 15:35:20 +0300 -Subject: [PATCH] Move releasever check after the etc/dnf/vars substitutions. - -The substitutions may actually set the releasever correctly, -and so the check is premature. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/868] -Signed-off-by: Alexander Kanavin ---- - dnf/cli/cli.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index c53c2a52..f9f2c13a 100644 ---- a/dnf/cli/cli.py -+++ b/dnf/cli/cli.py -@@ -882,12 +882,12 @@ class Cli(object): - releasever = dnf.rpm.detect_releasever(conf.installroot) - elif releasever == '/': - releasever = dnf.rpm.detect_releasever(releasever) -- if releasever is None: -- logger.warning(_("Unable to detect release version (use '--releasever' to specify " -- "release version)")) - conf.releasever = releasever - subst = conf.substitutions - subst.update_from_etc(conf.installroot) -+ if releasever is None: -+ logger.warning(_("Unable to detect release version (use '--releasever' to specify " -+ "release version)")) - - for opt in ('cachedir', 'logdir', 'persistdir'): - conf.prepend_installroot(opt) --- -2.11.0 - diff --git a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch index 61328e6ec5..1abd880da9 100644 --- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch +++ b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch @@ -10,8 +10,7 @@ Signed-off-by: Alexander Kanavin --- bin/dnf-automatic.in | 2 +- bin/dnf.in | 2 +- - bin/yum.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in index 5b06aa26..9f6f703e 100755 @@ -33,16 +32,6 @@ index 645d0f06..ab141abd 100755 # The dnf executable script. # # Copyright (C) 2012-2016 Red Hat, Inc. -diff --git a/bin/yum.in b/bin/yum.in -index f1fee071..013dc8c5 100755 ---- a/bin/yum.in -+++ b/bin/yum.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!/usr/bin/env python3 - # The dnf executable script. - # - # Copyright (C) 2016 Red Hat, Inc. -- 2.11.0 diff --git a/meta/recipes-devtools/dnf/dnf_2.5.1.bb b/meta/recipes-devtools/dnf/dnf_2.5.1.bb deleted file mode 100644 index cdc2a8549f..0000000000 --- a/meta/recipes-devtools/dnf/dnf_2.5.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://PACKAGE-LICENSING;md5=bfc29916e11321be06924c4fb096fdcc \ - " - -SRC_URI = "git://github.com/rpm-software-management/dnf.git \ - file://0001-Move-releasever-check-after-the-etc-dnf-vars-substit.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 \ - file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ - file://0001-Corretly-install-tmpfiles.d-configuration.patch \ - " - -SRCREV = "32e6ffdc8902b868cd8f98f9c399c98c9de0c7b8" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake gettext bash-completion distutils3-base systemd - -DEPENDS += "libdnf librepo libcomps python3-iniparse" - -# manpages generation requires http://www.sphinx-doc.org/ -EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" - -BBCLASSEXTEND = "native nativesdk" -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-rpm python3-iniparse python3-json python3-importlib python3-curses python3-argparse python3-misc python3-gpg" - -# 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() { - lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf - lnr ${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 -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/dnf \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 -} - -SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ - dnf-automatic-download.service dnf-automatic-download.timer \ - dnf-automatic-install.service dnf-automatic-install.timer \ - dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ -" diff --git a/meta/recipes-devtools/dnf/dnf_2.6.3.bb b/meta/recipes-devtools/dnf/dnf_2.6.3.bb new file mode 100644 index 0000000000..ade55ea0a8 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf_2.6.3.bb @@ -0,0 +1,49 @@ +SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://PACKAGE-LICENSING;md5=bfc29916e11321be06924c4fb096fdcc \ + " + +SRC_URI = "git://github.com/rpm-software-management/dnf.git \ + 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 \ + file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ + file://0001-Corretly-install-tmpfiles.d-configuration.patch \ + " + +SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake gettext bash-completion distutils3-base systemd + +DEPENDS += "libdnf librepo libcomps python3-iniparse" + +# manpages generation requires http://www.sphinx-doc.org/ +EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" + +BBCLASSEXTEND = "native nativesdk" +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-rpm python3-iniparse python3-json python3-importlib python3-curses python3-argparse python3-misc python3-gpg" + +# 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() { + lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf + lnr ${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 +do_install_append_class-native() { + create_wrapper ${D}/${bindir}/dnf \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + +SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ + dnf-automatic-download.service dnf-automatic-download.timer \ + dnf-automatic-install.service dnf-automatic-install.timer \ + dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ +" -- cgit 1.2.3-korg