diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:05 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | d1979577501a9e850fbde6a801531281c6510711 (patch) | |
tree | 2751b2d823b40bbc4c7aefcf4d050dfb89088979 | |
parent | 35f3279165ccd38f8057ffdfe719510d2bc02d06 (diff) | |
download | poky-d1979577501a9e850fbde6a801531281c6510711.tar.gz |
dnf: upgrade 4.18.2 -> 4.19.0
(From OE-Core rev: f6241428aaf54e540795efc64844cab5acd9629b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.19.0.bb (renamed from meta/recipes-devtools/dnf/dnf_4.18.2.bb) | 2 |
8 files changed, 16 insertions, 33 deletions
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 6692b41a16..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,11 +1,10 @@ | |||
1 | From 05e059cd4e9910c00b32d377f4f98e3c8dde6bc6 Mon Sep 17 00:00:00 2001 | 1 | From f70eb308c837f2c944e23bb680a501a605004d65 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 26 Jan 2017 16:36:20 +0200 | 3 | Date: Thu, 26 Jan 2017 16:36:20 +0200 |
4 | Subject: [PATCH 4/5] Corretly install tmpfiles.d configuration | 4 | Subject: [PATCH] Corretly install tmpfiles.d configuration |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | etc/tmpfiles.d/CMakeLists.txt | 2 +- | 9 | etc/tmpfiles.d/CMakeLists.txt | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -17,6 +16,3 @@ index f69c773e..3eb6d0e8 100644 | |||
17 | @@ -1 +1 @@ | 16 | @@ -1 +1 @@ |
18 | -INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) | 17 | -INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) |
19 | +INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) | 18 | +INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) |
20 | -- | ||
21 | 2.14.2 | ||
22 | |||
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 cb09f17a56..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,17 +1,16 @@ | |||
1 | From ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001 | 1 | From 3ca6d14fbc6419ff6239b4ba16f77da20fb31d03 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 | 3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 |
4 | Subject: [PATCH] Do not hardcode /etc and systemd unit directories | 4 | Subject: [PATCH] Do not hardcode /etc and systemd unit directories |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | CMakeLists.txt | 4 ++-- | 9 | CMakeLists.txt | 4 ++-- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 11 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
14 | index 73552967..38cf4fbf 100644 | 13 | index 4aee99fb..9e2e9e9e 100644 |
15 | --- a/CMakeLists.txt | 14 | --- a/CMakeLists.txt |
16 | +++ b/CMakeLists.txt | 15 | +++ b/CMakeLists.txt |
17 | @@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) | 16 | @@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) |
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 index eb0309d81a..18f9a30949 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3bd0faf58cc9ad531e6b63d5660c4b8316e8daed Mon Sep 17 00:00:00 2001 | 1 | From 049e2832284ab883e185d9020c881518a68e6c38 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 28 Apr 2020 15:55:00 +0200 | 3 | Date: Tue, 28 Apr 2020 15:55:00 +0200 |
4 | Subject: [PATCH] dnf: write the log lock to root | 4 | Subject: [PATCH] dnf: write the log lock to root |
@@ -10,7 +10,6 @@ already existing, and base-files creating it as a symlink). | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-core specific] | 11 | Upstream-Status: Inappropriate [oe-core specific] |
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | dnf/logging.py | 2 +- | 14 | dnf/logging.py | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
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 index 448f6408bc..fcd970a7ae 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 | 1 | From fa32c7dcabaa3c00d3620a3266e49629365c0cbe Mon Sep 17 00:00:00 2001 |
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | 2 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
3 | Date: Wed, 11 Mar 2020 22:10:02 +0000 | 3 | Date: Wed, 11 Mar 2020 22:10:02 +0000 |
4 | Subject: [PATCH] set python path for completion_helper | 4 | Subject: [PATCH] set python path for completion_helper |
@@ -10,7 +10,7 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in | 12 | diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in |
13 | index 351226759..2835cd3b6 100644 | 13 | index 0da0f2a2..9330d15b 100644 |
14 | --- a/dnf/cli/completion_helper.py.in | 14 | --- a/dnf/cli/completion_helper.py.in |
15 | +++ b/dnf/cli/completion_helper.py.in | 15 | +++ b/dnf/cli/completion_helper.py.in |
16 | @@ -1,4 +1,4 @@ | 16 | @@ -1,4 +1,4 @@ |
@@ -19,6 +19,3 @@ index 351226759..2835cd3b6 100644 | |||
19 | # | 19 | # |
20 | # This file is part of dnf. | 20 | # This file is part of dnf. |
21 | # | 21 | # |
22 | -- | ||
23 | 2.23.0 | ||
24 | |||
diff --git a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch index 0e11c2eac2..cfbda11f77 100644 --- a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch +++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6365389074a1b86962f3d8b22a2ead2202026a98 Mon Sep 17 00:00:00 2001 | 1 | From c6d03b51e2098fc681e6811790bd5dc6597091eb Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 11 Jan 2017 15:10:13 +0200 | 3 | Date: Wed, 11 Jan 2017 15:10:13 +0200 |
4 | Subject: [PATCH 5/5] Do not prepend installroot to logdir. | 4 | Subject: [PATCH] Do not prepend installroot to logdir. |
5 | 5 | ||
6 | This would otherwise write the logs into rootfs/var/log | 6 | This would otherwise write the logs into rootfs/var/log |
7 | (whereas we want them in $T), | 7 | (whereas we want them in $T), |
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py | 16 | diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py |
17 | index d2d9c082..82270ecf 100644 | 17 | index 1824bd00..4dcb1c1c 100644 |
18 | --- a/dnf/cli/cli.py | 18 | --- a/dnf/cli/cli.py |
19 | +++ b/dnf/cli/cli.py | 19 | +++ b/dnf/cli/cli.py |
20 | @@ -944,7 +944,7 @@ class Cli(object): | 20 | @@ -944,7 +944,7 @@ class Cli(object): |
@@ -26,6 +26,3 @@ index d2d9c082..82270ecf 100644 | |||
26 | conf.prepend_installroot(opt) | 26 | conf.prepend_installroot(opt) |
27 | 27 | ||
28 | self.base._logging._setup_from_dnf_conf(conf) | 28 | self.base._logging._setup_from_dnf_conf(conf) |
29 | -- | ||
30 | 2.14.2 | ||
31 | |||
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 5cffc9dce1..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,11 +1,10 @@ | |||
1 | From ceb1043c4f3de095e36908232320b74a4128a94e Mon Sep 17 00:00:00 2001 | 1 | From d5b154ea69afdcd862299a0b7f255f6ece3686c6 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:29:07 +0200 | 3 | Date: Fri, 30 Dec 2016 18:29:07 +0200 |
4 | Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python | 4 | Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | CMakeLists.txt | 2 +- | 9 | CMakeLists.txt | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
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 eedbb5723f..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,20 +1,19 @@ | |||
1 | From 8d97b72a1d77149e2f9048d1ca6cef66da1a8aa5 Mon Sep 17 00:00:00 2001 | 1 | From d3556767b84f3687743fdad0a88af0739d736ea9 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:29:37 +0200 | 3 | Date: Fri, 30 Dec 2016 18:29:37 +0200 |
4 | Subject: [PATCH 2/5] Run python scripts using env | 4 | Subject: [PATCH] Run python scripts using env |
5 | 5 | ||
6 | Otherwise the build tools hardcode the python path into them. | 6 | Otherwise the build tools hardcode the python path into them. |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | bin/dnf-automatic.in | 2 +- | 11 | bin/dnf-automatic.in | 2 +- |
13 | bin/dnf.in | 2 +- | 12 | bin/dnf.in | 2 +- |
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
15 | 14 | ||
16 | diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in | 15 | diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in |
17 | index 5b06aa26..891b4c24 100755 | 16 | index 17e35a05..28827e38 100755 |
18 | --- a/bin/dnf-automatic.in | 17 | --- a/bin/dnf-automatic.in |
19 | +++ b/bin/dnf-automatic.in | 18 | +++ b/bin/dnf-automatic.in |
20 | @@ -1,4 +1,4 @@ | 19 | @@ -1,4 +1,4 @@ |
@@ -24,7 +23,7 @@ index 5b06aa26..891b4c24 100755 | |||
24 | # | 23 | # |
25 | # Copyright (C) 2014-2016 Red Hat, Inc. | 24 | # Copyright (C) 2014-2016 Red Hat, Inc. |
26 | diff --git a/bin/dnf.in b/bin/dnf.in | 25 | diff --git a/bin/dnf.in b/bin/dnf.in |
27 | index 645d0f06..bdf7b3c4 100755 | 26 | index 55ceb3f2..e38973c7 100755 |
28 | --- a/bin/dnf.in | 27 | --- a/bin/dnf.in |
29 | +++ b/bin/dnf.in | 28 | +++ b/bin/dnf.in |
30 | @@ -1,4 +1,4 @@ | 29 | @@ -1,4 +1,4 @@ |
@@ -33,6 +32,3 @@ index 645d0f06..bdf7b3c4 100755 | |||
33 | # The dnf executable script. | 32 | # The dnf executable script. |
34 | # | 33 | # |
35 | # Copyright (C) 2012-2016 Red Hat, Inc. | 34 | # Copyright (C) 2012-2016 Red Hat, Inc. |
36 | -- | ||
37 | 2.14.2 | ||
38 | |||
diff --git a/meta/recipes-devtools/dnf/dnf_4.18.2.bb b/meta/recipes-devtools/dnf/dnf_4.19.0.bb index dc0c18be5e..784d7a94b3 100644 --- a/meta/recipes-devtools/dnf/dnf_4.18.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.19.0.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc | |||
19 | 19 | ||
20 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" | 20 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" |
21 | 21 | ||
22 | SRCREV = "1c43d0999178d492381ad0b43917ffd9c74016f8" | 22 | SRCREV = "566a61f9d8a2830ac6dcc3a94c59224cef1c3d03" |
23 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 23 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |