diff options
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf')
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch | 62 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch (renamed from meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch) | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch | 11 |
9 files changed, 138 insertions, 72 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch b/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch deleted file mode 100644 index 05f3141517..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 166833a88a928a574bf9143b9b65f544be482c77 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 18 Aug 2017 15:55:15 +0300 -Subject: [PATCH] Check conf.releasever instead of releasever - -The substitutions may actually set the conf.releasever correctly, -and so the check should use that instead of the passed-in function -parameter. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/901] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - dnf/cli/cli.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index 2d63420c..167943b8 100644 ---- a/dnf/cli/cli.py -+++ b/dnf/cli/cli.py -@@ -914,7 +914,7 @@ class Cli(object): - conf.releasever = releasever - subst = conf.substitutions - subst.update_from_etc(conf.installroot) -- if releasever is None: -+ if conf.releasever is None: - logger.warning(_("Unable to detect release version (use '--releasever' to specify " - "release version)")) - --- -2.14.1 - diff --git a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch index c9df458974..fd942228b9 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch @@ -1,4 +1,4 @@ -From 8ce181714640315d2dd37ee794acbb22063cd669 Mon Sep 17 00:00:00 2001 +From f70eb308c837f2c944e23bb680a501a605004d65 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 26 Jan 2017 16:36:20 +0200 Subject: [PATCH] Corretly install tmpfiles.d configuration @@ -16,6 +16,3 @@ index f69c773e..3eb6d0e8 100644 @@ -1 +1 @@ -INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) +INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) --- -2.11.0 - diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch index 0f261e5c5d..37359a5765 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch @@ -1,4 +1,4 @@ -From 4313ced1320594013795f11f6db00381e3f4cc45 Mon Sep 17 00:00:00 2001 +From 3ca6d14fbc6419ff6239b4ba16f77da20fb31d03 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 26 Jan 2017 16:25:47 +0200 Subject: [PATCH] Do not hardcode /etc and systemd unit directories @@ -10,20 +10,17 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6a319935..db20ccd4 100644 +index 4aee99fb..9e2e9e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED) - set (PYTHON_DESIRED "2") - endif() +@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) + + INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) -SET( SYSCONFDIR /etc) -SET( SYSTEMD_DIR /usr/lib/systemd/system) +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) - if (${PYTHON_DESIRED} STREQUAL "2") - FIND_PACKAGE (PythonInterp REQUIRED) --- -2.11.0 - + IF (NOT PYTHON_DESIRED) + FIND_PACKAGE (PythonInterp REQUIRED) diff --git a/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch new file mode 100644 index 0000000000..18f9a30949 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch @@ -0,0 +1,29 @@ +From 049e2832284ab883e185d9020c881518a68e6c38 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 28 Apr 2020 15:55:00 +0200 +Subject: [PATCH] dnf: write the log lock to root + +Writing it to /var/log appears to be racing with installation +of base-files, and if lock is created first, base-files +will refuse to install (due to the target directory +already existing, and base-files creating it as a symlink). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + dnf/logging.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/logging.py b/dnf/logging.py +index ef0b25f3..94610af6 100644 +--- a/dnf/logging.py ++++ b/dnf/logging.py +@@ -118,7 +118,7 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler): + def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False): + super(MultiprocessRotatingFileHandler, self).__init__( + filename, mode, maxBytes, backupCount, encoding, delay) +- self.rotate_lock = dnf.lock.build_log_lock("/var/log/", True) ++ self.rotate_lock = dnf.lock.build_log_lock("/", True) + + def emit(self, record): + while True: diff --git a/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch b/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch new file mode 100644 index 0000000000..6bffe9af0a --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch @@ -0,0 +1,62 @@ +From 3881757eabfde2ff54400ab127b106ab085d83f0 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 13 Mar 2024 11:22:05 +0800 +Subject: [PATCH] lock.py: fix Exception handling + +Before, when logdir is not writable, _try_lock will raise an Exception +like "Permission denied: '/var/log/log_lock.pid'", and in this case, +_unlock_thread will not be called and the variable count will not be +handled, it maybe cause log_lock.pid not be deleted in case like [1]. + +For [1], it is an cross compile case, when dnf install some packages to +rootfs, seems like some threads don't do chroot like work, some threads +do chroot like work. so for the threads don't do chroot, "Permission denied" +Exception happend, for the threads that do chroot, log_lock.pid will be +created under installroot/var/log/log_lock.pid, since variable count not +handled correct before, log_lock.pid may not be deleted correctly. + +So fixed like this, if _try_lock raise Exception, _unlock_thread first, +then raise the Exception. + +[1] https://github.com/rpm-software-management/dnf/issues/1963 + +Upstream-Status: Submitted [ https://github.com/rpm-software-management/dnf/pull/2065 ] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + dnf/lock.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/dnf/lock.py b/dnf/lock.py +index 6817aac9..5718062a 100644 +--- a/dnf/lock.py ++++ b/dnf/lock.py +@@ -128,7 +128,11 @@ class ProcessLock(object): + self._lock_thread() + prev_pid = -1 + my_pid = os.getpid() +- pid = self._try_lock(my_pid) ++ try: ++ pid = self._try_lock(my_pid) ++ except Exception: ++ self._unlock_thread() ++ raise + while pid != my_pid: + if pid != -1: + if not self.blocking: +@@ -140,7 +144,11 @@ class ProcessLock(object): + logger.info(msg) + prev_pid = pid + time.sleep(1) +- pid = self._try_lock(my_pid) ++ try: ++ pid = self._try_lock(my_pid) ++ except Exception: ++ self._unlock_thread() ++ raise + + def __exit__(self, *exc_args): + if self.count == 1: +-- +2.25.1 + diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 0000000000..fcd970a7ae --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,21 @@ +From fa32c7dcabaa3c00d3620a3266e49629365c0cbe Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Wed, 11 Mar 2020 22:10:02 +0000 +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 0da0f2a2..9330d15b 100644 +--- a/dnf/cli/completion_helper.py.in ++++ b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch index a90e77cbf1..cfbda11f77 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch +++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch @@ -1,4 +1,4 @@ -From 31653d324cf8c7b1f2f9e49d22676bd2ac546331 Mon Sep 17 00:00:00 2001 +From c6d03b51e2098fc681e6811790bd5dc6597091eb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 11 Jan 2017 15:10:13 +0200 Subject: [PATCH] Do not prepend installroot to logdir. @@ -14,18 +14,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index b764801a..893f4bda 100644 +index 1824bd00..4dcb1c1c 100644 --- a/dnf/cli/cli.py +++ b/dnf/cli/cli.py -@@ -881,7 +881,7 @@ class Cli(object): - subst = conf.substitutions - subst.update_from_etc(conf.installroot) +@@ -944,7 +944,7 @@ class Cli(object): + logger.warning(_("Unable to detect release version (use '--releasever' to specify " + "release version)")) - for opt in ('cachedir', 'logdir', 'persistdir'): + for opt in ('cachedir', 'persistdir'): conf.prepend_installroot(opt) self.base._logging._setup_from_dnf_conf(conf) --- -2.11.0 - diff --git a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 8c59f9f670..64ea7874d3 100644 --- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,7 +1,7 @@ -From 3ddaa930cda57a62a2174faebcc87aebc59591d1 Mon Sep 17 00:00:00 2001 +From d5b154ea69afdcd862299a0b7f255f6ece3686c6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:29:07 +0200 -Subject: [PATCH 29/30] Do not set PYTHON_INSTALL_DIR by running python +Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -10,18 +10,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6a319935..466ca1e6 100644 +index 9e2e9e9e..2056089d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ else() - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() +@@ -19,7 +19,7 @@ ELSE () + MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) + ENDIF() --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION) +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") --- -2.11.0 - + ADD_SUBDIRECTORY (dnf) 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 1abd880da9..eb46113f3a 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 @@ -1,7 +1,7 @@ -From 9c8d545152b35d8943be72b9503414a53e1ebf7c Mon Sep 17 00:00:00 2001 +From d3556767b84f3687743fdad0a88af0739d736ea9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:29:37 +0200 -Subject: [PATCH 30/30] Run python scripts using env +Subject: [PATCH] Run python scripts using env Otherwise the build tools hardcode the python path into them. @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in -index 5b06aa26..9f6f703e 100755 +index 17e35a05..28827e38 100755 --- a/bin/dnf-automatic.in +++ b/bin/dnf-automatic.in @@ -1,4 +1,4 @@ @@ -23,7 +23,7 @@ index 5b06aa26..9f6f703e 100755 # # Copyright (C) 2014-2016 Red Hat, Inc. diff --git a/bin/dnf.in b/bin/dnf.in -index 645d0f06..ab141abd 100755 +index 55ceb3f2..e38973c7 100755 --- a/bin/dnf.in +++ b/bin/dnf.in @@ -1,4 +1,4 @@ @@ -32,6 +32,3 @@ index 645d0f06..ab141abd 100755 # The dnf executable script. # # Copyright (C) 2012-2016 Red Hat, Inc. --- -2.11.0 - |