[PATCH rdma-core 0/4] Cleanp SUSE Tumbleweed build

[PATCH rdma-core 0/4] Cleanp SUSE Tumbleweed build

[Nicolas Morey-Chaisemartin]

This series is to fix the issue reported by Alaa here: https://www.spinics.net/lists/linux-rdma/msg56580.html

#1 adds details on the existing situation and an option in the spec file to allow rpmbuild to work
#2 adds support for env specific rpmbuild options
#3 Add the option from #1 to the tumbleweed env
#4 switches the default SUSE env to tumbleweed for validation

Nicolas Morey-Chaisemartin (4):
  suse: add a bcond to disable usage of curl-mini
  cbuild: allow envs to pass custom options to rpmbuild
  cbuild: disable curl-mini usage for tumbleweed env
  buidlib: validate tumbleweed instead of leap 42.3

 buildlib/cbuild             |  4 +++-
 buildlib/package-build-test |  2 +-
 suse/rdma-core.spec         | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

-- 
2.14.1.461.g503560879

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 1/4] suse: add a bcond to disable usage of curl-mini

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 suse/rdma-core.spec | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/suse/rdma-core.spec b/suse/rdma-core.spec
index 03c4a296..4f3638f3 100644
--- a/suse/rdma-core.spec
+++ b/suse/rdma-core.spec
@@ -77,9 +77,21 @@ Obsoletes:      rdma < %{version}
 Provides:       ofed = %{version}
 Obsoletes:      ofed < %{version}
 
+# Trickery to handle both SUSE OpenBuild System and Manual build
+# In OBS, rdma-core must use curl-mini instead of curl to avoid
+# a build dependency loop:
+# rdma-core -> cmake -> curl -> ... -> boost -> rdma-core
+# Thus we force a BuildRequires to curl-mini which as no impact
+# as it is not used during the build.
+# However curl-mini is not a published RPM. This would prevent any build
+# outside of OBS. Thus we add a bcond to allow manual build.
+# To force build without the use of curl-mini, --without=curlmini
+# should be passed to rpmbuild
 %if 0%{?suse_version} >= 1330
+%if %{with curlmini}
 BuildRequires:  curl-mini
 %endif
+%endif
 
 # Tumbleweed's cmake RPM macro adds -Wl,--no-undefined to the module flags
 # which is totally inappropriate and breaks building 'ENABLE_EXPORTS' style
-- 
2.14.1.461.g503560879


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 2/4] cbuild: allow envs to pass custom options to rpmbuild

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 buildlib/cbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildlib/cbuild b/buildlib/cbuild
index e6a64e8a..eb5349de 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -474,7 +474,8 @@ os.symlink({tarfn!r},os.path.join("SOURCES",tarfn));
            tarfn=tarfn,
            tspec_file=tspec_file);
 
-            bopts = ["-bb",tspec_file];
+            extra_opts = getattr(env,"rpmbuild_options", [])
+            bopts = ["-bb",tspec_file] + extra_opts;
 
             print >> F,'os.execlp("rpmbuild","rpmbuild",%s)'%(
                 ",".join(repr(I) for I in bopts));
-- 
2.14.1.461.g503560879


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 3/4] cbuild: disable curl-mini usage for tumbleweed env

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 buildlib/cbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildlib/cbuild b/buildlib/cbuild
index eb5349de..32bb70df 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -322,6 +322,7 @@ class tumbleweed(ZypperEnvironment):
     pkgs = leap.pkgs;
     name = "tumbleweed";
     specfile = "suse/rdma-core.spec";
+    rpmbuild_options = [ "--without=curlmini" ];
 
 # -------------------------------------------------------------------------
 
-- 
2.14.1.461.g503560879


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 4/4] buidlib: validate tumbleweed instead of leap 42.3

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 buildlib/package-build-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildlib/package-build-test b/buildlib/package-build-test
index d5fcdd9c..15f24caa 100755
--- a/buildlib/package-build-test
+++ b/buildlib/package-build-test
@@ -11,7 +11,7 @@ if [ -e "/.dockerenv" ] || (grep -q docker /proc/self/cgroup &>/dev/null); then
        exit 0
 fi
 
-for OS in centos7 opensuse-42.3
+for OS in centos7 tumbleweed
 do
 	echo
 	echo "Checking package build for ${OS} ...."
-- 
2.14.1.461.g503560879

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH rdma-core 0/4] Cleanp SUSE Tumbleweed build

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 974 bytes --]

On Wed, Nov 08, 2017 at 03:30:38PM +0100, Nicolas Morey-Chaisemartin wrote:
> This series is to fix the issue reported by Alaa here: https://www.spinics.net/lists/linux-rdma/msg56580.html
>
> #1 adds details on the existing situation and an option in the spec file to allow rpmbuild to work
> #2 adds support for env specific rpmbuild options
> #3 Add the option from #1 to the tumbleweed env
> #4 switches the default SUSE env to tumbleweed for validation
>
> Nicolas Morey-Chaisemartin (4):
>   suse: add a bcond to disable usage of curl-mini
>   cbuild: allow envs to pass custom options to rpmbuild
>   cbuild: disable curl-mini usage for tumbleweed env
>   buidlib: validate tumbleweed instead of leap 42.3
>
>  buildlib/cbuild             |  4 +++-
>  buildlib/package-build-test |  2 +-
>  suse/rdma-core.spec         | 12 ++++++++++++
>  3 files changed, 16 insertions(+), 2 deletions(-)
>

Please pay attention and try to avoid empty commit logs.

Thanks, applied.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH rdma-core 0/4] Cleanp SUSE Tumbleweed build

[Jason Gunthorpe]

On Wed, Nov 08, 2017 at 03:30:38PM +0100, Nicolas Morey-Chaisemartin wrote:
> This series is to fix the issue reported by Alaa here: https://www.spinics.net/lists/linux-rdma/msg56580.html
> 
> #1 adds details on the existing situation and an option in the spec file to allow rpmbuild to work
> #2 adds support for env specific rpmbuild options
> #3 Add the option from #1 to the tumbleweed env
> #4 switches the default SUSE env to tumbleweed for validation

Seems fine to me..

Reviewed-by: Jason Gunthorpe <jgg-uk2M96/98Pc@public.gmane.org>

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html