| Message ID | 20220323221455.37922-1-sakib.sajal@windriver.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [meta-networking] drbd-utils: update 9.13.1 -> 9.20.2 | expand |
On Wed, Mar 23, 2022 at 3:15 PM Sakib Sajal <sakib.sajal@windriver.com> wrote: > > Dropped patch which is merged upstream: > 0001-v84-Make-setup_options-definitions-as-extern.patch > > Refreshed patch: > 0001-drbd-utils-support-usrmerge.patch > > The compiled binaries are not linked to LDFLAGS options provided > by the build system cause QA issue: > do_package_qa: QA Issue: File /usr/sbin/drbdmon in package > drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?) > > Add 'TARGET_CC_ARCH += "${LDFLAGS}"' to resolve the issue. > While this will work, the root issue still remains, which is to pass LDFLAGS to the linker step in this component's Makefile, while you are here, can you take a look at patching the linker rule in the makefile ? > Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > --- > .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- > ...-setup_options-definitions-as-extern.patch | 32 --------------- > ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 11 ++++-- > 3 files changed, 30 insertions(+), 52 deletions(-) > delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > rename meta-networking/recipes-support/drbd/{drbd-utils_9.13.1.bb => drbd-utils_9.20.2.bb} (89%) > > diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > index 5e128727d..d976680e3 100644 > --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > @@ -1,4 +1,4 @@ > -From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 > +From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Thu, 5 Sep 2019 18:57:39 +0800 > Subject: [PATCH] drbd-utils: support usrmerge > @@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge > Upstream-Status: Inappropriate[oe-specific] > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > --- > configure.ac | 2 +- > - scripts/Makefile.in | 4 ++-- > + scripts/Makefile.in | 10 +++++----- > user/v83/Makefile.in | 14 +++++++------- > user/v84/Makefile.in | 14 +++++++------- > - 4 files changed, 17 insertions(+), 17 deletions(-) > + 4 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/configure.ac b/configure.ac > -index 4df1b4d..c4ef1bc 100644 > +index ae575586..3d7deeae 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, > +@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, > AC_SUBST(tmpfilesdir) > > # set default early > @@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644 > test x"$with_udev" = xyes ; then > if test x"$PKG_CONFIG" != x; then > diff --git a/scripts/Makefile.in b/scripts/Makefile.in > -index fbb0beb..da701a1 100644 > +index fcd298e9..2521fb08 100644 > --- a/scripts/Makefile.in > +++ b/scripts/Makefile.in > -@@ -75,8 +75,8 @@ endif > - ifeq ($(subst both,systemd,$(initscripttype)),systemd) > +@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) > install -d $(DESTDIR)$(systemdunitdir) > install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ > -- install -d $(DESTDIR)/lib/drbd/ > -- install -m 755 drbd $(DESTDIR)/lib/drbd/ > -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd > -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd > + install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ > +- install -d $(DESTDIR)/lib/drbd/scripts > +- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts > +- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts > +- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts > +- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts > ++ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts > ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts > ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > install -d $(DESTDIR)$(tmpfilesdir)/ > install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf > endif > diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in > -index 27516de..b301376 100644 > +index 08cfe574..4c4971b6 100644 > --- a/user/v83/Makefile.in > +++ b/user/v83/Makefile.in > @@ -96,19 +96,19 @@ install: > @@ -73,10 +80,10 @@ index 27516de..b301376 100644 > .PHONY: install uninstall clean distclean > ../../configure: > diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in > -index 38977c6..05ef060 100644 > +index 0fcefc5f..81f7d5ec 100644 > --- a/user/v84/Makefile.in > +++ b/user/v84/Makefile.in > -@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) > +@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) > install -d $(DESTDIR)$(localstatedir)/lib/drbd > install -d $(DESTDIR)$(localstatedir)/run/drbd > install -d $(DESTDIR)$(localstatedir)/lock > @@ -104,5 +111,5 @@ index 38977c6..05ef060 100644 > spell: > for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ > -- > -2.7.4 > +2.33.0 > > diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > deleted file mode 100644 > index 6702f3bde..000000000 > --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Wed, 12 Aug 2020 12:59:38 -0700 > -Subject: [PATCH] v84: Make setup_options definitions as extern > - > -This is already defined in drbdadm_main.c, therefore make this > -declaration to be extern for other modules > - > -Fixes compatibility with gcc-10 which uses -fno-common by default > - > -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - user/v84/drbdadm.h | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h > -index ed63d78c..8469f1c4 100644 > ---- a/user/v84/drbdadm.h > -+++ b/user/v84/drbdadm.h > -@@ -251,7 +251,7 @@ struct setup_option { > - bool explicit; > - char *option; > - }; > --struct setup_option *setup_options; > -+extern struct setup_option *setup_options; > - > - extern void add_setup_option(bool explicit, char *option); > - > --- > -2.28.0 > - > diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > similarity index 89% > rename from meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb > rename to meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > index a246464b2..4a1776908 100644 > --- a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb > +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" > > SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ > git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ > - file://0001-v84-Make-setup_options-definitions-as-extern.patch \ > ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ > " > -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" > -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" > +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" > +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" > > SRCREV_FORMAT = "drbd-utils_drbd-headers" > > @@ -40,6 +39,8 @@ EXTRA_OECONF = " \ > --without-manual \ > " > > +TARGET_CC_ARCH += "${LDFLAGS}" > + > # If we have inherited reproducible_build, we want to use it. > export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" > > @@ -56,7 +57,9 @@ RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module > FILES:${PN} += "/run" > FILES:${PN} += "${nonarch_base_libdir}/drbd \ > ${nonarch_libdir}/drbd \ > - ${nonarch_libdir}/tmpfiles.d" > + ${nonarch_libdir}/tmpfiles.d \ > + ${nonarch_libdir}/drbdscripts/* \ > +" > FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" > > CLEANBROKEN = "1" > -- > 2.33.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#96167): https://lists.openembedded.org/g/openembedded-devel/message/96167 > Mute This Topic: https://lists.openembedded.org/mt/89987056/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
and it fails for distros with systemd in DISTRO_FEATURES ERROR: drbd-utils-9.20.2-r0 do_package: QA Issue: drbd-utils: Files/directories were installed but not shipped in any package: /lib/systemd/system/drbd-services@.target /lib/systemd/system/ocf.ra@.service /lib/systemd/system/drbd-wait-promotable@.service /lib/systemd/system/drbd@.target /lib/systemd/system/drbd-lvchange@.service /lib/systemd/system/drbd-reconfigure-suspend-or-error@.service /lib/systemd/system/drbd-promote@.service /lib/systemd/system/drbd-demote-or-escalate@.service Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. drbd-utils: 8 installed and not shipped files. [installed-vs-shipped] Secondly, please add CXXFLAGS:append:toolchain-clang = " -Wno-error" since clang finds more warnings which are treated as errors and build fails. On Wed, Mar 23, 2022 at 4:32 PM Khem Raj <raj.khem@gmail.com> wrote: > > On Wed, Mar 23, 2022 at 3:15 PM Sakib Sajal <sakib.sajal@windriver.com> wrote: > > > > Dropped patch which is merged upstream: > > 0001-v84-Make-setup_options-definitions-as-extern.patch > > > > Refreshed patch: > > 0001-drbd-utils-support-usrmerge.patch > > > > The compiled binaries are not linked to LDFLAGS options provided > > by the build system cause QA issue: > > do_package_qa: QA Issue: File /usr/sbin/drbdmon in package > > drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?) > > > > Add 'TARGET_CC_ARCH += "${LDFLAGS}"' to resolve the issue. > > > > While this will work, the root issue still remains, which is to pass > LDFLAGS to the linker step in this > component's Makefile, while you are here, can you take a look at > patching the linker rule in the makefile ? > > > Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > > --- > > .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- > > ...-setup_options-definitions-as-extern.patch | 32 --------------- > > ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 11 ++++-- > > 3 files changed, 30 insertions(+), 52 deletions(-) > > delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > > rename meta-networking/recipes-support/drbd/{drbd-utils_9.13.1.bb => drbd-utils_9.20.2.bb} (89%) > > > > diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > > index 5e128727d..d976680e3 100644 > > --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > > +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch > > @@ -1,4 +1,4 @@ > > -From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 > > +From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 > > From: Changqing Li <changqing.li@windriver.com> > > Date: Thu, 5 Sep 2019 18:57:39 +0800 > > Subject: [PATCH] drbd-utils: support usrmerge > > @@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge > > Upstream-Status: Inappropriate[oe-specific] > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > > --- > > configure.ac | 2 +- > > - scripts/Makefile.in | 4 ++-- > > + scripts/Makefile.in | 10 +++++----- > > user/v83/Makefile.in | 14 +++++++------- > > user/v84/Makefile.in | 14 +++++++------- > > - 4 files changed, 17 insertions(+), 17 deletions(-) > > + 4 files changed, 20 insertions(+), 20 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > -index 4df1b4d..c4ef1bc 100644 > > +index ae575586..3d7deeae 100644 > > --- a/configure.ac > > +++ b/configure.ac > > -@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, > > +@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, > > AC_SUBST(tmpfilesdir) > > > > # set default early > > @@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644 > > test x"$with_udev" = xyes ; then > > if test x"$PKG_CONFIG" != x; then > > diff --git a/scripts/Makefile.in b/scripts/Makefile.in > > -index fbb0beb..da701a1 100644 > > +index fcd298e9..2521fb08 100644 > > --- a/scripts/Makefile.in > > +++ b/scripts/Makefile.in > > -@@ -75,8 +75,8 @@ endif > > - ifeq ($(subst both,systemd,$(initscripttype)),systemd) > > +@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) > > install -d $(DESTDIR)$(systemdunitdir) > > install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ > > -- install -d $(DESTDIR)/lib/drbd/ > > -- install -m 755 drbd $(DESTDIR)/lib/drbd/ > > -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd > > -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd > > + install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ > > +- install -d $(DESTDIR)/lib/drbd/scripts > > +- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts > > +- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts > > +- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts > > +- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts > > ++ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts > > ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts > > ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > > ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > > ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts > > install -d $(DESTDIR)$(tmpfilesdir)/ > > install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf > > endif > > diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in > > -index 27516de..b301376 100644 > > +index 08cfe574..4c4971b6 100644 > > --- a/user/v83/Makefile.in > > +++ b/user/v83/Makefile.in > > @@ -96,19 +96,19 @@ install: > > @@ -73,10 +80,10 @@ index 27516de..b301376 100644 > > .PHONY: install uninstall clean distclean > > ../../configure: > > diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in > > -index 38977c6..05ef060 100644 > > +index 0fcefc5f..81f7d5ec 100644 > > --- a/user/v84/Makefile.in > > +++ b/user/v84/Makefile.in > > -@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) > > +@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) > > install -d $(DESTDIR)$(localstatedir)/lib/drbd > > install -d $(DESTDIR)$(localstatedir)/run/drbd > > install -d $(DESTDIR)$(localstatedir)/lock > > @@ -104,5 +111,5 @@ index 38977c6..05ef060 100644 > > spell: > > for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ > > -- > > -2.7.4 > > +2.33.0 > > > > diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > > deleted file mode 100644 > > index 6702f3bde..000000000 > > --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Wed, 12 Aug 2020 12:59:38 -0700 > > -Subject: [PATCH] v84: Make setup_options definitions as extern > > - > > -This is already defined in drbdadm_main.c, therefore make this > > -declaration to be extern for other modules > > - > > -Fixes compatibility with gcc-10 which uses -fno-common by default > > - > > -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - user/v84/drbdadm.h | 2 +- > > - 1 file changed, 1 insertion(+), 1 deletion(-) > > - > > -diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h > > -index ed63d78c..8469f1c4 100644 > > ---- a/user/v84/drbdadm.h > > -+++ b/user/v84/drbdadm.h > > -@@ -251,7 +251,7 @@ struct setup_option { > > - bool explicit; > > - char *option; > > - }; > > --struct setup_option *setup_options; > > -+extern struct setup_option *setup_options; > > - > > - extern void add_setup_option(bool explicit, char *option); > > - > > --- > > -2.28.0 > > - > > diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > > similarity index 89% > > rename from meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb > > rename to meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > > index a246464b2..4a1776908 100644 > > --- a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb > > +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb > > @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" > > > > SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ > > git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ > > - file://0001-v84-Make-setup_options-definitions-as-extern.patch \ > > ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ > > " > > -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" > > -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" > > +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" > > +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" > > > > SRCREV_FORMAT = "drbd-utils_drbd-headers" > > > > @@ -40,6 +39,8 @@ EXTRA_OECONF = " \ > > --without-manual \ > > " > > > > +TARGET_CC_ARCH += "${LDFLAGS}" > > + > > # If we have inherited reproducible_build, we want to use it. > > export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" > > > > @@ -56,7 +57,9 @@ RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module > > FILES:${PN} += "/run" > > FILES:${PN} += "${nonarch_base_libdir}/drbd \ > > ${nonarch_libdir}/drbd \ > > - ${nonarch_libdir}/tmpfiles.d" > > + ${nonarch_libdir}/tmpfiles.d \ > > + ${nonarch_libdir}/drbdscripts/* \ > > +" > > FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" > > > > CLEANBROKEN = "1" > > -- > > 2.33.0 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#96167): https://lists.openembedded.org/g/openembedded-devel/message/96167 > > Mute This Topic: https://lists.openembedded.org/mt/89987056/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 5e128727d..d976680e3 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,4 +1,4 @@ -From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 +From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 5 Sep 2019 18:57:39 +0800 Subject: [PATCH] drbd-utils: support usrmerge @@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge Upstream-Status: Inappropriate[oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- configure.ac | 2 +- - scripts/Makefile.in | 4 ++-- + scripts/Makefile.in | 10 +++++----- user/v83/Makefile.in | 14 +++++++------- user/v84/Makefile.in | 14 +++++++------- - 4 files changed, 17 insertions(+), 17 deletions(-) + 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac -index 4df1b4d..c4ef1bc 100644 +index ae575586..3d7deeae 100644 --- a/configure.ac +++ b/configure.ac -@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index fbb0beb..da701a1 100644 +index fcd298e9..2521fb08 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in -@@ -75,8 +75,8 @@ endif - ifeq ($(subst both,systemd,$(initscripttype)),systemd) +@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) install -d $(DESTDIR)$(systemdunitdir) install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ -- install -d $(DESTDIR)/lib/drbd/ -- install -m 755 drbd $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd + install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ +- install -d $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts ++ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts install -d $(DESTDIR)$(tmpfilesdir)/ install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf endif diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in -index 27516de..b301376 100644 +index 08cfe574..4c4971b6 100644 --- a/user/v83/Makefile.in +++ b/user/v83/Makefile.in @@ -96,19 +96,19 @@ install: @@ -73,10 +80,10 @@ index 27516de..b301376 100644 .PHONY: install uninstall clean distclean ../../configure: diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in -index 38977c6..05ef060 100644 +index 0fcefc5f..81f7d5ec 100644 --- a/user/v84/Makefile.in +++ b/user/v84/Makefile.in -@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) +@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) install -d $(DESTDIR)$(localstatedir)/lib/drbd install -d $(DESTDIR)$(localstatedir)/run/drbd install -d $(DESTDIR)$(localstatedir)/lock @@ -104,5 +111,5 @@ index 38977c6..05ef060 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ -- -2.7.4 +2.33.0 diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch deleted file mode 100644 index 6702f3bde..000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Aug 2020 12:59:38 -0700 -Subject: [PATCH] v84: Make setup_options definitions as extern - -This is already defined in drbdadm_main.c, therefore make this -declaration to be extern for other modules - -Fixes compatibility with gcc-10 which uses -fno-common by default - -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - user/v84/drbdadm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h -index ed63d78c..8469f1c4 100644 ---- a/user/v84/drbdadm.h -+++ b/user/v84/drbdadm.h -@@ -251,7 +251,7 @@ struct setup_option { - bool explicit; - char *option; - }; --struct setup_option *setup_options; -+extern struct setup_option *setup_options; - - extern void add_setup_option(bool explicit, char *option); - --- -2.28.0 - diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb similarity index 89% rename from meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb index a246464b2..4a1776908 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ - file://0001-v84-Make-setup_options-definitions-as-extern.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" SRCREV_FORMAT = "drbd-utils_drbd-headers" @@ -40,6 +39,8 @@ EXTRA_OECONF = " \ --without-manual \ " +TARGET_CC_ARCH += "${LDFLAGS}" + # If we have inherited reproducible_build, we want to use it. export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" @@ -56,7 +57,9 @@ RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module FILES:${PN} += "/run" FILES:${PN} += "${nonarch_base_libdir}/drbd \ ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d" + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/drbdscripts/* \ +" FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" CLEANBROKEN = "1"
Dropped patch which is merged upstream: 0001-v84-Make-setup_options-definitions-as-extern.patch Refreshed patch: 0001-drbd-utils-support-usrmerge.patch The compiled binaries are not linked to LDFLAGS options provided by the build system cause QA issue: do_package_qa: QA Issue: File /usr/sbin/drbdmon in package drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?) Add 'TARGET_CC_ARCH += "${LDFLAGS}"' to resolve the issue. Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- ...-setup_options-definitions-as-extern.patch | 32 --------------- ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 11 ++++-- 3 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch rename meta-networking/recipes-support/drbd/{drbd-utils_9.13.1.bb => drbd-utils_9.20.2.bb} (89%)