From 742a1b71249f4da1c8d8e13e270b0eb6128a3f66 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 28 Apr 2020 16:20:28 +0200 Subject: dnf: add a patch for base-files installation failures Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../dnf/0001-dnf-write-the-log-lock-to-root.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.21.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch (limited to 'meta/recipes-devtools/dnf') 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..21b50dee01 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch @@ -0,0 +1,29 @@ +From 5e07c16a506b19cbb107d5e99fca41d679b23b9a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + dnf/logging.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/logging.py b/dnf/logging.py +index bd660470..a9d808b1 100644 +--- a/dnf/logging.py ++++ b/dnf/logging.py +@@ -94,7 +94,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_4.2.21.bb b/meta/recipes-devtools/dnf/dnf_4.2.21.bb index 8f7757b72f..44dab1d8a6 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.21.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.21.bb @@ -14,6 +14,7 @@ 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-set-python-path-for-completion_helper.patch \ + file://0001-dnf-write-the-log-lock-to-root.patch \ " SRCREV = "864c381baabf024c299dca75abfda96139b8f583" -- cgit 1.2.3-korg