* [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation
@ 2019-09-24 9:37 Paul Barker
2019-09-24 9:37 ` [PATCH 2/2] netns: Fix build on qemux86-64 Paul Barker
2019-09-26 14:35 ` [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Bruce Ashfield
0 siblings, 2 replies; 4+ messages in thread
From: Paul Barker @ 2019-09-24 9:37 UTC (permalink / raw)
To: meta-virtualization
The recipe for cri-o already has an anonymous Python function in place
to skip the recipe if dependencies are not found so there's no need to
force inclusion of the meta-selinux layer.
Signed-off-by: Paul Barker <paul@betafive.co.uk>
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index 23efcb8..958efd6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,12 +21,12 @@ LAYERDEPENDS_virtualization-layer = " \
networking-layer \
filesystems-layer \
meta-python \
- selinux \
"
# webserver: naigos requires apache2
LAYERRECOMMENDS_virtualization-layer = " \
webserver \
+ selinux \
"
# Override security flags
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] netns: Fix build on qemux86-64
2019-09-24 9:37 [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Paul Barker
@ 2019-09-24 9:37 ` Paul Barker
2019-09-26 14:36 ` Bruce Ashfield
2019-09-26 14:35 ` [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Bruce Ashfield
1 sibling, 1 reply; 4+ messages in thread
From: Paul Barker @ 2019-09-24 9:37 UTC (permalink / raw)
To: meta-virtualization
The build has broken again on master, even for non-static builds of
netns. The simplest fix is to extend our existing patch to cover this
case as well.
Signed-off-by: Paul Barker <paul@betafive.co.uk>
---
...ce-rebuilding-all-packages-to-avoid-cgo.patch | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
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 3ed4c21..e4967d2 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
@@ -37,14 +37,20 @@ Forward-ported to v0.5.3.
Signed-off-by: Paul Barker <paul@betafive.co.uk>
---
- basic.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ basic.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/basic.mk b/basic.mk
-index 187dff3..fb080b7 100644
+index 187dff3..76a8d93 100644
--- a/src/import/basic.mk
+++ b/src/import/basic.mk
-@@ -50,7 +50,7 @@ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
+@@ -45,12 +45,12 @@ build: prebuild $(NAME) ## Builds a dynamic executable or package.
+
+ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
+ @echo "+ $@"
+- $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
++ $(GO) build -a -pkgdir dontusecurrentpkgs -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
+
.PHONY: static
static: prebuild ## Builds a static executable.
@echo "+ $@"
@@ -54,5 +60,5 @@ index 187dff3..fb080b7 100644
${GO_LDFLAGS_STATIC} -o $(NAME) .
--
-2.17.1
+2.23.0
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] netns: Fix build on qemux86-64
2019-09-24 9:37 ` [PATCH 2/2] netns: Fix build on qemux86-64 Paul Barker
@ 2019-09-26 14:36 ` Bruce Ashfield
0 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2019-09-26 14:36 UTC (permalink / raw)
To: Paul Barker; +Cc: meta-virtualization
merged.
Bruce
In message: [meta-virtualization] [PATCH 2/2] netns: Fix build on qemux86-64
on 24/09/2019 Paul Barker wrote:
> The build has broken again on master, even for non-static builds of
> netns. The simplest fix is to extend our existing patch to cover this
> case as well.
>
> Signed-off-by: Paul Barker <paul@betafive.co.uk>
> ---
> ...ce-rebuilding-all-packages-to-avoid-cgo.patch | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> 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 3ed4c21..e4967d2 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
> @@ -37,14 +37,20 @@ Forward-ported to v0.5.3.
>
> Signed-off-by: Paul Barker <paul@betafive.co.uk>
> ---
> - basic.mk | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + basic.mk | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/basic.mk b/basic.mk
> -index 187dff3..fb080b7 100644
> +index 187dff3..76a8d93 100644
> --- a/src/import/basic.mk
> +++ b/src/import/basic.mk
> -@@ -50,7 +50,7 @@ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
> +@@ -45,12 +45,12 @@ build: prebuild $(NAME) ## Builds a dynamic executable or package.
> +
> + $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt
> + @echo "+ $@"
> +- $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
> ++ $(GO) build -a -pkgdir dontusecurrentpkgs -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) .
> +
> .PHONY: static
> static: prebuild ## Builds a static executable.
> @echo "+ $@"
> @@ -54,5 +60,5 @@ index 187dff3..fb080b7 100644
> ${GO_LDFLAGS_STATIC} -o $(NAME) .
>
> --
> -2.17.1
> +2.23.0
>
> --
> 2.23.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation
2019-09-24 9:37 [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Paul Barker
2019-09-24 9:37 ` [PATCH 2/2] netns: Fix build on qemux86-64 Paul Barker
@ 2019-09-26 14:35 ` Bruce Ashfield
1 sibling, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2019-09-26 14:35 UTC (permalink / raw)
To: Paul Barker; +Cc: meta-virtualization
merged
Bruce
In message: [meta-virtualization] [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation
on 24/09/2019 Paul Barker wrote:
> The recipe for cri-o already has an anonymous Python function in place
> to skip the recipe if dependencies are not found so there's no need to
> force inclusion of the meta-selinux layer.
>
> Signed-off-by: Paul Barker <paul@betafive.co.uk>
> ---
> conf/layer.conf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 23efcb8..958efd6 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -21,12 +21,12 @@ LAYERDEPENDS_virtualization-layer = " \
> networking-layer \
> filesystems-layer \
> meta-python \
> - selinux \
> "
>
> # webserver: naigos requires apache2
> LAYERRECOMMENDS_virtualization-layer = " \
> webserver \
> + selinux \
> "
>
> # Override security flags
> --
> 2.23.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-26 14:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-24 9:37 [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Paul Barker
2019-09-24 9:37 ` [PATCH 2/2] netns: Fix build on qemux86-64 Paul Barker
2019-09-26 14:36 ` Bruce Ashfield
2019-09-26 14:35 ` [PATCH 1/2] layer.conf: Change dependency on meta-selinux to recommendation Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.