diff options
| -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.70.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.69.0.bb) | 3 |
2 files changed, 1 insertions, 39 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 deleted file mode 100644 index 6f8a3dcb50..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 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.69.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb index da2550d323..14d6a37de1 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.69.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.70.0.bb | |||
| @@ -10,10 +10,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p | |||
| 10 | file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ | 10 | file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ |
| 11 | file://enable_test_data_dir_set.patch \ | 11 | file://enable_test_data_dir_set.patch \ |
| 12 | file://0001-drop-FindPythonInstDir.cmake.patch \ | 12 | file://0001-drop-FindPythonInstDir.cmake.patch \ |
| 13 | file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ | ||
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | SRCREV = "5c6d9cd6e5955e7038722f091396607c60fcbdd1" | 15 | SRCREV = "93759bc5cac262906e52b6a173d7b157914ec29e" |
| 17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" |
| 18 | 17 | ||
| 19 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
