helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

udisks2: Upgrade 2.9.4 -> 2.10.1

Browse Source 
- add a patch to fix reproducibility issues

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk 2023-09-25 00:26:09 +02:00 committed by Khem Raj
parent dc28f172aa
commit 5804b39df5
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch Normal file
View File

@ -0,0 +1,47 @@
From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 24 Sep 2023 22:20:42 +0200
Subject: [PATCH] Reproducibility fix
This fixes:
WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR
File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR
File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths]
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
modules/lvm2/Makefile.am | 2 +-
src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am
index 67b8aa6b3..e4ae462e7 100644
--- a/modules/lvm2/Makefile.am
+++ b/modules/lvm2/Makefile.am
@@ -16,7 +16,7 @@ CPPFLAGS = \
-DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-DUDISKS_COMPILATION \
- -DBUILD_DIR=\"$(abs_top_builddir)/\" \
+ -DBUILD_DIR=\"/usr/src/\" \
$(POLKIT_GOBJECT_1_CFLAGS) \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a174d1ab..0da3a497b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ CPPFLAGS = \
-DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-DUDISKS_COMPILATION \
- -DBUILD_DIR=\"$(abs_top_builddir)/\" \
+ -DBUILD_DIR=\"/usr/src/\" \
$(POLKIT_GOBJECT_1_CFLAGS) \
$(GUDEV_CFLAGS) \
$(GLIB_CFLAGS) \
--
2.42.0

8
meta-oe/recipes-support/udisks/udisks2_2.9.4.bb → meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
View File

@ -17,8 +17,11 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
RDEPENDS:${PN} = "acl"
SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https"
SRCREV = "001c486e6d099ed33e2de4f5c73c03e3ee180f81"
SRC_URI = " \
git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \
file://0001-Makefile.am-Dont-include-buildpath.patch \
"
SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350"
S = "${WORKDIR}/git"
CVE_PRODUCT = "udisks"
@ -45,6 +48,7 @@ FILES:${PN} += " \
${datadir}/dbus-1/ \
${datadir}/polkit-1 \
${datadir}/bash-completion \
${datadir}/zsh \
${libdir}/polkit-1/extensions/*.so \
${nonarch_base_libdir}/udev/* \
${exec_prefix}${nonarch_base_libdir}/udisks2/* \