2 files changed, 8 insertions, 8 deletions
diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
index bb4af36b..9e5a8313 100644
--- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
+++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
@@ -17,12 +17,12 @@ Index: git/src/import/Makefile
 ===================================================================
 --- git.orig/src/import/Makefile
 +++ git/src/import/Makefile
-@@ -20,7 +20,7 @@
+@@ -24,7 +24,7 @@
-                endif
+                GO_BUILDMODE := "-buildmode=pie"
        endif
 endif
-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
+-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \
-+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \
-        -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+        $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
- GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
+        -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)"
-        -ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+ 
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index 77c567ef..7757baa0 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,6 +1,6 @@
 include runc.inc
-SRCREV = "b6109acd4d81e8a33dd07d94e6a7f9c706d8356c"
+SRCREV = "ca73c9fd4b684a7ddec8b3bd892b5f76d6f21710"
 SRC_URI = " \
    git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \
    file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \

diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index bb4af36b..9e5a8313 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
@@ -17,12 +17,12 @@ Index: git/src/import/Makefile
17	===================================================================	17	===================================================================
18	--- git.orig/src/import/Makefile	18	--- git.orig/src/import/Makefile
19	+++ git/src/import/Makefile	19	+++ git/src/import/Makefile
20	@@ -20,7 +20,7 @@	20	@@ -24,7 +24,7 @@
21	endif	21	GO_BUILDMODE := "-buildmode=pie"
22	endif	22	endif
23	endif	23	endif
24	-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \	24	-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \
25	+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \	25	+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \
26	-ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"	26	$(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
27	GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \	27	-ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)"
28	-ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"	28


diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index 77c567ef..7757baa0 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,6 +1,6 @@
1	include runc.inc	1	include runc.inc
2		2
3	SRCREV = "b6109acd4d81e8a33dd07d94e6a7f9c706d8356c"	3	SRCREV = "ca73c9fd4b684a7ddec8b3bd892b5f76d6f21710"
4	SRC_URI = " \	4	SRC_URI = " \
5	git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \	5	git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \
6	file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \	6	file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \