| Message ID | 20230924204711.3073-2-f_l_k@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/2] libblockdev: Upgrade 2.28 -> 3.03 | expand |
On Sun, Sep 24, 2023 at 1:47 PM Markus Volk <f_l_k@t-online.de> wrote: > - add a patch to fix reproducibility issues > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > ...1-Makefile.am-Dont-include-buildpath.patch | 47 +++++++++++++++++++ > .../{udisks2_2.9.4.bb => udisks2_2.10.1.bb} | 8 +++- > 2 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 > meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch > rename meta-oe/recipes-support/udisks/{udisks2_2.9.4.bb => > udisks2_2.10.1.bb} (86%) > > diff --git > a/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch > b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch > new file mode 100644 > index 000000000..5d9a31c42 > --- /dev/null > +++ > b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch > @@ -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=\"\" How does this end up in shared object perhaps that needs to be looked at as such specifying build dir in a makefile should be fine I guess > \ > + $(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=\"\" > \ > + $(POLKIT_GOBJECT_1_CFLAGS) > \ > + $(GUDEV_CFLAGS) > \ > + $(GLIB_CFLAGS) > \ > +-- > +2.42.0 > + > diff --git a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb > b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb > similarity index 86% > rename from meta-oe/recipes-support/udisks/udisks2_2.9.4.bb > rename to meta-oe/recipes-support/udisks/udisks2_2.10.1.bb > index 203006371..cb1cbe670 100644 > --- a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb > +++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb > @@ -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/* \ > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#105110): > https://lists.openembedded.org/g/openembedded-devel/message/105110 > Mute This Topic: https://lists.openembedded.org/mt/101562778/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Sun, Sep 24 2023 at 02:25:50 PM -07:00:00, Khem Raj <raj.khem@gmail.com> wrote: > How does this end up in shared object perhaps that needs to be looked > at as such specifying build dir in a makefile should be fine I guess <https://github.com/storaged-project/udisks/blob/c7027d888c00381851d918f33a13102e7b86e188/src/udisksmodulemanager.c#L192> i guess its this place
On Sun, Sep 24, 2023 at 2:29 PM Markus Volk <f_l_k@t-online.de> wrote: > On Sun, Sep 24 2023 at 02:25:50 PM -07:00:00, Khem Raj <raj.khem@gmail.com> > wrote: > > How does this end up in shared object perhaps that needs to be looked at > as such specifying build dir in a makefile should be fine I guess > > > > https://github.com/storaged-project/udisks/blob/c7027d888c00381851d918f33a13102e7b86e188/src/udisksmodulemanager.c#L192 > > i guess its this place > Right so it’s seems it’s trying to load stuff from build area when it’s not installed. May be for developer testing or something So maybe we can remove that unless we need these parts during ptest then encode a path accordingly >
It looks like BUILD_DIR is only passed for that reason <https://github.com/search?q=repo%3Astoraged-project%2Fudisks%20build_dir&type=code> On Sun, Sep 24 2023 at 02:34:47 PM -07:00:00, Khem Raj <raj.khem@gmail.com> wrote: > > > On Sun, Sep 24, 2023 at 2:29 PM Markus Volk <f_l_k@t-online.de > <mailto:f_l_k@t-online.de>> wrote: >> On Sun, Sep 24 2023 at 02:25:50 PM -07:00:00, Khem Raj >> <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote: >>> How does this end up in shared object perhaps that needs to be >>> looked at as such specifying build dir in a makefile should be fine >>> I guess >> >> <https://github.com/storaged-project/udisks/blob/c7027d888c00381851d918f33a13102e7b86e188/src/udisksmodulemanager.c#L192> >> >> i guess its this place > > Right so it’s seems it’s trying to load stuff from build area > when it’s not installed. May be for developer testing or something > > So maybe we can remove that unless we need these parts during ptest > then encode a path accordingly >>
On Sun, Sep 24, 2023 at 2:50 PM Markus Volk <f_l_k@t-online.de> wrote: > It looks like BUILD_DIR is only passed for that reason > > https://github.com/search?q=repo%3Astoraged-project%2Fudisks%20build_dir&type=code > Ok then maybe it should be a environment variable or something that can even help in cross testing if we plan to do ptests for it otherwise maybe remap it to /usr/src like we do for debug info paths > > On Sun, Sep 24 2023 at 02:34:47 PM -07:00:00, Khem Raj <raj.khem@gmail.com> > wrote: > > > > On Sun, Sep 24, 2023 at 2:29 PM Markus Volk <f_l_k@t-online.de> wrote: > >> On Sun, Sep 24 2023 at 02:25:50 PM -07:00:00, Khem Raj < >> raj.khem@gmail.com> wrote: >> >> How does this end up in shared object perhaps that needs to be looked at >> as such specifying build dir in a makefile should be fine I guess >> >> >> >> https://github.com/storaged-project/udisks/blob/c7027d888c00381851d918f33a13102e7b86e188/src/udisksmodulemanager.c#L192 >> >> i guess its this place >> > > Right so it’s seems it’s trying to load stuff from build area when it’s > not installed. May be for developer testing or something > > So maybe we can remove that unless we need these parts during ptest then > encode a path accordingly > >>
On Sun, Sep 24 2023 at 03:11:01 PM -07:00:00, Khem Raj <raj.khem@gmail.com> wrote: > Ok then maybe it should be a environment variable or something that > can even help in cross testing if we plan to do ptests for it Yes and we also do not need to change the way the code works. I'll send a v2 that maps BUILD_DIR to /usr/src
diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 000000000..5d9a31c42 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -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=\"\" \ + $(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=\"\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb similarity index 86% rename from meta-oe/recipes-support/udisks/udisks2_2.9.4.bb rename to meta-oe/recipes-support/udisks/udisks2_2.10.1.bb index 203006371..cb1cbe670 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb @@ -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/* \
- add a patch to fix reproducibility issues Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...1-Makefile.am-Dont-include-buildpath.patch | 47 +++++++++++++++++++ .../{udisks2_2.9.4.bb => udisks2_2.10.1.bb} | 8 +++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch rename meta-oe/recipes-support/udisks/{udisks2_2.9.4.bb => udisks2_2.10.1.bb} (86%)