diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-09-08 20:01:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:41:37 +0100 |
commit | 7aa703bf88a065d23ac6aaca63f1559e2d294f0b (patch) | |
tree | 407b2c188a65ca2f894c4b4b6918405fd1db783e | |
parent | c3189b9efeace692965b409d8588cb3833e53f5b (diff) | |
download | poky-7aa703bf88a065d23ac6aaca63f1559e2d294f0b.tar.gz |
libdnf: fix the rpm sqlite-only target setup
(From OE-Core rev: 8bbbcf9f8db1112a08c89ed8ee76c8c65f1ea179)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf_0.63.1.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch new file mode 100644 index 0000000000..6f8a3dcb50 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 2f7382b35d59fe08034603497e82ffb943fedef1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 30 Jun 2021 15:31:16 +0200 | ||
4 | Subject: [PATCH] libdnf/dnf-context.cpp: do not try to access BDB database | ||
5 | |||
6 | Upstream-Status: Inappropriate [upstream needs to rework this to support | ||
7 | sqlite] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | libdnf/dnf-context.cpp | 14 -------------- | ||
11 | 1 file changed, 14 deletions(-) | ||
12 | |||
13 | diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp | ||
14 | index 86f71a79..9cdcf769 100644 | ||
15 | --- a/libdnf/dnf-context.cpp | ||
16 | +++ b/libdnf/dnf-context.cpp | ||
17 | @@ -2264,20 +2264,6 @@ dnf_context_setup(DnfContext *context, | ||
18 | !dnf_context_set_os_release(context, error)) | ||
19 | return FALSE; | ||
20 | |||
21 | - /* setup a file monitor on the rpmdb, if we're operating on the native / */ | ||
22 | - if (g_strcmp0(priv->install_root, "/") == 0) { | ||
23 | - rpmdb_path = g_build_filename(priv->install_root, "var/lib/rpm/Packages", NULL); | ||
24 | - file_rpmdb = g_file_new_for_path(rpmdb_path); | ||
25 | - priv->monitor_rpmdb = g_file_monitor_file(file_rpmdb, | ||
26 | - G_FILE_MONITOR_NONE, | ||
27 | - NULL, | ||
28 | - error); | ||
29 | - if (priv->monitor_rpmdb == NULL) | ||
30 | - return FALSE; | ||
31 | - g_signal_connect(priv->monitor_rpmdb, "changed", | ||
32 | - G_CALLBACK(dnf_context_rpmdb_changed_cb), context); | ||
33 | - } | ||
34 | - | ||
35 | /* copy any vendor distributed cached metadata */ | ||
36 | if (!dnf_context_copy_vendor_cache(context, error)) | ||
37 | return FALSE; | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb index 282c28e2c4..a9f393e722 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ | |||
13 | file://enable_test_data_dir_set.patch \ | 13 | file://enable_test_data_dir_set.patch \ |
14 | file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ | 14 | file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ |
15 | file://0001-drop-FindPythonInstDir.cmake.patch \ | 15 | file://0001-drop-FindPythonInstDir.cmake.patch \ |
16 | file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" | 19 | SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" |