diff mbox series

[meta-oe] lvm2/libdevmapper: upgrade 2.03.11 -> 2.03.16

Message ID 1662442335-7255-2-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] lvm2/libdevmapper: upgrade 2.03.11 -> 2.03.16 | expand

Commit Message

Mingyu Wang (Fujitsu) Sept. 6, 2022, 5:32 a.m. UTC 
0005-do-not-build-manual.patch
0006-start-lvm2-monitor.service-after-tmp.mount.patch
refreshed for new version.

Add bash to RDEPENDS.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
 ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
 ...per_2.03.11.bb => libdevmapper_2.03.16.bb} |  0
 meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
 .../lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} |  1 +
 5 files changed, 21 insertions(+), 16 deletions(-)
 rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb => libdevmapper_2.03.16.bb} (100%)
 rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} (99%)

Comments

Martin Jansa Sept. 10, 2022, 8:09 a.m. UTC | #1 
With this version I'm seeing both lvm2 and libdevmapper failing with::

    [CC] ioctl/libdevmapper.so.1.02
TOPDIR/..../12.2.0/ld: warning: using 'DM_1_02_129' as version for
'dm_bitset_parse_list' which is also named in version 'DM_1_02_138' in
script
TOPDIR/..../12.2.0/ld: error: datastruct/bitset.o: multiple definition of
'dm_bitset_parse_list'
TOPDIR/..../12.2.0/ld: datastruct/bitset.o: previous definition here

anyone else seeing the same?

On Tue, Sep 6, 2022 at 7:32 AM wangmy <wangmy@fujitsu.com> wrote:

> 0005-do-not-build-manual.patch
> 0006-start-lvm2-monitor.service-after-tmp.mount.patch
> refreshed for new version.
>
> Add bash to RDEPENDS.
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
>  ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
>  ...per_2.03.11.bb => libdevmapper_2.03.16.bb} |  0
>  meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
>  .../lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} |  1 +
>  5 files changed, 21 insertions(+), 16 deletions(-)
>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb =>
> libdevmapper_2.03.16.bb} (100%)
>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb}
> (99%)
>
> diff --git
> a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> index 7117d99a39..7979efbefb 100644
> --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> @@ -15,25 +15,26 @@ Upstream-Status: Pending
>
>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>
> -
>  Update context for lvm2 2.03.02.
> -
>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
> +
> +Update context for lvm2 2.03.16.
> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>  ---
>   Makefile.in  | 6 +++---
>   configure.ac | 1 -
>   2 files changed, 3 insertions(+), 4 deletions(-)
>
>  diff --git a/Makefile.in b/Makefile.in
> -index 6a1a990..80cba91 100644
> +index 3b7e0ec..37f14eb 100644
>  --- a/Makefile.in
>  +++ b/Makefile.in
>  @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
>   abs_top_builddir = @abs_top_builddir@
>   abs_top_srcdir = @abs_top_srcdir@
>
> --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
> -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
> +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
> ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
>
>   ifeq ("@UDEV_RULES@", "yes")
>     SUBDIRS += udev
> @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
>       libdaemon lib tools daemons libdm \
>       udev po
>   tools.distclean: test.distclean
> -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
> +@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
> +
>   daemons.device-mapper: libdm.device-mapper
>   tools.device-mapper: libdm.device-mapper
> - scripts.device-mapper: include.device-mapper
>  -device-mapper: tools.device-mapper daemons.device-mapper
> man.device-mapper
>  +device-mapper: tools.device-mapper daemons.device-mapper
> + device_mapper: device-mapper
>
>   ifeq ("@INTL@", "yes")
> - lib.pofile: include.pofile
>  diff --git a/configure.ac b/configure.ac
> -index 7fd0561..4154dc0 100644
> +index 6def519..18a5c97 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
> +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
>   libdm/Makefile
>   libdm/dm-tools/Makefile
>   libdm/libdevmapper.pc
> @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
>   scripts/lvm2-pvscan.service
>   scripts/blkdeactivate.sh
>  --
> -2.7.4
> +2.25.1
>
> diff --git
> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> index 9f9383ef48..5b9b2d5748 100644
> ---
> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> +++
> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
>
>  Rebase to v2_03_05
>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +
> +Rebase to v2_03_16
> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>  ---
>   scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in
> b/scripts/lvm2_monitoring_systemd_red_hat.service.in
> -index 4bf744a..46766cb 100644
> +index c0c96e3..2a99a37 100644
>  --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
>  +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
>  @@ -2,7 +2,7 @@
>   Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or
> progress polling
>   Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8)
> man:vgchange(8)
>   Requires=dm-event.socket
> --After=dm-event.socket dm-event.service lvm2-activation.service
> -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
> +-After=dm-event.socket dm-event.service
> ++After=dm-event.socket dm-event.service tmp.mount
>   Before=local-fs-pre.target shutdown.target
>   DefaultDependencies=no
>   Conflicts=shutdown.target
>  --
> -2.7.4
> +2.25.1
>
> diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
> b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
> similarity index 100%
> rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
> rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
> b/meta-oe/recipes-support/lvm2/lvm2.inc
> index 0c593b2042..34e57ec7a5 100644
> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
> @@ -18,7 +18,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main
> \
>             file://reproducible-build.patch \
>             "
>
> -SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
> +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
>  S = "${WORKDIR}/git"
>
>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
> diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> similarity index 99%
> rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> index a729324c9b..6a6cdc7cef 100644
> --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> @@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
>  # Specified explicitly for the udev rules, just in case that it does not
> get picked
>  # up automatically:
>  FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
> +RDEPENDS:${PN} = "bash"
>  RDEPENDS:${PN}-udevrules = "libdevmapper"
>  RDEPENDS:${PN}:append:class-target = " libdevmapper"
>  RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#98676):
> https://lists.openembedded.org/g/openembedded-devel/message/98676
> Mute This Topic: https://lists.openembedded.org/mt/93495342/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Khem Raj Sept. 10, 2022, 2:51 p.m. UTC | #2 
On Sat, Sep 10, 2022 at 1:09 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> With this version I'm seeing both lvm2 and libdevmapper failing with::
>
>     [CC] ioctl/libdevmapper.so.1.02
> TOPDIR/..../12.2.0/ld: warning: using 'DM_1_02_129' as version for 'dm_bitset_parse_list' which is also named in version 'DM_1_02_138' in script
> TOPDIR/..../12.2.0/ld: error: datastruct/bitset.o: multiple definition of 'dm_bitset_parse_list'
> TOPDIR/..../12.2.0/ld: datastruct/bitset.o: previous definition here
>
> anyone else seeing the same?

This is something that gold linker might catch. Are you using gold
linker ? secondly just try with ld.bfd and see if it works. That
atleast will put some sanity into
why my builders or AB did not see it.

>
> On Tue, Sep 6, 2022 at 7:32 AM wangmy <wangmy@fujitsu.com> wrote:
>>
>> 0005-do-not-build-manual.patch
>> 0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> refreshed for new version.
>>
>> Add bash to RDEPENDS.
>>
>> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>> ---
>>  .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
>>  ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
>>  ...per_2.03.11.bb => libdevmapper_2.03.16.bb} |  0
>>  meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
>>  .../lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} |  1 +
>>  5 files changed, 21 insertions(+), 16 deletions(-)
>>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb => libdevmapper_2.03.16.bb} (100%)
>>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} (99%)
>>
>> diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> index 7117d99a39..7979efbefb 100644
>> --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> @@ -15,25 +15,26 @@ Upstream-Status: Pending
>>
>>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>>
>> -
>>  Update context for lvm2 2.03.02.
>> -
>>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> +
>> +Update context for lvm2 2.03.16.
>> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>>  ---
>>   Makefile.in  | 6 +++---
>>   configure.ac | 1 -
>>   2 files changed, 3 insertions(+), 4 deletions(-)
>>
>>  diff --git a/Makefile.in b/Makefile.in
>> -index 6a1a990..80cba91 100644
>> +index 3b7e0ec..37f14eb 100644
>>  --- a/Makefile.in
>>  +++ b/Makefile.in
>>  @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
>>   abs_top_builddir = @abs_top_builddir@
>>   abs_top_srcdir = @abs_top_srcdir@
>>
>> --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
>> -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
>> +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
>> ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
>>
>>   ifeq ("@UDEV_RULES@", "yes")
>>     SUBDIRS += udev
>> @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
>>       libdaemon lib tools daemons libdm \
>>       udev po
>>   tools.distclean: test.distclean
>> -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
>> +@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
>> +
>>   daemons.device-mapper: libdm.device-mapper
>>   tools.device-mapper: libdm.device-mapper
>> - scripts.device-mapper: include.device-mapper
>>  -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
>>  +device-mapper: tools.device-mapper daemons.device-mapper
>> + device_mapper: device-mapper
>>
>>   ifeq ("@INTL@", "yes")
>> - lib.pofile: include.pofile
>>  diff --git a/configure.ac b/configure.ac
>> -index 7fd0561..4154dc0 100644
>> +index 6def519..18a5c97 100644
>>  --- a/configure.ac
>>  +++ b/configure.ac
>> -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
>> +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
>>   libdm/Makefile
>>   libdm/dm-tools/Makefile
>>   libdm/libdevmapper.pc
>> @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
>>   scripts/lvm2-pvscan.service
>>   scripts/blkdeactivate.sh
>>  --
>> -2.7.4
>> +2.25.1
>>
>> diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> index 9f9383ef48..5b9b2d5748 100644
>> --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
>>
>>  Rebase to v2_03_05
>>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> +
>> +Rebase to v2_03_16
>> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>>  ---
>>   scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>  diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
>> -index 4bf744a..46766cb 100644
>> +index c0c96e3..2a99a37 100644
>>  --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
>>  +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
>>  @@ -2,7 +2,7 @@
>>   Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
>>   Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
>>   Requires=dm-event.socket
>> --After=dm-event.socket dm-event.service lvm2-activation.service
>> -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
>> +-After=dm-event.socket dm-event.service
>> ++After=dm-event.socket dm-event.service tmp.mount
>>   Before=local-fs-pre.target shutdown.target
>>   DefaultDependencies=no
>>   Conflicts=shutdown.target
>>  --
>> -2.7.4
>> +2.25.1
>>
>> diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
>> similarity index 100%
>> rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
>> rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
>> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
>> index 0c593b2042..34e57ec7a5 100644
>> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
>> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
>> @@ -18,7 +18,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
>>             file://reproducible-build.patch \
>>             "
>>
>> -SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
>> +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
>>  S = "${WORKDIR}/git"
>>
>>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
>> diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> similarity index 99%
>> rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
>> rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> index a729324c9b..6a6cdc7cef 100644
>> --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
>> +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> @@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
>>  # Specified explicitly for the udev rules, just in case that it does not get picked
>>  # up automatically:
>>  FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
>> +RDEPENDS:${PN} = "bash"
>>  RDEPENDS:${PN}-udevrules = "libdevmapper"
>>  RDEPENDS:${PN}:append:class-target = " libdevmapper"
>>  RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
>> --
>> 2.25.1
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#98732): https://lists.openembedded.org/g/openembedded-devel/message/98732
> Mute This Topic: https://lists.openembedded.org/mt/93495342/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Martin Jansa Sept. 11, 2022, 7:03 p.m. UTC | #3 
Yes, you're right, it's reproducible only with ld-is-gold and
LDFLAGS += "-fuse-ld=bfd"
resolves this error.

It's caused by dm_bitset_parse_list uncommented
in libdm/.exported_symbols.DM_1_02_129:
https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab

On Sat, Sep 10, 2022 at 4:51 PM Khem Raj <raj.khem@gmail.com> wrote:

> On Sat, Sep 10, 2022 at 1:09 AM Martin Jansa <Martin.Jansa@gmail.com>
> wrote:
> >
> > With this version I'm seeing both lvm2 and libdevmapper failing with::
> >
> >     [CC] ioctl/libdevmapper.so.1.02
> > TOPDIR/..../12.2.0/ld: warning: using 'DM_1_02_129' as version for
> 'dm_bitset_parse_list' which is also named in version 'DM_1_02_138' in
> script
> > TOPDIR/..../12.2.0/ld: error: datastruct/bitset.o: multiple definition
> of 'dm_bitset_parse_list'
> > TOPDIR/..../12.2.0/ld: datastruct/bitset.o: previous definition here
> >
> > anyone else seeing the same?
>
> This is something that gold linker might catch. Are you using gold
> linker ? secondly just try with ld.bfd and see if it works. That
> atleast will put some sanity into
> why my builders or AB did not see it.
>
> >
> > On Tue, Sep 6, 2022 at 7:32 AM wangmy <wangmy@fujitsu.com> wrote:
> >>
> >> 0005-do-not-build-manual.patch
> >> 0006-start-lvm2-monitor.service-after-tmp.mount.patch
> >> refreshed for new version.
> >>
> >> Add bash to RDEPENDS.
> >>
> >> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> >> ---
> >>  .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
> >>  ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
> >>  ...per_2.03.11.bb => libdevmapper_2.03.16.bb} |  0
> >>  meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
> >>  .../lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} |  1 +
> >>  5 files changed, 21 insertions(+), 16 deletions(-)
> >>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb =>
> libdevmapper_2.03.16.bb} (100%)
> >>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb =>
> lvm2_2.03.16.bb} (99%)
> >>
> >> diff --git
> a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> >> index 7117d99a39..7979efbefb 100644
> >> --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> >> +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
> >> @@ -15,25 +15,26 @@ Upstream-Status: Pending
> >>
> >>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> >>
> >> -
> >>  Update context for lvm2 2.03.02.
> >> -
> >>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
> >> +
> >> +Update context for lvm2 2.03.16.
> >> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> >>  ---
> >>   Makefile.in  | 6 +++---
> >>   configure.ac | 1 -
> >>   2 files changed, 3 insertions(+), 4 deletions(-)
> >>
> >>  diff --git a/Makefile.in b/Makefile.in
> >> -index 6a1a990..80cba91 100644
> >> +index 3b7e0ec..37f14eb 100644
> >>  --- a/Makefile.in
> >>  +++ b/Makefile.in
> >>  @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
> >>   abs_top_builddir = @abs_top_builddir@
> >>   abs_top_srcdir = @abs_top_srcdir@
> >>
> >> --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
> >> -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
> >> +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
> >> ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
> >>
> >>   ifeq ("@UDEV_RULES@", "yes")
> >>     SUBDIRS += udev
> >> @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
> >>       libdaemon lib tools daemons libdm \
> >>       udev po
> >>   tools.distclean: test.distclean
> >> -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
> >> +@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
> >> +
> >>   daemons.device-mapper: libdm.device-mapper
> >>   tools.device-mapper: libdm.device-mapper
> >> - scripts.device-mapper: include.device-mapper
> >>  -device-mapper: tools.device-mapper daemons.device-mapper
> man.device-mapper
> >>  +device-mapper: tools.device-mapper daemons.device-mapper
> >> + device_mapper: device-mapper
> >>
> >>   ifeq ("@INTL@", "yes")
> >> - lib.pofile: include.pofile
> >>  diff --git a/configure.ac b/configure.ac
> >> -index 7fd0561..4154dc0 100644
> >> +index 6def519..18a5c97 100644
> >>  --- a/configure.ac
> >>  +++ b/configure.ac
> >> -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
> >> +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
> >>   libdm/Makefile
> >>   libdm/dm-tools/Makefile
> >>   libdm/libdevmapper.pc
> >> @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
> >>   scripts/lvm2-pvscan.service
> >>   scripts/blkdeactivate.sh
> >>  --
> >> -2.7.4
> >> +2.25.1
> >>
> >> diff --git
> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> >> index 9f9383ef48..5b9b2d5748 100644
> >> ---
> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> >> +++
> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
> >> @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
> >>
> >>  Rebase to v2_03_05
> >>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> >> +
> >> +Rebase to v2_03_16
> >> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> >>  ---
> >>   scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>  diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in
> b/scripts/lvm2_monitoring_systemd_red_hat.service.in
> >> -index 4bf744a..46766cb 100644
> >> +index c0c96e3..2a99a37 100644
> >>  --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
> >>  +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
> >>  @@ -2,7 +2,7 @@
> >>   Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd
> or progress polling
> >>   Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8)
> man:vgchange(8)
> >>   Requires=dm-event.socket
> >> --After=dm-event.socket dm-event.service lvm2-activation.service
> >> -+After=dm-event.socket dm-event.service lvm2-activation.service
> tmp.mount
> >> +-After=dm-event.socket dm-event.service
> >> ++After=dm-event.socket dm-event.service tmp.mount
> >>   Before=local-fs-pre.target shutdown.target
> >>   DefaultDependencies=no
> >>   Conflicts=shutdown.target
> >>  --
> >> -2.7.4
> >> +2.25.1
> >>
> >> diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
> b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
> >> similarity index 100%
> >> rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
> >> rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
> >> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
> b/meta-oe/recipes-support/lvm2/lvm2.inc
> >> index 0c593b2042..34e57ec7a5 100644
> >> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
> >> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
> >> @@ -18,7 +18,7 @@ SRC_URI = "git://
> sourceware.org/git/lvm2.git;branch=main \
> >>             file://reproducible-build.patch \
> >>             "
> >>
> >> -SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
> >> +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
> >>  S = "${WORKDIR}/git"
> >>
> >>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
> >> diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> >> similarity index 99%
> >> rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> >> rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> >> index a729324c9b..6a6cdc7cef 100644
> >> --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
> >> +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
> >> @@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
> >>  # Specified explicitly for the udev rules, just in case that it does
> not get picked
> >>  # up automatically:
> >>  FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
> >> +RDEPENDS:${PN} = "bash"
> >>  RDEPENDS:${PN}-udevrules = "libdevmapper"
> >>  RDEPENDS:${PN}:append:class-target = " libdevmapper"
> >>  RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
> >> --
> >> 2.25.1
> >>
> >>
> >>
> >>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#98732):
> https://lists.openembedded.org/g/openembedded-devel/message/98732
> > Mute This Topic: https://lists.openembedded.org/mt/93495342/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Martin Jansa Sept. 11, 2022, 7:22 p.m. UTC | #4 
Patch sent for the issue with gold.

wangmy: why did you add bash to RDEPENDS?

Couple years ago it was patched to avoid bashisms and runtime dependency on
bash:
https://git.openembedded.org/meta-openembedded/commit/?id=af279a8e746ba80e4811751ba6ede3519cd71b3c

I guess it was because of:
ERROR: lvm2-2.03.16-r0 do_package_qa: QA Issue: /usr/sbin/lvm_import_vdo
contained in package lvm2 requires /bin/bash, but no providers found in
RDEPENDS:lvm2? [file-rdeps]

but can we move lvm_import_vdo to PN-scripts (which already rdepends on
bash) or avoid bash here as well?

it was added in
https://github.com/lvmteam/lvm2/commit/ed48cb26a31e8e5a12d82d96d8bec6bfc4d5b218
and later renamed in
https://github.com/lvmteam/lvm2/commit/bbbd4fed69d88e67678994cb611d082d27bb774b

Regards,

On Sun, Sep 11, 2022 at 9:03 PM Martin Jansa via lists.openembedded.org
<Martin.Jansa=gmail.com@lists.openembedded.org> wrote:

> Yes, you're right, it's reproducible only with ld-is-gold and
> LDFLAGS += "-fuse-ld=bfd"
> resolves this error.
>
> It's caused by dm_bitset_parse_list uncommented
> in libdm/.exported_symbols.DM_1_02_129:
>
> https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
>
> On Sat, Sep 10, 2022 at 4:51 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Sat, Sep 10, 2022 at 1:09 AM Martin Jansa <Martin.Jansa@gmail.com>
>> wrote:
>> >
>> > With this version I'm seeing both lvm2 and libdevmapper failing with::
>> >
>> >     [CC] ioctl/libdevmapper.so.1.02
>> > TOPDIR/..../12.2.0/ld: warning: using 'DM_1_02_129' as version for
>> 'dm_bitset_parse_list' which is also named in version 'DM_1_02_138' in
>> script
>> > TOPDIR/..../12.2.0/ld: error: datastruct/bitset.o: multiple definition
>> of 'dm_bitset_parse_list'
>> > TOPDIR/..../12.2.0/ld: datastruct/bitset.o: previous definition here
>> >
>> > anyone else seeing the same?
>>
>> This is something that gold linker might catch. Are you using gold
>> linker ? secondly just try with ld.bfd and see if it works. That
>> atleast will put some sanity into
>> why my builders or AB did not see it.
>>
>> >
>> > On Tue, Sep 6, 2022 at 7:32 AM wangmy <wangmy@fujitsu.com> wrote:
>> >>
>> >> 0005-do-not-build-manual.patch
>> >> 0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> >> refreshed for new version.
>> >>
>> >> Add bash to RDEPENDS.
>> >>
>> >> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>> >> ---
>> >>  .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
>> >>  ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
>> >>  ...per_2.03.11.bb => libdevmapper_2.03.16.bb} |  0
>> >>  meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
>> >>  .../lvm2/{lvm2_2.03.11.bb => lvm2_2.03.16.bb} |  1 +
>> >>  5 files changed, 21 insertions(+), 16 deletions(-)
>> >>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb =>
>> libdevmapper_2.03.16.bb} (100%)
>> >>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb =>
>> lvm2_2.03.16.bb} (99%)
>> >>
>> >> diff --git
>> a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> >> index 7117d99a39..7979efbefb 100644
>> >> --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> >> +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> >> @@ -15,25 +15,26 @@ Upstream-Status: Pending
>> >>
>> >>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> >>
>> >> -
>> >>  Update context for lvm2 2.03.02.
>> >> -
>> >>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> >> +
>> >> +Update context for lvm2 2.03.16.
>> >> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>> >>  ---
>> >>   Makefile.in  | 6 +++---
>> >>   configure.ac | 1 -
>> >>   2 files changed, 3 insertions(+), 4 deletions(-)
>> >>
>> >>  diff --git a/Makefile.in b/Makefile.in
>> >> -index 6a1a990..80cba91 100644
>> >> +index 3b7e0ec..37f14eb 100644
>> >>  --- a/Makefile.in
>> >>  +++ b/Makefile.in
>> >>  @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
>> >>   abs_top_builddir = @abs_top_builddir@
>> >>   abs_top_srcdir = @abs_top_srcdir@
>> >>
>> >> --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
>> >> -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
>> >> +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
>> >> ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
>> >>
>> >>   ifeq ("@UDEV_RULES@", "yes")
>> >>     SUBDIRS += udev
>> >> @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
>> >>       libdaemon lib tools daemons libdm \
>> >>       udev po
>> >>   tools.distclean: test.distclean
>> >> -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
>> >> +@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
>> >> +
>> >>   daemons.device-mapper: libdm.device-mapper
>> >>   tools.device-mapper: libdm.device-mapper
>> >> - scripts.device-mapper: include.device-mapper
>> >>  -device-mapper: tools.device-mapper daemons.device-mapper
>> man.device-mapper
>> >>  +device-mapper: tools.device-mapper daemons.device-mapper
>> >> + device_mapper: device-mapper
>> >>
>> >>   ifeq ("@INTL@", "yes")
>> >> - lib.pofile: include.pofile
>> >>  diff --git a/configure.ac b/configure.ac
>> >> -index 7fd0561..4154dc0 100644
>> >> +index 6def519..18a5c97 100644
>> >>  --- a/configure.ac
>> >>  +++ b/configure.ac
>> >> -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
>> >> +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
>> >>   libdm/Makefile
>> >>   libdm/dm-tools/Makefile
>> >>   libdm/libdevmapper.pc
>> >> @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
>> >>   scripts/lvm2-pvscan.service
>> >>   scripts/blkdeactivate.sh
>> >>  --
>> >> -2.7.4
>> >> +2.25.1
>> >>
>> >> diff --git
>> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> >> index 9f9383ef48..5b9b2d5748 100644
>> >> ---
>> a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> >> +++
>> b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> >> @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
>> >>
>> >>  Rebase to v2_03_05
>> >>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> >> +
>> >> +Rebase to v2_03_16
>> >> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
>> >>  ---
>> >>   scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
>> >>   1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >>  diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in
>> b/scripts/lvm2_monitoring_systemd_red_hat.service.in
>> >> -index 4bf744a..46766cb 100644
>> >> +index c0c96e3..2a99a37 100644
>> >>  --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
>> >>  +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
>> >>  @@ -2,7 +2,7 @@
>> >>   Description=Monitoring of LVM2 mirrors, snapshots etc. using
>> dmeventd or progress polling
>> >>   Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8)
>> man:vgchange(8)
>> >>   Requires=dm-event.socket
>> >> --After=dm-event.socket dm-event.service lvm2-activation.service
>> >> -+After=dm-event.socket dm-event.service lvm2-activation.service
>> tmp.mount
>> >> +-After=dm-event.socket dm-event.service
>> >> ++After=dm-event.socket dm-event.service tmp.mount
>> >>   Before=local-fs-pre.target shutdown.target
>> >>   DefaultDependencies=no
>> >>   Conflicts=shutdown.target
>> >>  --
>> >> -2.7.4
>> >> +2.25.1
>> >>
>> >> diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
>> b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
>> >> similarity index 100%
>> >> rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
>> >> rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
>> >> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
>> b/meta-oe/recipes-support/lvm2/lvm2.inc
>> >> index 0c593b2042..34e57ec7a5 100644
>> >> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
>> >> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
>> >> @@ -18,7 +18,7 @@ SRC_URI = "git://
>> sourceware.org/git/lvm2.git;branch=main \
>> >>             file://reproducible-build.patch \
>> >>             "
>> >>
>> >> -SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
>> >> +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
>> >>  S = "${WORKDIR}/git"
>> >>
>> >>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
>> >> diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
>> b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> >> similarity index 99%
>> >> rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
>> >> rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> >> index a729324c9b..6a6cdc7cef 100644
>> >> --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
>> >> +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
>> >> @@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
>> >>  # Specified explicitly for the udev rules, just in case that it does
>> not get picked
>> >>  # up automatically:
>> >>  FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
>> >> +RDEPENDS:${PN} = "bash"
>> >>  RDEPENDS:${PN}-udevrules = "libdevmapper"
>> >>  RDEPENDS:${PN}:append:class-target = " libdevmapper"
>> >>  RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
>> >> --
>> >> 2.25.1
>> >>
>> >>
>> >>
>> >>
>> >
>> >
>> >
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#98736):
> https://lists.openembedded.org/g/openembedded-devel/message/98736
> Mute This Topic: https://lists.openembedded.org/mt/93495342/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Mingyu Wang (Fujitsu) Sept. 12, 2022, 2 a.m. UTC | #5 
Thank you very much for telling us the whole story.
When I updated the version, I found that bash was needed. According to the usual practice, I added bash directly, without conducting an investigation into this problem.
I will confirm this problem and make appropriate solutions in case of similar situations in the future

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>
http://www.fujitsu.com/cn/fnst/

From: Martin Jansa <martin.jansa@gmail.com>
Sent: Monday, September 12, 2022 3:23 AM
To: Martin.Jansa@gmail.com
Cc: Khem Raj <raj.khem@gmail.com>; Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>; openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe] [PATCH] lvm2/libdevmapper: upgrade 2.03.11 -> 2.03.16

Patch sent for the issue with gold.

wangmy: why did you add bash to RDEPENDS?

Couple years ago it was patched to avoid bashisms and runtime dependency on bash:
https://git.openembedded.org/meta-openembedded/commit/?id=af279a8e746ba80e4811751ba6ede3519cd71b3c

I guess it was because of:
ERROR: lvm2-2.03.16-r0 do_package_qa: QA Issue: /usr/sbin/lvm_import_vdo contained in package lvm2 requires /bin/bash, but no providers found in RDEPENDS:lvm2? [file-rdeps]

but can we move lvm_import_vdo to PN-scripts (which already rdepends on bash) or avoid bash here as well?

it was added in https://github.com/lvmteam/lvm2/commit/ed48cb26a31e8e5a12d82d96d8bec6bfc4d5b218 and later renamed in https://github.com/lvmteam/lvm2/commit/bbbd4fed69d88e67678994cb611d082d27bb774b

Regards,

On Sun, Sep 11, 2022 at 9:03 PM Martin Jansa via lists.openembedded.org<http://lists.openembedded.org> <Martin.Jansa=gmail.com@lists.openembedded.org<mailto:gmail.com@lists.openembedded.org>> wrote:
Yes, you're right, it's reproducible only with ld-is-gold and
LDFLAGS += "-fuse-ld=bfd"
resolves this error.

It's caused by dm_bitset_parse_list uncommented in libdm/.exported_symbols.DM_1_02_129:
https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab

On Sat, Sep 10, 2022 at 4:51 PM Khem Raj <raj.khem@gmail.com<mailto:raj.khem@gmail.com>> wrote:
On Sat, Sep 10, 2022 at 1:09 AM Martin Jansa <Martin.Jansa@gmail.com<mailto:Martin.Jansa@gmail.com>> wrote:
>
> With this version I'm seeing both lvm2 and libdevmapper failing with::
>
>     [CC] ioctl/libdevmapper.so.1.02
> TOPDIR/..../12.2.0/ld: warning: using 'DM_1_02_129' as version for 'dm_bitset_parse_list' which is also named in version 'DM_1_02_138' in script
> TOPDIR/..../12.2.0/ld: error: datastruct/bitset.o: multiple definition of 'dm_bitset_parse_list'
> TOPDIR/..../12.2.0/ld: datastruct/bitset.o: previous definition here
>
> anyone else seeing the same?

This is something that gold linker might catch. Are you using gold
linker ? secondly just try with ld.bfd and see if it works. That
atleast will put some sanity into
why my builders or AB did not see it.

>
> On Tue, Sep 6, 2022 at 7:32 AM wangmy <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>> wrote:
>>
>> 0005-do-not-build-manual.patch
>> 0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> refreshed for new version.
>>
>> Add bash to RDEPENDS.
>>
>> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>>
>> ---
>>  .../lvm2/files/0005-do-not-build-manual.patch | 23 ++++++++++---------
>>  ...lvm2-monitor.service-after-tmp.mount.patch | 11 +++++----
>>  ...per_2.03.11.bb<http://per_2.03.11.bb> => libdevmapper_2.03.16.bb<http://libdevmapper_2.03.16.bb>} |  0
>>  meta-oe/recipes-support/lvm2/lvm2.inc         |  2 +-
>>  .../lvm2/{lvm2_2.03.11.bb<http://lvm2_2.03.11.bb> => lvm2_2.03.16.bb<http://lvm2_2.03.16.bb>} |  1 +
>>  5 files changed, 21 insertions(+), 16 deletions(-)
>>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.11.bb<http://libdevmapper_2.03.11.bb> => libdevmapper_2.03.16.bb<http://libdevmapper_2.03.16.bb>} (100%)
>>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.11.bb<http://lvm2_2.03.11.bb> => lvm2_2.03.16.bb<http://lvm2_2.03.16.bb>} (99%)
>>
>> diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> index 7117d99a39..7979efbefb 100644
>> --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
>> @@ -15,25 +15,26 @@ Upstream-Status: Pending
>>
>>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com<mailto:hongxu.jia@windriver.com>>
>>
>> -
>>  Update context for lvm2 2.03.02.
>> -
>>  Signed-off-by: Kai Kang <kai.kang@windriver.com<mailto:kai.kang@windriver.com>>
>> +
>> +Update context for lvm2 2.03.16.
>> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>>
>>  ---
>>   Makefile.in  | 6 +++---
>>   configure.ac<http://configure.ac> | 1 -
>>   2 files changed, 3 insertions(+), 4 deletions(-)
>>
>>  diff --git a/Makefile.in b/Makefile.in
>> -index 6a1a990..80cba91 100644
>> +index 3b7e0ec..37f14eb 100644
>>  --- a/Makefile.in
>>  +++ b/Makefile.in
>>  @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
>>   abs_top_builddir = @abs_top_builddir@
>>   abs_top_srcdir = @abs_top_srcdir@
>>
>> --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
>> -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
>> +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
>> ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
>>
>>   ifeq ("@UDEV_RULES@", "yes")
>>     SUBDIRS += udev
>> @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644
>>       libdaemon lib tools daemons libdm \
>>       udev po
>>   tools.distclean: test.distclean
>> -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
>> +@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
>> +
>>   daemons.device-mapper: libdm.device-mapper
>>   tools.device-mapper: libdm.device-mapper
>> - scripts.device-mapper: include.device-mapper
>>  -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
>>  +device-mapper: tools.device-mapper daemons.device-mapper
>> + device_mapper: device-mapper
>>
>>   ifeq ("@INTL@", "yes")
>> - lib.pofile: include.pofile
>>  diff --git a/configure.ac<http://configure.ac> b/configure.ac<http://configure.ac>
>> -index 7fd0561..4154dc0 100644
>> +index 6def519..18a5c97 100644
>>  --- a/configure.ac<http://configure.ac>
>>  +++ b/configure.ac<http://configure.ac>
>> -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
>> +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
>>   libdm/Makefile
>>   libdm/dm-tools/Makefile
>>   libdm/libdevmapper.pc
>> @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644
>>   scripts/lvm2-pvscan.service
>>   scripts/blkdeactivate.sh
>>  --
>> -2.7.4
>> +2.25.1
>>
>> diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> index 9f9383ef48..5b9b2d5748 100644
>> --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
>> @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
>>
>>  Rebase to v2_03_05
>>  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com<mailto:hongxu.jia@windriver.com>>
>> +
>> +Rebase to v2_03_16
>> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com<mailto:wangmy@fujitsu.com>>
>>  ---
>>   scripts/lvm2_monitoring_systemd_red_hat.service.in<http://lvm2_monitoring_systemd_red_hat.service.in> | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>  diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in<http://lvm2_monitoring_systemd_red_hat.service.in> b/scripts/lvm2_monitoring_systemd_red_hat.service.in<http://lvm2_monitoring_systemd_red_hat.service.in>
>> -index 4bf744a..46766cb 100644
>> +index c0c96e3..2a99a37 100644
>>  --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in<http://lvm2_monitoring_systemd_red_hat.service.in>
>>  +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in<http://lvm2_monitoring_systemd_red_hat.service.in>
>>  @@ -2,7 +2,7 @@
>>   Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
>>   Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
>>   Requires=dm-event.socket
>> --After=dm-event.socket dm-event.service lvm2-activation.service
>> -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
>> +-After=dm-event.socket dm-event.service
>> ++After=dm-event.socket dm-event.service tmp.mount
>>   Before=local-fs-pre.target shutdown.target
>>   DefaultDependencies=no
>>   Conflicts=shutdown.target
>>  --
>> -2.7.4
>> +2.25.1
>>
>> diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb<http://libdevmapper_2.03.11.bb> b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb<http://libdevmapper_2.03.16.bb>
>> similarity index 100%
>> rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb<http://libdevmapper_2.03.11.bb>
>> rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb<http://libdevmapper_2.03.16.bb>
>> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
>> index 0c593b2042..34e57ec7a5 100644
>> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
>> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
>> @@ -18,7 +18,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main<http://sourceware.org/git/lvm2.git;branch=main> \
>>             file://reproducible-build.patch \
>>             "
>>
>> -SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
>> +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
>>  S = "${WORKDIR}/git"
>>
>>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
>> diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb<http://lvm2_2.03.11.bb> b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb<http://lvm2_2.03.16.bb>
>> similarity index 99%
>> rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb<http://lvm2_2.03.11.bb>
>> rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb<http://lvm2_2.03.16.bb>
>> index a729324c9b..6a6cdc7cef 100644
>> --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb<http://lvm2_2.03.11.bb>
>> +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb<http://lvm2_2.03.16.bb>
>> @@ -68,6 +68,7 @@ FILES:${PN}-scripts = " \
>>  # Specified explicitly for the udev rules, just in case that it does not get picked
>>  # up automatically:
>>  FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
>> +RDEPENDS:${PN} = "bash"
>>  RDEPENDS:${PN}-udevrules = "libdevmapper"
>>  RDEPENDS:${PN}:append:class-target = " libdevmapper"
>>  RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
>> --
>> 2.25.1
>>
>>
>>
>>
>
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#98736): https://lists.openembedded.org/g/openembedded-devel/message/98736
Mute This Topic: https://lists.openembedded.org/mt/93495342/3617156
Group Owner: openembedded-devel+owner@lists.openembedded.org<mailto:openembedded-devel%2Bowner@lists.openembedded.org>
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [Martin.Jansa@gmail.com<mailto:Martin.Jansa@gmail.com>]
-=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
index 7117d99a39..7979efbefb 100644
--- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
+++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
@@ -15,25 +15,26 @@  Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 
-
 Update context for lvm2 2.03.02.
-
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Update context for lvm2 2.03.16.
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
  Makefile.in  | 6 +++---
  configure.ac | 1 -
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 6a1a990..80cba91 100644
+index 3b7e0ec..37f14eb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -18,7 +18,7 @@ top_builddir = @top_builddir@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  
--SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
-+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
+-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools
  
  ifeq ("@UDEV_RULES@", "yes")
    SUBDIRS += udev
@@ -46,20 +47,20 @@  index 6a1a990..80cba91 100644
      libdaemon lib tools daemons libdm \
      udev po
  tools.distclean: test.distclean
-@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
+@@ -59,7 +59,7 @@ unit-test  run-unit-test: test
+ 
  daemons.device-mapper: libdm.device-mapper
  tools.device-mapper: libdm.device-mapper
- scripts.device-mapper: include.device-mapper
 -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
 +device-mapper: tools.device-mapper daemons.device-mapper
+ device_mapper: device-mapper
  
  ifeq ("@INTL@", "yes")
- lib.pofile: include.pofile
 diff --git a/configure.ac b/configure.ac
-index 7fd0561..4154dc0 100644
+index 6def519..18a5c97 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
+@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile
  libdm/Makefile
  libdm/dm-tools/Makefile
  libdm/libdevmapper.pc
@@ -68,5 +69,5 @@  index 7fd0561..4154dc0 100644
  scripts/lvm2-pvscan.service
  scripts/blkdeactivate.sh
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
index 9f9383ef48..5b9b2d5748 100644
--- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
+++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
@@ -11,23 +11,26 @@  Upstream-Status: Inappropriate [oe specific]
 
 Rebase to v2_03_05
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Rebase to v2_03_16
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
  scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
-index 4bf744a..46766cb 100644
+index c0c96e3..2a99a37 100644
 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
 +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
 @@ -2,7 +2,7 @@
  Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
  Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
  Requires=dm-event.socket
--After=dm-event.socket dm-event.service lvm2-activation.service
-+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
+-After=dm-event.socket dm-event.service
++After=dm-event.socket dm-event.service tmp.mount
  Before=local-fs-pre.target shutdown.target
  DefaultDependencies=no
  Conflicts=shutdown.target
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
similarity index 100%
rename from meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
rename to meta-oe/recipes-support/lvm2/libdevmapper_2.03.16.bb
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 0c593b2042..34e57ec7a5 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -18,7 +18,7 @@  SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
            file://reproducible-build.patch \
            "
 
-SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6"
+SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
similarity index 99%
rename from meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
rename to meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
index a729324c9b..6a6cdc7cef 100644
--- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.16.bb
@@ -68,6 +68,7 @@  FILES:${PN}-scripts = " \
 # Specified explicitly for the udev rules, just in case that it does not get picked
 # up automatically:
 FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
+RDEPENDS:${PN} = "bash"
 RDEPENDS:${PN}-udevrules = "libdevmapper"
 RDEPENDS:${PN}:append:class-target = " libdevmapper"
 RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"