Date   

Re: [m-c-s][PATCH] glusterfs: set CVE_PRODUCT

Bruce Ashfield
 

merged

Bruce

On Sun, May 5, 2019 at 1:55 AM Chen Qi <Qi.Chen@...> wrote:
Signed-off-by: Chen Qi <Qi.Chen@...>
---
 recipes-extended/glusterfs/glusterfs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 3fc04ff..3ae6d7d 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -216,3 +216,4 @@ pkg_postinst_${PN}() {
     fi
 }

+CVE_PRODUCT = "glusterfs gluster_storage"
--
2.7.4

--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@...
https://lists.yoctoproject.org/listinfo/meta-virtualization


--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


Re: [PATCH] ceph: set CVE_PRODUCT

Bruce Ashfield
 

merged

Bruce

On Sun, May 5, 2019 at 1:54 AM Chen Qi <Qi.Chen@...> wrote:
Signed-off-by: Chen Qi <Qi.Chen@...>
---
 recipes-extended/ceph/ceph_14.1.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-extended/ceph/ceph_14.1.0.bb b/recipes-extended/ceph/ceph_14.1.0.bb
index 0005d3b..55a6d7d 100644
--- a/recipes-extended/ceph/ceph_14.1.0.bb
+++ b/recipes-extended/ceph/ceph_14.1.0.bb
@@ -102,3 +102,5 @@ PACKAGES += " \
 INSANE_SKIP_${PN}-python += "ldflags"
 INSANE_SKIP_${PN} += "dev-so"
 CCACHE_DISABLE = "1"
+
+CVE_PRODUCT = "ceph ceph_storage ceph_storage_mon ceph_storage_osd"
--
2.7.4

--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@...
https://lists.yoctoproject.org/listinfo/meta-virtualization


--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


Re: [PATCH] cgroup-lite: remove incorrect SYSTEMD_AUTO_ENABLE setting

 

On 06/05/2019 03:00, Hongxu Jia wrote:
Since commit [154abbc329 systemd: create preset files instead of
installing in image] applied in oe-core, it checks SYSTEMD_AUTO_ENABLE
...
|ERROR: cgroup-lite-1.15-r0 do_package: SYSTEMD_AUTO_ENABLE_cgroup-lite
'mask' is not 'enable' or 'disable'
...
Signed-off-by: Hongxu Jia <hongxu.jia@...>
---
recipes-containers/cgroup-lite/cgroup-lite_1.15.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
index 7b48c3a..cb16a65 100644
--- a/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
+++ b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
@@ -18,7 +18,6 @@ INITSCRIPT_PARAMS = "start 8 2 3 4 5 . stop 20 0 1 6 ."
# where systemd is in use.
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "cgroups-init.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "mask"
Looking at the commit message from when this was added (http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=5b13da8e575ac746b46426f2471bf004b2201e41), the intention is that the service is indeed masked.

Rather than breaking this behaviour I'd like to see if we can support this in oe-core.

Cc-ing Jonas and Alex on this one - is it simple to support `SYSTEMD_AUTO_ENABLE = "mask"` after the recent systemd changes in oe-core?

Thanks,

--
Paul Barker
Managing Director & Principal Engineer
Beta Five Ltd


[m-c-s][PATCH v2 3/3] layer.conf: depends on meta-filesystems

kai
 

From: Kai Kang <kai.kang@...>

Package glusterfs requires fuse which is from layer meta-filesystems.
So update layer.conf to depend on the layer.

Signed-off-by: Kai Kang <kai.kang@...>
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 8df9829..203f9db 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "cloud-services-layer"
BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_cloud-services-layer = "5"
LAYERSERIES_COMPAT_cloud-services-layer = "thud warrior"
-LAYERDEPENDS_cloud-services-layer = "core"
+LAYERDEPENDS_cloud-services-layer = "core filesystems-layer"
--
2.20.0


[m-c-s][PATCH v2 2/3] librdmacm: set imcompatible with arm 32 and mips arches

kai
 

From: Kai Kang <kai.kang@...>

librdmacm depends on package libibverbs which has been set imcompatible
with arm 32 and mips arches by commit 215b975.

When build librdmacm it shows errors:

| NOTE: Resolving any missing task queue dependencies
| ERROR: Nothing PROVIDES 'virtual/libibverbs' (but
| .../meta-cloud-services/recipes-extended/librdmacm/librdmacm_1.1.0.bb
| DEPENDS on or otherwise requires it)
| libibverbs PROVIDES virtual/libibverbs but was skipped: incompatible
| with host arm-wrs-linux-gnueabi (not in COMPATIBLE_HOST)
| ERROR: Required build target 'librdmacm' has no buildable providers.
| Missing or unbuildable dependency chain was: ['librdmacm', 'virtual/libibverbs']

So set librdmacm imcompatible with arm 32 and mips arches too.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/librdmacm/librdmacm_1.1.0.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index 30a0c94..edf92f0 100644
--- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb
+++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
@@ -39,3 +39,6 @@ do_install_append() {
rm -f ${D}${libdir}/librdmacm.la
rm -f ${D}${libdir}/rsocket/librspreload.la
}
+
+COMPATIBLE_HOST_mipsarch = "none"
+COMPATIBLE_HOST_arm = "none"
--
2.20.0


[m-c-s][PATCH v2 1/3] glusterfs: remove PACKAGECONFIG libibverbs for arm 32 and mips

kai
 

From: Kai Kang <kai.kang@...>

Package libibverbs has been set imcompatible with arm 32 and mips arches
by commit 215b975. So disable libibverbs support of glusterfs for arm 32
and mips arches too.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/glusterfs/glusterfs.inc | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index ab5f4e0..692d74a 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -50,6 +50,9 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
"

PACKAGECONFIG ??= "georeplication libibverbs"
+PACKAGECONFIG_remove_mipsarch = "libibverbs"
+PACKAGECONFIG_remove_arm = "libibverbs"
+
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
--
2.20.0


[m-c-s][PATCH v2 0/3] Fix dependency issues for librdmacm and glusterfs

kai
 

From: Kai Kang <kai.kang@...>

Re-send v2:
* Maybe wrong recipient in previous v2 thread, Bruce didn't recieve the 3rd patch. So re-send.

Kai Kang (3):
glusterfs: remove PACKAGECONFIG libibverbs for arm 32 and mips
librdmacm: set imcompatible with arm 32 and mips arches
layer.conf: depends on meta-filesystems

conf/layer.conf | 2 +-
recipes-extended/glusterfs/glusterfs.inc | 3 +++
recipes-extended/librdmacm/librdmacm_1.1.0.bb | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)

--
2.20.0


[PATCH] cgroup-lite: remove incorrect SYSTEMD_AUTO_ENABLE setting

hongxu
 

Since commit [154abbc329 systemd: create preset files instead of
installing in image] applied in oe-core, it checks SYSTEMD_AUTO_ENABLE
...
|ERROR: cgroup-lite-1.15-r0 do_package: SYSTEMD_AUTO_ENABLE_cgroup-lite
'mask' is not 'enable' or 'disable'
...

Signed-off-by: Hongxu Jia <hongxu.jia@...>
---
recipes-containers/cgroup-lite/cgroup-lite_1.15.bb | 1 -
1 file changed, 1 deletion(-)

diff --git a/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
index 7b48c3a..cb16a65 100644
--- a/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
+++ b/recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
@@ -18,7 +18,6 @@ INITSCRIPT_PARAMS = "start 8 2 3 4 5 . stop 20 0 1 6 ."
# where systemd is in use.
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "cgroups-init.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "mask"


do_install() {
--
2.21.0


[m-c-s][PATCH] glusterfs: set CVE_PRODUCT

Chen Qi
 

Signed-off-by: Chen Qi <Qi.Chen@...>
---
recipes-extended/glusterfs/glusterfs.inc | 1 +
1 file changed, 1 insertion(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 3fc04ff..3ae6d7d 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -216,3 +216,4 @@ pkg_postinst_${PN}() {
fi
}

+CVE_PRODUCT = "glusterfs gluster_storage"
--
2.7.4


[PATCH] ceph: set CVE_PRODUCT

Chen Qi
 

Signed-off-by: Chen Qi <Qi.Chen@...>
---
recipes-extended/ceph/ceph_14.1.0.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/recipes-extended/ceph/ceph_14.1.0.bb b/recipes-extended/ceph/ceph_14.1.0.bb
index 0005d3b..55a6d7d 100644
--- a/recipes-extended/ceph/ceph_14.1.0.bb
+++ b/recipes-extended/ceph/ceph_14.1.0.bb
@@ -102,3 +102,5 @@ PACKAGES += " \
INSANE_SKIP_${PN}-python += "ldflags"
INSANE_SKIP_${PN} += "dev-so"
CCACHE_DISABLE = "1"
+
+CVE_PRODUCT = "ceph ceph_storage ceph_storage_mon ceph_storage_osd"
--
2.7.4


Re: Problems building under go.

Mark Asselstine
 

Ken,

Adding the list back as someone else might see something I am missing...

Ideally and example which builds off of core-image-minimal or similar
would be useful. I did the following on master and was able to get and
run hello.go

1) Configure a new build
. ./oe-init-build-env ~/builds/go-now

2) Update the default local.conf
cat >> EOF << conf/local.conf
IMAGE_INSTALL_append += " go git git-perltools go-runtime go-runtime-staticdev"
EOF

3) Build
bitbake core-image-minimal

4) Run
qemu-system-x86_64 -enable-kvm -m 2G -kernel
tmp/deploy/images/qemux86/bzImage -drive
file=tmp/deploy/images/qemux86/core-image-minimal-qemux86.ext4,media=disk,if=vir
tio,format=raw -nographic -serial mon:stdio -append "console=ttyS0
root=/dev/vda rw"

5) On the running target run the following commands:
udhcpc eth0
go get -insecure github.com/golang/example/hello
cd go/src/github.com/golang/example/hello/
go run hello.go

And the result...
root@qemux86:~/go/src/github.com/golang/example/hello# go run hello.go
Hello, Go examples!

So the runtime of GO seems fine. As for your initial email you mention
that you have build issues within the bitbake environment, again there
are many examples of working GO recipes, is it possible for you to
provide me with one which is failing?


Mark

On Fri, Apr 26, 2019 at 11:42 AM Ken Bassford
<kbassford@...> wrote:

Hi Mark,

Sorry for not getting back to you sooner. I've been concentrating on another problem as of late, why my OpenKMIP server cannot talk with the Go based client I'm using.

I'm fundamentally suspicious of the Go installation itself as it cannot pull stuff in using "go get". The GOROOT and GOPATH are set correctly, so I presume something my build is not set correctly. The bitbake file for my layer appears as follows ...
....


It should be noted that this image is based upon the "core-image-lsb-sdk" image.

I figure I have to fix that before moving on to problems building the other modules (which may become a moot point as the kmip-go and it's dependencies do not seem to have as much functionality as go-kmip, and contains far less dependencies).

Any pointers you can provide would be welcome.

Sincerely,
Ken Bassford
Apertus Solutions

---- On Wed, 24 Apr 2019 15:25:19 -0400 Mark Asselstine <asselsm@...> wrote ----

> On Tue, Apr 23, 2019 at 10:31 AM Ken Bassford
> <kbassford@...> wrote:
> >
> > Hello Folks,
> >
> > I am currently attempting to bring in 16 Go modules ("kmip-go" plus all dependencies) into my OpenXT project and a select few are having problems compiling. The modules that fail, fail during do_compile_ptest_base with a "vet config not found". I have attempted to use the PTEST_ENABLED_${PN} = "0" or PTEST_ENABLED = "0" flags to no avail as these settings are being ignored. The modules in question are "github.com/mattn/go-isatty" and "github.com/uber-go/multierr".
> >
> > I am hoping that one or more of you in this audience that are familiar with compiling golang modules in a OpenXT bitbake environment might be able to point me in the right direction.
>
> I don't know much about these modules but I do have my fingers in the
> go classes so I might be able to help. Can you type out the
> instructions I might be able to follow to reproduce this, ie. which
> layers and recipes go boom?
>
> MarkA
>
>
> >
> > Thanks in advance.
> >
> > Sincerely,
> > Ken Bassford
> > Apertus Solutions
> >
> > --
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@...
> > https://lists.yoctoproject.org/listinfo/meta-virtualization
>


Re: [PATCH] netns: Upgrade to v0.5.3

Bruce Ashfield
 

Thanks Paul.

This is now merged.

Bruce

On Mon, Apr 29, 2019 at 4:50 PM <paul@...> wrote:
From: Paul Barker <paul@...>

Drop obsolete patches and forward-port the remaining required patch. We
also need to fix up permissions after the build so that we can clean the
build directory without errors if needed.

Signed-off-by: Paul Barker <paul@...>
---
 .../0001-Allow-selection-of-go-compiler.patch | 107 ------------------
 .../0001-Use-correct-go-cross-compiler.patch  |  77 -------------
 ...rebuilding-all-packages-to-avoid-cgo.patch |  26 +++--
 recipes-networking/netns/netns_git.bb         |  11 +-
 4 files changed, 23 insertions(+), 198 deletions(-)
 delete mode 100644 recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
 delete mode 100644 recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch

diff --git a/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch b/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
deleted file mode 100644
index 84fb9a4..0000000
--- a/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 6576f228339b7931e05a8e861f085f483817806b Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbarker@...>
-Date: Tue, 8 May 2018 11:01:14 +0000
-Subject: [PATCH] Allow selection of go compiler
-
-By running `make GO=/path/to/go` we can now select the appropriate go compiler
-to use. This also makes it possible to cross compile netns more easily.
-
-Signed-off-by: Paul Barker <pbarker@...>
-Upstream-status: Pending
----
- Makefile | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3a22f3e..476cb9b 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -23,6 +23,9 @@ CTIMEVAR=-X $(PKG)/version.GITCOMMIT=$(GITCOMMIT) -X $(PKG)/version.VERSION=$(VE
- GO_LDFLAGS=-ldflags "-w $(CTIMEVAR)"
- GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR) -extldflags -static"
-
-+# Set our default go compiler
-+GO := go
-+
- # List the GOOS and GOARCH to build
- GOOSARCHES = linux/arm linux/arm64 linux/amd64 linux/386
-
-@@ -33,12 +36,12 @@ build: $(NAME) ## Builds a dynamic executable or package
-
- $(NAME): *.go VERSION.txt
-       @echo "+ $@"
--      go build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-+      $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-
- .PHONY: static
- static: ## Builds a static executable
-       @echo "+ $@"
--      CGO_ENABLED=0 go build \
-+      CGO_ENABLED=0 $(GO) build \
-                               -tags "$(BUILDTAGS) static_build" \
-                               ${GO_LDFLAGS_STATIC} -o $(NAME) .
-
-@@ -55,23 +58,23 @@ lint: ## Verifies `golint` passes
- .PHONY: test
- test: ## Runs the go tests
-       @echo "+ $@"
--      @go test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
-+      @$(GO) test -v -tags "$(BUILDTAGS) cgo" $(shell $(GO) list ./... | grep -v vendor)
-
- .PHONY: vet
- vet: ## Verifies `go vet` passes
-       @echo "+ $@"
--      @go vet $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+      @$(GO) vet $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: staticcheck
- staticcheck: ## Verifies `staticcheck` passes
-       @echo "+ $@"
--      @staticcheck $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+      @staticcheck $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: cover
- cover: ## Runs go test with coverage
-       @echo "" > coverage.txt
--      @for d in $(shell go list ./... | grep -v vendor); do \
--              go test -race -coverprofile=profile.out -covermode=atomic "$$d"; \
-+      @for d in $(shell $(GO) list ./... | grep -v vendor); do \
-+              $(GO) test -race -coverprofile=profile.out -covermode=atomic "$$d"; \
-               if [ -f profile.out ]; then \
-                       cat profile.out >> coverage.txt; \
-                       rm profile.out; \
-@@ -81,11 +84,11 @@ cover: ## Runs go test with coverage
- .PHONY: install
- install: ## Installs the executable or package
-       @echo "+ $@"
--      go install -a -tags "$(BUILDTAGS)" ${GO_LDFLAGS} .
-+      $(GO) install -a -tags "$(BUILDTAGS)" ${GO_LDFLAGS} .
-
- define buildpretty
- mkdir -p $(BUILDDIR)/$(1)/$(2);
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
-        -o $(BUILDDIR)/$(1)/$(2)/$(NAME) \
-        -a -tags "$(BUILDTAGS) static_build netgo" \
-        -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -99,7 +102,7 @@ cross: *.go VERSION.txt ## Builds the cross-compiled binaries, creating a clean
-       $(foreach GOOSARCH,$(GOOSARCHES), $(call buildpretty,$(subst /,,$(dir $(GOOSARCH))),$(notdir $(GOOSARCH))))
-
- define buildrelease
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
-        -o $(BUILDDIR)/$(NAME)-$(1)-$(2) \
-        -a -tags "$(BUILDTAGS) static_build netgo" \
-        -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -115,7 +118,7 @@ release: *.go VERSION.txt ## Builds the cross-compiled binaries, naming them in
- .PHONY: bump-version
- BUMP := patch
- bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ]
--      @go get -u github.com/jessfraz/junk/sembump # update sembump tool
-+      @$(GO) get -u github.com/jessfraz/junk/sembump # update sembump tool
-       $(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
-       @echo "Bumping VERSION.txt from $(VERSION) to $(NEW_VERSION)"
-       echo $(NEW_VERSION) > VERSION.txt
---
-2.7.4
-
diff --git a/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch b/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch
deleted file mode 100644
index ed66e11..0000000
--- a/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d5c319bb61155d94bef2571a095d82983d786b94 Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbarker@...>
-Date: Fri, 13 Oct 2017 17:58:11 +0000
-Subject: [PATCH] Use correct go cross-compiler
-
-Signed-off-by: Paul Barker <pbarker@...>
-Upstream-status: Pending
----
- Makefile | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cb9a46d..633f884 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -33,12 +33,12 @@ build: $(NAME) ## Builds a dynamic executable or package
-
- $(NAME): *.go VERSION
-       @echo "+ $@"
--      go build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-+      $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-
- .PHONY: static
- static: ## Builds a static executable
-       @echo "+ $@"
--      CGO_ENABLED=0 go build \
-+      CGO_ENABLED=0 $(GO) build \
-                               -tags "$(BUILDTAGS) static_build" \
-                               ${GO_LDFLAGS_STATIC} -o $(NAME) .
-
-@@ -55,21 +55,21 @@ lint: ## Verifies `golint` passes
- .PHONY: test
- test: ## Runs the go tests
-       @echo "+ $@"
--      @go test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
-+      @$(GO) test -v -tags "$(BUILDTAGS) cgo" $(shell $(GO) list ./... | grep -v vendor)
-
- .PHONY: vet
- vet: ## Verifies `go vet` passes
-       @echo "+ $@"
--      @go vet $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+      @$(GO) vet $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: install
- install: ## Installs the executable or package
-       @echo "+ $@"
--      @go install .
-+      @$(GO) install .
-
- define buildpretty
- mkdir -p $(BUILDDIR)/$(1)/$(2);
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
-        -o $(BUILDDIR)/$(1)/$(2)/$(NAME) \
-        -a -tags "$(BUILDTAGS) static_build netgo" \
-        -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -83,7 +83,7 @@ cross: *.go VERSION ## Builds the cross-compiled binaries, creating a clean dire
-       $(foreach GOOSARCH,$(GOOSARCHES), $(call buildpretty,$(subst /,,$(dir $(GOOSARCH))),$(notdir $(GOOSARCH))))
-
- define buildrelease
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
-        -o $(BUILDDIR)/$(NAME)-$(1)-$(2) \
-        -a -tags "$(BUILDTAGS) static_build netgo" \
-        -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -99,7 +99,7 @@ release: *.go VERSION ## Builds the cross-compiled binaries, naming them in such
- .PHONY: bump-version
- BUMP := patch
- bump-version: ## Bump the version in the version file. Set KIND to [ patch | major | minor ]
--      @go get -u github.com/jessfraz/junk/sembump # update sembump tool
-+      @$(GO) get -u github.com/jessfraz/junk/sembump # update sembump tool
-       $(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
-       @echo "Bumping VERSION from $(VERSION) to $(NEW_VERSION)"
-       echo $(NEW_VERSION) > VERSION
---
-2.7.4
-
diff --git a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
index 3b0c0a4..3ed4c21 100644
--- a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
+++ b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
@@ -1,4 +1,4 @@
-From 09524d187ef108784c854a0c247ac6476a10bb67 Mon Sep 17 00:00:00 2001
+From fa402247e9b24470648a366cfda1c9134660146a Mon Sep 17 00:00:00 2001
 From: Mark Asselstine <mark.asselstine@...>
 Date: Mon, 18 Mar 2019 14:04:16 -0400
 Subject: [PATCH] Makefile: force rebuilding all packages to avoid cgo
@@ -32,23 +32,27 @@ used.
 Upstream-Status: Inappropriate [only an issue with our builds]

 Signed-off-by: Mark Asselstine <mark.asselstine@...>
+
+Forward-ported to v0.5.3.
+
+Signed-off-by: Paul Barker <paul@...>
 ---
- Makefile | 2 +-
+ basic.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/Makefile b/Makefile
-index 476cb9b..ecd0df4 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -41,7 +41,7 @@ $(NAME): *.go VERSION.txt
+diff --git a/basic.mk b/basic.mk
+index 187dff3..fb080b7 100644
+--- a/src/import/basic.mk
++++ b/src/import/basic.mk
+@@ -50,7 +50,7 @@ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
  .PHONY: static
- static: ## Builds a static executable
+ static: prebuild ## Builds a static executable.
        @echo "+ $@"
--      CGO_ENABLED=0 $(GO) build \
-+      CGO_ENABLED=0 $(GO) build -a -pkgdir dontusecurrentpkgs \
+-      CGO_ENABLED=$(CGO_ENABLED) $(GO) build \
++      CGO_ENABLED=$(CGO_ENABLED) $(GO) build -a -pkgdir dontusecurrentpkgs \
                                -tags "$(BUILDTAGS) static_build" \
                                ${GO_LDFLAGS_STATIC} -o $(NAME) .

 --
-2.7.4
+2.17.1

diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index f5cdace..da6aac2 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -4,11 +4,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=48ef0979a2bcc3fae14ff30b8a7f5dbf"

 SRC_URI = "git://github.com/genuinetools/netns;branch=master \
-           file://0001-Allow-selection-of-go-compiler.patch \
            file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \
           "
-SRCREV = "0da6ab0997707024debe68c91e940c9168041bf8"
-PV = "0.4.0"
+SRCREV = "9b103a19b917cc3762a33b7d78244b1d5e45ccfd"
+PV = "0.5.3"
 GO_IMPORT = "import"

 S = "${WORKDIR}/git"
@@ -46,6 +45,12 @@ do_compile() {
        # Static builds work but are not recommended. See Makefile*cgo patch.
        #oe_runmake static
        oe_runmake build
+
+       # Golang forces permissions to 0500 on directories and 0400 on files in
+       # the module cache which prevents us from easily cleaning up the build
+       # directory. Let's just fix the permissions here so we don't have to
+       # hack the clean tasks.
+       chmod -R u+w vendor/pkg/mod
 }

 do_install() {
--
2.17.1

--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@...
https://lists.yoctoproject.org/listinfo/meta-virtualization


--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


Re: [m-c-s][PATCH v2 1/3] glusterfs: remove PACKAGECONFIG libibverbs for arm 32 and mips

Bruce Ashfield
 

Is there a patch 2/3 in this v2 series ? I don't see it in my inbox(s).

Bruce

On Sat, Apr 27, 2019 at 9:33 PM <kai.kang@...> wrote:
From: Kai Kang <kai.kang@...>

Package libibverbs has been set imcompatible with arm 32 and mips arches
by commit 215b975. So disable libibverbs support of glusterfs for arm 32
and mips arches too.

Signed-off-by: Kai Kang <kai.kang@...>
---
 recipes-extended/glusterfs/glusterfs.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index ab5f4e0..692d74a 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -50,6 +50,9 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
                "

 PACKAGECONFIG ??= "georeplication libibverbs"
+PACKAGECONFIG_remove_mipsarch = "libibverbs"
+PACKAGECONFIG_remove_arm = "libibverbs"
+
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
 PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
 PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
--
2.20.0

--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@...
https://lists.yoctoproject.org/listinfo/meta-virtualization


--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


[PATCH] netns: Upgrade to v0.5.3

 

From: Paul Barker <paul@...>

Drop obsolete patches and forward-port the remaining required patch. We
also need to fix up permissions after the build so that we can clean the
build directory without errors if needed.

Signed-off-by: Paul Barker <paul@...>
---
.../0001-Allow-selection-of-go-compiler.patch | 107 ------------------
.../0001-Use-correct-go-cross-compiler.patch | 77 -------------
...rebuilding-all-packages-to-avoid-cgo.patch | 26 +++--
recipes-networking/netns/netns_git.bb | 11 +-
4 files changed, 23 insertions(+), 198 deletions(-)
delete mode 100644 recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
delete mode 100644 recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch

diff --git a/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch b/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
deleted file mode 100644
index 84fb9a4..0000000
--- a/recipes-networking/netns/files/0001-Allow-selection-of-go-compiler.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 6576f228339b7931e05a8e861f085f483817806b Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbarker@...>
-Date: Tue, 8 May 2018 11:01:14 +0000
-Subject: [PATCH] Allow selection of go compiler
-
-By running `make GO=/path/to/go` we can now select the appropriate go compiler
-to use. This also makes it possible to cross compile netns more easily.
-
-Signed-off-by: Paul Barker <pbarker@...>
-Upstream-status: Pending
----
- Makefile | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3a22f3e..476cb9b 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -23,6 +23,9 @@ CTIMEVAR=-X $(PKG)/version.GITCOMMIT=$(GITCOMMIT) -X $(PKG)/version.VERSION=$(VE
- GO_LDFLAGS=-ldflags "-w $(CTIMEVAR)"
- GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR) -extldflags -static"
-
-+# Set our default go compiler
-+GO := go
-+
- # List the GOOS and GOARCH to build
- GOOSARCHES = linux/arm linux/arm64 linux/amd64 linux/386
-
-@@ -33,12 +36,12 @@ build: $(NAME) ## Builds a dynamic executable or package
-
- $(NAME): *.go VERSION.txt
- @echo "+ $@"
-- go build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-+ $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-
- .PHONY: static
- static: ## Builds a static executable
- @echo "+ $@"
-- CGO_ENABLED=0 go build \
-+ CGO_ENABLED=0 $(GO) build \
- -tags "$(BUILDTAGS) static_build" \
- ${GO_LDFLAGS_STATIC} -o $(NAME) .
-
-@@ -55,23 +58,23 @@ lint: ## Verifies `golint` passes
- .PHONY: test
- test: ## Runs the go tests
- @echo "+ $@"
-- @go test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
-+ @$(GO) test -v -tags "$(BUILDTAGS) cgo" $(shell $(GO) list ./... | grep -v vendor)
-
- .PHONY: vet
- vet: ## Verifies `go vet` passes
- @echo "+ $@"
-- @go vet $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+ @$(GO) vet $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: staticcheck
- staticcheck: ## Verifies `staticcheck` passes
- @echo "+ $@"
-- @staticcheck $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+ @staticcheck $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: cover
- cover: ## Runs go test with coverage
- @echo "" > coverage.txt
-- @for d in $(shell go list ./... | grep -v vendor); do \
-- go test -race -coverprofile=profile.out -covermode=atomic "$$d"; \
-+ @for d in $(shell $(GO) list ./... | grep -v vendor); do \
-+ $(GO) test -race -coverprofile=profile.out -covermode=atomic "$$d"; \
- if [ -f profile.out ]; then \
- cat profile.out >> coverage.txt; \
- rm profile.out; \
-@@ -81,11 +84,11 @@ cover: ## Runs go test with coverage
- .PHONY: install
- install: ## Installs the executable or package
- @echo "+ $@"
-- go install -a -tags "$(BUILDTAGS)" ${GO_LDFLAGS} .
-+ $(GO) install -a -tags "$(BUILDTAGS)" ${GO_LDFLAGS} .
-
- define buildpretty
- mkdir -p $(BUILDDIR)/$(1)/$(2);
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
- -o $(BUILDDIR)/$(1)/$(2)/$(NAME) \
- -a -tags "$(BUILDTAGS) static_build netgo" \
- -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -99,7 +102,7 @@ cross: *.go VERSION.txt ## Builds the cross-compiled binaries, creating a clean
- $(foreach GOOSARCH,$(GOOSARCHES), $(call buildpretty,$(subst /,,$(dir $(GOOSARCH))),$(notdir $(GOOSARCH))))
-
- define buildrelease
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
- -o $(BUILDDIR)/$(NAME)-$(1)-$(2) \
- -a -tags "$(BUILDTAGS) static_build netgo" \
- -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -115,7 +118,7 @@ release: *.go VERSION.txt ## Builds the cross-compiled binaries, naming them in
- .PHONY: bump-version
- BUMP := patch
- bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ]
-- @go get -u github.com/jessfraz/junk/sembump # update sembump tool
-+ @$(GO) get -u github.com/jessfraz/junk/sembump # update sembump tool
- $(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
- @echo "Bumping VERSION.txt from $(VERSION) to $(NEW_VERSION)"
- echo $(NEW_VERSION) > VERSION.txt
---
-2.7.4
-
diff --git a/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch b/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch
deleted file mode 100644
index ed66e11..0000000
--- a/recipes-networking/netns/files/0001-Use-correct-go-cross-compiler.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d5c319bb61155d94bef2571a095d82983d786b94 Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbarker@...>
-Date: Fri, 13 Oct 2017 17:58:11 +0000
-Subject: [PATCH] Use correct go cross-compiler
-
-Signed-off-by: Paul Barker <pbarker@...>
-Upstream-status: Pending
----
- Makefile | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cb9a46d..633f884 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -33,12 +33,12 @@ build: $(NAME) ## Builds a dynamic executable or package
-
- $(NAME): *.go VERSION
- @echo "+ $@"
-- go build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-+ $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
-
- .PHONY: static
- static: ## Builds a static executable
- @echo "+ $@"
-- CGO_ENABLED=0 go build \
-+ CGO_ENABLED=0 $(GO) build \
- -tags "$(BUILDTAGS) static_build" \
- ${GO_LDFLAGS_STATIC} -o $(NAME) .
-
-@@ -55,21 +55,21 @@ lint: ## Verifies `golint` passes
- .PHONY: test
- test: ## Runs the go tests
- @echo "+ $@"
-- @go test -v -tags "$(BUILDTAGS) cgo" $(shell go list ./... | grep -v vendor)
-+ @$(GO) test -v -tags "$(BUILDTAGS) cgo" $(shell $(GO) list ./... | grep -v vendor)
-
- .PHONY: vet
- vet: ## Verifies `go vet` passes
- @echo "+ $@"
-- @go vet $(shell go list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-+ @$(GO) vet $(shell $(GO) list ./... | grep -v vendor) | grep -v '.pb.go:' | tee /dev/stderr
-
- .PHONY: install
- install: ## Installs the executable or package
- @echo "+ $@"
-- @go install .
-+ @$(GO) install .
-
- define buildpretty
- mkdir -p $(BUILDDIR)/$(1)/$(2);
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
- -o $(BUILDDIR)/$(1)/$(2)/$(NAME) \
- -a -tags "$(BUILDTAGS) static_build netgo" \
- -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -83,7 +83,7 @@ cross: *.go VERSION ## Builds the cross-compiled binaries, creating a clean dire
- $(foreach GOOSARCH,$(GOOSARCHES), $(call buildpretty,$(subst /,,$(dir $(GOOSARCH))),$(notdir $(GOOSARCH))))
-
- define buildrelease
--GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build \
-+GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 $(GO) build \
- -o $(BUILDDIR)/$(NAME)-$(1)-$(2) \
- -a -tags "$(BUILDTAGS) static_build netgo" \
- -installsuffix netgo ${GO_LDFLAGS_STATIC} .;
-@@ -99,7 +99,7 @@ release: *.go VERSION ## Builds the cross-compiled binaries, naming them in such
- .PHONY: bump-version
- BUMP := patch
- bump-version: ## Bump the version in the version file. Set KIND to [ patch | major | minor ]
-- @go get -u github.com/jessfraz/junk/sembump # update sembump tool
-+ @$(GO) get -u github.com/jessfraz/junk/sembump # update sembump tool
- $(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
- @echo "Bumping VERSION from $(VERSION) to $(NEW_VERSION)"
- echo $(NEW_VERSION) > VERSION
---
-2.7.4
-
diff --git a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
index 3b0c0a4..3ed4c21 100644
--- a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
+++ b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch
@@ -1,4 +1,4 @@
-From 09524d187ef108784c854a0c247ac6476a10bb67 Mon Sep 17 00:00:00 2001
+From fa402247e9b24470648a366cfda1c9134660146a Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@...>
Date: Mon, 18 Mar 2019 14:04:16 -0400
Subject: [PATCH] Makefile: force rebuilding all packages to avoid cgo
@@ -32,23 +32,27 @@ used.
Upstream-Status: Inappropriate [only an issue with our builds]

Signed-off-by: Mark Asselstine <mark.asselstine@...>
+
+Forward-ported to v0.5.3.
+
+Signed-off-by: Paul Barker <paul@...>
---
- Makefile | 2 +-
+ basic.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/Makefile b/Makefile
-index 476cb9b..ecd0df4 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -41,7 +41,7 @@ $(NAME): *.go VERSION.txt
+diff --git a/basic.mk b/basic.mk
+index 187dff3..fb080b7 100644
+--- a/src/import/basic.mk
++++ b/src/import/basic.mk
+@@ -50,7 +50,7 @@ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
.PHONY: static
- static: ## Builds a static executable
+ static: prebuild ## Builds a static executable.
@echo "+ $@"
-- CGO_ENABLED=0 $(GO) build \
-+ CGO_ENABLED=0 $(GO) build -a -pkgdir dontusecurrentpkgs \
+- CGO_ENABLED=$(CGO_ENABLED) $(GO) build \
++ CGO_ENABLED=$(CGO_ENABLED) $(GO) build -a -pkgdir dontusecurrentpkgs \
-tags "$(BUILDTAGS) static_build" \
${GO_LDFLAGS_STATIC} -o $(NAME) .

--
-2.7.4
+2.17.1

diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index f5cdace..da6aac2 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -4,11 +4,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=48ef0979a2bcc3fae14ff30b8a7f5dbf"

SRC_URI = "git://github.com/genuinetools/netns;branch=master \
- file://0001-Allow-selection-of-go-compiler.patch \
file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \
"
-SRCREV = "0da6ab0997707024debe68c91e940c9168041bf8"
-PV = "0.4.0"
+SRCREV = "9b103a19b917cc3762a33b7d78244b1d5e45ccfd"
+PV = "0.5.3"
GO_IMPORT = "import"

S = "${WORKDIR}/git"
@@ -46,6 +45,12 @@ do_compile() {
# Static builds work but are not recommended. See Makefile*cgo patch.
#oe_runmake static
oe_runmake build
+
+ # Golang forces permissions to 0500 on directories and 0400 on files in
+ # the module cache which prevents us from easily cleaning up the build
+ # directory. Let's just fix the permissions here so we don't have to
+ # hack the clean tasks.
+ chmod -R u+w vendor/pkg/mod
}

do_install() {
--
2.17.1


[m-c-s][PATCH v2 3/3] layer.conf: depends on meta-filesystems

kai
 

From: Kai Kang <kai.kang@...>

Package glusterfs requires fuse which is from layer meta-filesystems.
So update layer.conf to depend on the layer.

Signed-off-by: Kai Kang <kai.kang@...>
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 8df9829..203f9db 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "cloud-services-layer"
BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_cloud-services-layer = "5"
LAYERSERIES_COMPAT_cloud-services-layer = "thud warrior"
-LAYERDEPENDS_cloud-services-layer = "core"
+LAYERDEPENDS_cloud-services-layer = "core filesystems-layer"
--
2.20.0


[m-c-s][PATCH v2 2/3] librdmacm: set imcompatible with arm 32 and mips arches

kai
 

From: Kai Kang <kai.kang@...>

librdmacm depends on package libibverbs which has been set imcompatible
with arm 32 and mips arches by commit 215b975.

When build librdmacm it shows errors:

| NOTE: Resolving any missing task queue dependencies
| ERROR: Nothing PROVIDES 'virtual/libibverbs' (but
| .../meta-cloud-services/recipes-extended/librdmacm/librdmacm_1.1.0.bb
| DEPENDS on or otherwise requires it)
| libibverbs PROVIDES virtual/libibverbs but was skipped: incompatible
| with host arm-wrs-linux-gnueabi (not in COMPATIBLE_HOST)
| ERROR: Required build target 'librdmacm' has no buildable providers.
| Missing or unbuildable dependency chain was: ['librdmacm', 'virtual/libibverbs']

So set librdmacm imcompatible with arm 32 and mips arches too.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/librdmacm/librdmacm_1.1.0.bb | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index 30a0c94..edf92f0 100644
--- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb
+++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
@@ -39,3 +39,6 @@ do_install_append() {
rm -f ${D}${libdir}/librdmacm.la
rm -f ${D}${libdir}/rsocket/librspreload.la
}
+
+COMPATIBLE_HOST_mipsarch = "none"
+COMPATIBLE_HOST_arm = "none"
--
2.20.0


[m-c-s][PATCH v2 1/3] glusterfs: remove PACKAGECONFIG libibverbs for arm 32 and mips

kai
 

From: Kai Kang <kai.kang@...>

Package libibverbs has been set imcompatible with arm 32 and mips arches
by commit 215b975. So disable libibverbs support of glusterfs for arm 32
and mips arches too.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/glusterfs/glusterfs.inc | 3 +++
1 file changed, 3 insertions(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index ab5f4e0..692d74a 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -50,6 +50,9 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
"

PACKAGECONFIG ??= "georeplication libibverbs"
+PACKAGECONFIG_remove_mipsarch = "libibverbs"
+PACKAGECONFIG_remove_arm = "libibverbs"
+
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
--
2.20.0


Re: [PATCH] glusterfs: uprev from v5.4 to v6.1

Bruce Ashfield
 

merged.

Bruce

On Thu, Apr 25, 2019 at 3:45 AM Hongzhi.Song <hongzhi.song@...> wrote:
The release-6.1 fixes a lot of CVEs.

Modify parts of patches for v6.1.
Remove bd-xlator configure which has been dropped.

Signed-off-by: Hongzhi.Song <hongzhi.song@...>
---
 .../glusterfs/files/glusterd-change-port-range.patch | 14 +++++++-------
 ...erfs-api-remove-unnecessary-library-options.patch | 11 ++++++-----
 .../glusterfs-change-default-nfs-port-number.patch   | 20 ++++++++++----------
 ...-configure-automake-with-subdir-objects-for.patch | 18 +++++++++++-------
 .../glusterfs-disable-default-startup-scripts.patch  | 18 +++++++++++-------
 recipes-extended/glusterfs/glusterfs.inc             |  2 --
 recipes-extended/glusterfs/glusterfs_5.4.bb          |  6 ------
 recipes-extended/glusterfs/glusterfs_6.1.bb          |  6 ++++++
 8 files changed, 51 insertions(+), 44 deletions(-)
 delete mode 100644 recipes-extended/glusterfs/glusterfs_5.4.bb
 create mode 100644 recipes-extended/glusterfs/glusterfs_6.1.bb

diff --git a/recipes-extended/glusterfs/files/glusterd-change-port-range.patch b/recipes-extended/glusterfs/files/glusterd-change-port-range.patch
index 52b6ffa..3458d8a 100644
--- a/recipes-extended/glusterfs/files/glusterd-change-port-range.patch
+++ b/recipes-extended/glusterfs/files/glusterd-change-port-range.patch
@@ -1,6 +1,6 @@
-From a0ed85e0b268dba76d9c820571e1b9217b51e985 Mon Sep 17 00:00:00 2001
+From 59d1b6fb5e6315df9fc55a74576b1bfde30303f0 Mon Sep 17 00:00:00 2001
 From: "Hongzhi.Song" <hongzhi.song@...>
-Date: Tue, 12 Mar 2019 20:03:21 -0700
+Date: Wed, 24 Apr 2019 23:07:58 -0400
 Subject: [PATCH] glusterd: change port range

 glusterfsd chooses tcp ports within the dynamic
@@ -22,24 +22,24 @@ Signed-off-by: Vu Tran <vu.tran@...>
 Signed-off-by: Xulin Sun <xulin.sun@...>
 [Yi: minor adjust to apply the patch on 3.11.1]
 Signed-off-by: Yi Zhao <yi.zhao@...>
-[Hogzhi: minor adjust to apply the patch on v5.4]
+[Hogzhi: modify patch for release-6.1]
 Signed-off-by: Hongzhi.Song <hongzhi.song@...>
 ---
  extras/glusterd.vol | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/extras/glusterd.vol b/extras/glusterd.vol
-index 88d412c..b89aa56 100644
+index 6045591..d814b5f 100644
 --- a/extras/glusterd.vol
 +++ b/extras/glusterd.vol
-@@ -9,6 +9,6 @@ volume management
+@@ -11,6 +11,6 @@ volume management
      option event-threads 1
  #   option lock-timer 180
  #   option transport.address-family inet6
 -#   option base-port 49152
 +#   option base-port 59152
- #   option max-port  65535
+     option max-port  60999
  end-volume
 --
-2.17.1
+2.8.1

diff --git a/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch b/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch
index 2f140ea..32f4dc1 100644
--- a/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch
@@ -1,6 +1,6 @@
-From 2ef09531d1d14cd64d5ba4ffbd9a99af10ae1ec4 Mon Sep 17 00:00:00 2001
+From 2b55524fab066cb14880a819f570b7f839bae1ce Mon Sep 17 00:00:00 2001
 From: "Hongzhi.Song" <hongzhi.song@...>
-Date: Tue, 12 Mar 2019 19:37:51 -0700
+Date: Wed, 24 Apr 2019 22:44:12 -0400
 Subject: [PATCH] glusterfs-api: remove unnecessary library options

 These cause QA errors when users of the api such
@@ -11,13 +11,14 @@ Upstream-Status: Inappropriate [embedded specific]

 Signed-off-by: Jim Somerville <Jim.Somerville@...>
 Signed-off-by: Xulin Sun <xulin.sun@...>
+[modify patch for release-6.1]
 Signed-off-by: Hongzhi.Song <hongzhi.song@...>
 ---
  glusterfs-api.pc.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/glusterfs-api.pc.in b/glusterfs-api.pc.in
-index 6af4e10..01b9d0f 100644
+index 4a2edb7..153c4ad 100644
 --- a/glusterfs-api.pc.in
 +++ b/glusterfs-api.pc.in
 @@ -8,5 +8,5 @@ Description: GlusterFS API
@@ -26,7 +27,7 @@ index 6af4e10..01b9d0f 100644
  Requires: @PKGCONFIG_UUID@
 -Libs: -L${libdir} @GFAPI_LIBS@ -lgfapi -lglusterfs -lgfrpc -lgfxdr
 +Libs: -lgfapi -lglusterfs -lgfrpc -lgfxdr
- Cflags: -I${includedir} -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -DUSE_POSIX_ACLS=@USE_POSIX_ACLS@
+ Cflags: -I${includedir} -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64 -DUSE_POSIX_ACLS=@USE_POSIX_ACLS@
 --
-2.17.1
+2.8.1

diff --git a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
index e3453a2..deb9e45 100644
--- a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
@@ -1,6 +1,6 @@
-From b0c106e74beee36c20f73b956841007209a7f23c Mon Sep 17 00:00:00 2001
+From b8b48d3c4ab92ce167db8137426fad45e938b11b Mon Sep 17 00:00:00 2001
 From: "Hongzhi.Song" <hongzhi.song@...>
-Date: Tue, 12 Mar 2019 19:52:03 -0700
+Date: Wed, 24 Apr 2019 22:50:01 -0400
 Subject: [PATCH] glusterfs: change default nfs port number

 Currently both native nfs and glusterfs-nfs use NFS well
@@ -30,25 +30,25 @@ Signed-off-by: Vu Tran <vu.tran@...>
 Signed-off-by: Xulin Sun <xulin.sun@...>
 [Yi: minor adjust to apply the patch on 3.11.1]
 Signed-off-by: Yi Zhao <yi.zhao@...>
-[Hongzhi: minor adjust to apply the patch on v5.4]
+[Hongzhi: modify patch for release-6.1]
 Signed-off-by: Hongzhi.Song <hongzhi.song@...>
 ---
- libglusterfs/src/common-utils.h | 2 +-
+ libglusterfs/src/glusterfs/common-utils.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
-index 6a6fd8c..218e379 100644
---- a/libglusterfs/src/common-utils.h
-+++ b/libglusterfs/src/common-utils.h
+diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
+index 0e2ecc7..59237a9 100644
+--- a/libglusterfs/src/glusterfs/common-utils.h
++++ b/libglusterfs/src/glusterfs/common-utils.h
 @@ -108,7 +108,7 @@ trap(void);
  /* Defining this here as it is needed by glusterd for setting
   * nfs port in volume status.
   */
 -#define GF_NFS3_PORT 2049
-+#define GF_NFS3_PORT    38467
++#define GF_NFS3_PORT 38467

  #define GF_CLIENT_PORT_CEILING 1024
  #define GF_IANA_PRIV_PORTS_START 49152 /* RFC 6335 */
 --
-2.17.1
+2.8.1

diff --git a/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch b/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
index 8f3c854..6278ce6 100644
--- a/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
@@ -1,6 +1,6 @@
-From bb34fd21ae26005cf099928f41e68a0d98685eba Mon Sep 17 00:00:00 2001
-From: Xulin Sun <xulin.sun@...>
-Date: Mon, 21 Mar 2016 17:32:50 +0800
+From fcd612f75c2e99a0748bebbf530b730d0019d2bf Mon Sep 17 00:00:00 2001
+From: "Hongzhi.Song" <hongzhi.song@...>
+Date: Wed, 24 Apr 2019 22:33:49 -0400
 Subject: [PATCH] glusterfs: configure: automake with subdir-objects & foreign
  parameters

@@ -10,21 +10,22 @@ autoconf execution failed when using automake 1.14 around version.
 Upstream-Status: Pending

 Signed-off-by: Xulin Sun <xulin.sun@...>
-
+[modify the patch for release-6.1]
+Signed-off-by: Hongzhi.Song <hongzhi.song@...>
 ---
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index 43efd6d..8ce28f6 100644
+index 2f341de..b28ac20 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,11 +13,11 @@ AC_INIT([glusterfs],
  AC_SUBST([PACKAGE_RELEASE],
           [m4_esyscmd([build-aux/pkg-version --release])])

--AM_INIT_AUTOMAKE(tar-pax)
-+#AM_INIT_AUTOMAKE(tar-pax)
+-AM_INIT_AUTOMAKE([tar-pax foreign])
++#AM_INIT_AUTOMAKE([tar-pax foreign])

  # Removes warnings when using automake 1.14 around (...but option 'subdir-objects' is disabled )
  #but libglusterfs fails to build with contrib (Then are not set up that way?)
@@ -33,3 +34,6 @@ index 43efd6d..8ce28f6 100644

  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])

+--
+2.8.1
+
diff --git a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
index dbc81b6..7f582dc 100644
--- a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch
@@ -1,6 +1,6 @@
-From 08b55ee9ccb02db0519ddc9902025e191c1500b1 Mon Sep 17 00:00:00 2001
-From: Donn Seeley <donn.seeley@...>
-Date: Fri, 28 Feb 2014 09:11:02 -0500
+From bbc23b4723a5f60f2b6f4daf734194f9a3a315d8 Mon Sep 17 00:00:00 2001
+From: "Hongzhi.Song" <hongzhi.song@...>
+Date: Wed, 24 Apr 2019 22:41:04 -0400
 Subject: [PATCH] Add the glusterfs package

 The glusterfs code for installing start-up scripts checks for systemd
@@ -18,21 +18,25 @@ Signed-off-by: Donn Seeley <donn.seeley@...>
 Signed-off-by: Xulin Sun <xulin.sun@...>
 [Yi: minor adjust to apply the patch on 3.11.1]
 Signed-off-by: Yi Zhao <yi.zhao@...>
-
+[modify patch for release-6.1]
+Signed-off-by: Hongzhi.Song <hongzhi.song@...>
 ---
  extras/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/extras/Makefile.am b/extras/Makefile.am
-index 3af1103..8978dde 100644
+index ff5ca9b..1f59746 100644
 --- a/extras/Makefile.am
 +++ b/extras/Makefile.am
-@@ -4,7 +4,7 @@ addonexec_SCRIPTS = peer_add_secret_pub
+@@ -10,7 +10,7 @@ endif
  EditorModedir = $(docdir)
  EditorMode_DATA = glusterfs-mode.el glusterfs.vim

 -SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
 +SUBDIRS = benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
-           $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils
+           $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python

  confdir = $(sysconfdir)/glusterfs
+--
+2.8.1
+
diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 5843d7c..ab5f4e0 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -16,7 +16,6 @@ SRC_URI += "file://glusterd.init \
             file://glusterfs-api-remove-unnecessary-library-options.patch \
             file://python-work-around-host-and-target-python.patch \
             file://glusterfs-change-default-nfs-port-number.patch \
-            file://dependence-on-correct-header-file-path.patch \
             file://libglusterfs-Don-t-link-against-libfl.patch \
             file://glusterd-change-port-range.patch \
             file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \
@@ -51,7 +50,6 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
                "

 PACKAGECONFIG ??= "georeplication libibverbs"
-PACKAGECONFIG[bd-xlator] = "--enable-bd-xlator,--disable-bd-xlator,lvm2,"
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
 PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
 PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm,"
diff --git a/recipes-extended/glusterfs/glusterfs_5.4.bb b/recipes-extended/glusterfs/glusterfs_5.4.bb
deleted file mode 100644
index 90ffd14..0000000
--- a/recipes-extended/glusterfs/glusterfs_5.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "b52ec9101de3c01c7db17c00b3234d94"
-SRC_URI[sha256sum] = "d4f8cf7551c4ac97480fa4f2da6077171b12d5501ee1ddc4cd8535e2336bde7e"
-
-require glusterfs.inc
diff --git a/recipes-extended/glusterfs/glusterfs_6.1.bb b/recipes-extended/glusterfs/glusterfs_6.1.bb
new file mode 100644
index 0000000..e109c08
--- /dev/null
+++ b/recipes-extended/glusterfs/glusterfs_6.1.bb
@@ -0,0 +1,6 @@
+SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "18967c357204d4cbdd9c1731508862c6"
+SRC_URI[sha256sum] = "32ac75c883cdf18e081893ce5210b2331f1ee9ba25e3f3f56136d9878b194dc7"
+
+require glusterfs.inc
--
2.8.1



--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


Re: [m-c-s][PATCH] glusterfs/librdmacm: fix dependency issue with libibverbs

kai
 

On 2019/4/19 上午9:18, Slater, Joseph wrote:
Comments inline, preceded by [Joe Slater]. Sorry, but I'm using outlook...

-----Original Message-----
From: Bruce Ashfield [mailto:bruce.ashfield@...]
Sent: Thursday, April 18, 2019 6:13 AM
To: Kang, Kai
Cc: meta-virtualization@...; Slater, Joseph
Subject: Re: [meta-virtualization][m-c-s][PATCH] glusterfs/librdmacm: fix dependency issue with libibverbs

On Wed, Apr 17, 2019 at 3:51 AM <kai.kang@...> wrote:
From: Kai Kang <kai.kang@...>

glusterfs and librdmacm depend on libibverbs. But libibverbs has been
set imcompatible with mipsarch and arm. Update glusterfs and librdmacm
accordingly.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/glusterfs/glusterfs.inc | 3 +++
recipes-extended/librdmacm/librdmacm_1.1.0.bb | 3 +++
2 files changed, 6 insertions(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 5843d7c6..3fc04ffb 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -51,6 +51,9 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
"

PACKAGECONFIG ??= "georeplication libibverbs"
+PACKAGECONFIG_remove_mipsarch = "libibverbs"
+PACKAGECONFIG_remove_arm = "libibverbs"
[Joe Slater]
Because this removes libibverbs from all PACKAGECONG's, I think it would be better to set the lazy default via a local variable.
Hi Joe,

It seems just remove "libibverbs" for _arm and _mipsarch,  isn't it?



+
PACKAGECONFIG[bd-xlator] = "--enable-bd-xlator,--disable-bd-xlator,lvm2,"
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index 30a0c943..edf92f01 100644
--- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb
+++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
@@ -39,3 +39,6 @@ do_install_append() {
rm -f ${D}${libdir}/librdmacm.la
rm -f ${D}${libdir}/rsocket/librspreload.la
}
+
+COMPATIBLE_HOST_mipsarch = "none"
+COMPATIBLE_HOST_arm = "none"
[Joe Slater]
Maybe an exclusion for world would be better, because this restriction will be gone when the libibverbs provider is fixed.
It depends on what strategy we perfer.

If set COMPATIBLE_HOST, when build librdmacm, it shows error message:

ERROR: Nothing PROVIDES 'librdmacm'
librdmacm was skipped: incompatible with host arm-wrs-linux-gnueabi (not in COMPATIBLE_HOST)


If set exclude from world, run 'bitbake librdmacm' shows following errors:

NOTE: Resolving any missing task queue dependencies
ERROR: Nothing PROVIDES 'virtual/libibverbs' (but /home/kkang/buildarea/wrlx-201902/repo/layers/meta-cloud-services/recipes-extended/librdmacm/librdmacm_1.1.0.bb DEPENDS on or otherwise requires it)
libibverbs PROVIDES virtual/libibverbs but was skipped: incompatible with host arm-wrs-linux-gnueabi (not in COMPATIBLE_HOST)
ERROR: Required build target 'librdmacm' has no buildable providers.
Missing or unbuildable dependency chain was: ['librdmacm', 'virtual/libibverbs']


I prefer COMPATIBLE_HOST way myself because the error message is a little clear.

Regards,
Kai


This should be a separate commit. We shouldn't mix the default
packageconfig change
and the marking of librdmacm as incompatible with mips/arm into the same commit.

In particular, since I'd like the error message you get if librdmacm
is compiled for arm/mips
to be logged in the commit where we make it incompatible.

Bruce

--
2.20.0
--
Kai Kang


Re: [m-c-s][PATCH] glusterfs/librdmacm: fix dependency issue with libibverbs

kai
 

On 2019/4/18 下午9:13, Bruce Ashfield wrote:
On Wed, Apr 17, 2019 at 3:51 AM <kai.kang@...> wrote:
From: Kai Kang <kai.kang@...>

glusterfs and librdmacm depend on libibverbs. But libibverbs has been
set imcompatible with mipsarch and arm. Update glusterfs and librdmacm
accordingly.

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-extended/glusterfs/glusterfs.inc | 3 +++
recipes-extended/librdmacm/librdmacm_1.1.0.bb | 3 +++
2 files changed, 6 insertions(+)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 5843d7c6..3fc04ffb 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -51,6 +51,9 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \
"

PACKAGECONFIG ??= "georeplication libibverbs"
+PACKAGECONFIG_remove_mipsarch = "libibverbs"
+PACKAGECONFIG_remove_arm = "libibverbs"
+
PACKAGECONFIG[bd-xlator] = "--enable-bd-xlator,--disable-bd-xlator,lvm2,"
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync"
diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index 30a0c943..edf92f01 100644
--- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb
+++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
@@ -39,3 +39,6 @@ do_install_append() {
rm -f ${D}${libdir}/librdmacm.la
rm -f ${D}${libdir}/rsocket/librspreload.la
}
+
+COMPATIBLE_HOST_mipsarch = "none"
+COMPATIBLE_HOST_arm = "none"
This should be a separate commit. We shouldn't mix the default
packageconfig change
and the marking of librdmacm as incompatible with mips/arm into the same commit.
OK.



In particular, since I'd like the error message you get if librdmacm
is compiled for arm/mips
to be logged in the commit where we make it incompatible.

Got it. Thanks.

Kai



Bruce

--
2.20.0
--
Kai Kang

3361 - 3380 of 7513