| Message ID | 20220406163557.12606-1-sakib.sajal@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-networking] drbd-utils: update 9.13.1 -> 9.20.2 | expand |
fails with clang https://errors.yoctoproject.org/Errors/Details/654033/ Perhaps we need to pass -Wno-error to silence this warning. On Wed, Apr 6, 2022 at 12:36 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 LDFLAGS when linking drmdmon binary. > > Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > --- > .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- > ...001-drbdmon-add-LDFLAGS-when-linking.patch | 26 +++++++++++++ > ...-setup_options-definitions-as-extern.patch | 32 --------------- > ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 13 +++++-- > 4 files changed, 58 insertions(+), 52 deletions(-) > create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch > 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} (85%) > > 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-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch > new file mode 100644 > index 000000000..bdc173fa9 > --- /dev/null > +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch > @@ -0,0 +1,26 @@ > +From a61b9ff2d2cb7387a5cd347b2201535ee45a46ee Mon Sep 17 00:00:00 2001 > +From: Sakib Sajal <sakib.sajal@windriver.com> > +Date: Thu, 31 Mar 2022 15:09:58 -0400 > +Subject: [PATCH] drbdmon: add LDFLAGS when linking > + > +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> > +--- > + user/drbdmon/Makefile.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in > +index e07eb772..17166098 100644 > +--- a/user/drbdmon/Makefile.in > ++++ b/user/drbdmon/Makefile.in > +@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h > + $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h > + > + drbdmon: $(ls-obj) > +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) > ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) > + > + # do not try to rebuild Makefile itself > + Makefile: ; > +-- > +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 85% > 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..d9cd94c04 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,11 @@ 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)} \ > + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ > " > -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" > -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" > +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" > +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" > > SRCREV_FORMAT = "drbd-utils_drbd-headers" > > @@ -40,6 +40,8 @@ EXTRA_OECONF = " \ > --without-manual \ > " > > +CXXFLAGS:append:toolchain-clang = " -Wno-error" > + > # If we have inherited reproducible_build, we want to use it. > export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" > > @@ -56,7 +58,10 @@ 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/* \ > + ${systemd_unitdir}/system/* \ > +" > 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 (#96439): https://lists.openembedded.org/g/openembedded-devel/message/96439 > Mute This Topic: https://lists.openembedded.org/mt/90293849/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 2022-04-07 15:30, Khem Raj wrote: > [Please note: This e-mail is from an EXTERNAL e-mail address] > > fails with clang > https://errors.yoctoproject.org/Errors/Details/654033/ > > Perhaps we need to pass -Wno-error to silence this warning. > > On Wed, Apr 6, 2022 at 12:36 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 LDFLAGS when linking drmdmon binary. >> >> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> >> --- >> .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- >> ...001-drbdmon-add-LDFLAGS-when-linking.patch | 26 +++++++++++++ >> ...-setup_options-definitions-as-extern.patch | 32 --------------- >> ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 13 +++++-- >> 4 files changed, 58 insertions(+), 52 deletions(-) >> create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch >> 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} (85%) >> >> 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-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch >> new file mode 100644 >> index 000000000..bdc173fa9 >> --- /dev/null >> +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch >> @@ -0,0 +1,26 @@ >> +From a61b9ff2d2cb7387a5cd347b2201535ee45a46ee Mon Sep 17 00:00:00 2001 >> +From: Sakib Sajal <sakib.sajal@windriver.com> >> +Date: Thu, 31 Mar 2022 15:09:58 -0400 >> +Subject: [PATCH] drbdmon: add LDFLAGS when linking >> + >> +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> >> +--- >> + user/drbdmon/Makefile.in | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in >> +index e07eb772..17166098 100644 >> +--- a/user/drbdmon/Makefile.in >> ++++ b/user/drbdmon/Makefile.in >> +@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h >> + $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h >> + >> + drbdmon: $(ls-obj) >> +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) >> ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) >> + >> + # do not try to rebuild Makefile itself >> + Makefile: ; >> +-- >> +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 85% >> 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..d9cd94c04 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,11 @@ 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)} \ >> + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ >> " >> -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" >> -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" >> +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" >> +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" >> >> SRCREV_FORMAT = "drbd-utils_drbd-headers" >> >> @@ -40,6 +40,8 @@ EXTRA_OECONF = " \ >> --without-manual \ >> " >> >> +CXXFLAGS:append:toolchain-clang = " -Wno-error" >> + Forgot to mention this was a V2. I do have the line that you suggested. Do i need to add something else? Sakib >> # If we have inherited reproducible_build, we want to use it. >> export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" >> >> @@ -56,7 +58,10 @@ 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/* \ >> + ${systemd_unitdir}/system/* \ >> +" >> 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 (#96439): https://lists.openembedded.org/g/openembedded-devel/message/96439 >> Mute This Topic: https://lists.openembedded.org/mt/90293849/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-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch new file mode 100644 index 000000000..bdc173fa9 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch @@ -0,0 +1,26 @@ +From a61b9ff2d2cb7387a5cd347b2201535ee45a46ee Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Thu, 31 Mar 2022 15:09:58 -0400 +Subject: [PATCH] drbdmon: add LDFLAGS when linking + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + user/drbdmon/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in +index e07eb772..17166098 100644 +--- a/user/drbdmon/Makefile.in ++++ b/user/drbdmon/Makefile.in +@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h + $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h + + drbdmon: $(ls-obj) +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) + + # do not try to rebuild Makefile itself + Makefile: ; +-- +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 85% 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..d9cd94c04 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,11 @@ 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)} \ + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ " -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" SRCREV_FORMAT = "drbd-utils_drbd-headers" @@ -40,6 +40,8 @@ EXTRA_OECONF = " \ --without-manual \ " +CXXFLAGS:append:toolchain-clang = " -Wno-error" + # If we have inherited reproducible_build, we want to use it. export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" @@ -56,7 +58,10 @@ 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/* \ + ${systemd_unitdir}/system/* \ +" 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 LDFLAGS when linking drmdmon binary. Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- .../0001-drbd-utils-support-usrmerge.patch | 39 +++++++++++-------- ...001-drbdmon-add-LDFLAGS-when-linking.patch | 26 +++++++++++++ ...-setup_options-definitions-as-extern.patch | 32 --------------- ...d-utils_9.13.1.bb => drbd-utils_9.20.2.bb} | 13 +++++-- 4 files changed, 58 insertions(+), 52 deletions(-) create mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch 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} (85%)