Re: [meta-virtualization][PATCH] runc-docker: adjust patch to fit latest version

["Bruce Ashfield" <bruce.ashfield@gmail.com>]

On Mon, Jun 14, 2021 at 9:51 PM Kai <kai.kang@windriver.com> wrote:
>
> On 3/17/21 8:59 PM, Bruce Ashfield wrote:
>
> On Wed, Mar 17, 2021 at 1:41 AM Chen Qi <Qi.Chen@windriver.com> wrote:
>
> Adjust patch to fit the latest version.
>
> This is the wrong fix (and the commit log is wrong).
>
> I unified runc-docker and runc-opencontainers upstream repositories a
> while ago, since there are no longer docker specifics in a runc
> variant.
>
> I will delete the runc-docker recipe soon, but have been waiting on
> that a bit longer.
>
> When I bumped runc last week, I forgot to bump the second variant as
> well. I've now done that, and the patch issues are gone.
>
> Hi Bruce,
>
> It breaks do_patch again. And what is the "second variant" you've mentioned, please?
>

I just pushed the fix.

By "second variant", I just mean the runc-docker.

At one point, it was significant, but it is basically identical to the
runc-opencontainers one at this point, with a couple of extra patches.
There's one shared patch, and I tend to forget to update the
runc-docker when I bump runc-opencontainers.

I'll start the process of dropping runc-docker in the upcoming release.

Bruce

> Regards,
> Kai
>
> Bruce
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  ...docker-Makefile-respect-GOBUILDFLAGS.patch | 37 +++++++++++++++++++
>  recipes-containers/runc/runc-docker_git.bb    |  2 +-
>  2 files changed, 38 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch
>
> diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch
> new file mode 100644
> index 00000000..7ea9109a
> --- /dev/null
> +++ b/recipes-containers/runc/runc-docker/0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch
> @@ -0,0 +1,37 @@
> +From c8ac2963cf17d4ee45b8b6ccbdfd81fe52e7092a Mon Sep 17 00:00:00 2001
> +From: Chen Qi <Qi.Chen@windriver.com>
> +Date: Tue, 16 Mar 2021 22:27:45 -0700
> +Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty
> + from static
> +
> +Upstream-Status: Inappropriate [OE Specific]
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + Makefile | 3 +--
> + 1 file changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/src/import/Makefile b/src/import/Makefile
> +index e13d8f1d..409b61dd 100644
> +--- a/src/import/Makefile
> ++++ b/src/import/Makefile
> +@@ -23,7 +23,7 @@ ifeq ($(shell $(GO) env GOOS),linux)
> +               GO_BUILDMODE := "-buildmode=pie"
> +       endif
> + endif
> +-GO_BUILD := $(GO) build -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
> ++GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
> +       -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
> + GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
> +       -ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
> +@@ -40,7 +40,6 @@ recvtty:
> +
> + static:
> +       $(GO_BUILD_STATIC) -o runc .
> +-      $(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
> +
> + release:
> +       script/release.sh -r release/$(VERSION) -v $(VERSION)
> +--
> +2.30.2
> +
> diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
> index 118bfc1d..9e7043ad 100644
> --- a/recipes-containers/runc/runc-docker_git.bb
> +++ b/recipes-containers/runc/runc-docker_git.bb
> @@ -5,7 +5,7 @@ include runc.inc
>  SRCREV_runc-docker = "b4cb54c2ea78b90f9d8284316aeaeff876f61dfc"
>  SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
>             file://0001-runc-Add-console-socket-dev-null.patch \
> -           file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
> +           file://0001-runc-docker-Makefile-respect-GOBUILDFLAGS.patch \
>             file://0001-runc-docker-SIGUSR1-daemonize.patch \
>            "
>
> --
> 2.17.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
>
>
> 
>
>
> --
> Kai Kang
> Wind River Linux



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