diff options
Diffstat (limited to 'poky/meta/recipes-devtools/libdnf')
-rw-r--r-- | poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch | 34 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch | 37 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb (renamed from poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb) | 4 |
3 files changed, 39 insertions, 36 deletions
diff --git a/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch deleted file mode 100644 index b740521fda..0000000000 --- a/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 9 Mar 2021 19:30:42 +0000 -Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - libdnf/config.h | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/libdnf/config.h b/libdnf/config.h -index 01b330b4..dbd53f5e 100644 ---- a/libdnf/config.h -+++ b/libdnf/config.h -@@ -20,14 +20,11 @@ - - #ifdef __APPLE__ - #include <stdint.h> --#else --#include <bits/wordsize.h> - #endif -+#include <limits.h> - --#if __WORDSIZE == 32 --#include "config-32.h" --#elif __WORDSIZE == 64 -+#if (ULONG_MAX == 0xffffffffffffffff) - #include "config-64.h" - #else --#error "Unknown word size" -+#include "config-32.h" - #endif diff --git a/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch b/poky/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/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch @@ -0,0 +1,37 @@ +From 2f7382b35d59fe08034603497e82ffb943fedef1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 30 Jun 2021 15:31:16 +0200 +Subject: [PATCH] libdnf/dnf-context.cpp: do not try to access BDB database + +Upstream-Status: Inappropriate [upstream needs to rework this to support +sqlite] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + libdnf/dnf-context.cpp | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp +index 86f71a79..9cdcf769 100644 +--- a/libdnf/dnf-context.cpp ++++ b/libdnf/dnf-context.cpp +@@ -2264,20 +2264,6 @@ dnf_context_setup(DnfContext *context, + !dnf_context_set_os_release(context, error)) + return FALSE; + +- /* setup a file monitor on the rpmdb, if we're operating on the native / */ +- if (g_strcmp0(priv->install_root, "/") == 0) { +- rpmdb_path = g_build_filename(priv->install_root, "var/lib/rpm/Packages", NULL); +- file_rpmdb = g_file_new_for_path(rpmdb_path); +- priv->monitor_rpmdb = g_file_monitor_file(file_rpmdb, +- G_FILE_MONITOR_NONE, +- NULL, +- error); +- if (priv->monitor_rpmdb == NULL) +- return FALSE; +- g_signal_connect(priv->monitor_rpmdb, "changed", +- G_CALLBACK(dnf_context_rpmdb_changed_cb), context); +- } +- + /* copy any vendor distributed cached metadata */ + if (!dnf_context_copy_vendor_cache(context, error)) + return FALSE; diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb index 282c28e2c4..78f2002040 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb @@ -11,11 +11,11 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-Add-WITH_TESTS-option.patch \ file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ file://enable_test_data_dir_set.patch \ - file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ + file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " -SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" +SRCREV = "cee3e1c59f849d9be1bb8d7db3090cea5c59f4b6" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" |