runc-opencontainers: update to 1.1.7-tip

Bumping runc to version v1.1.7-37-gca73c9fd, which comprises the following commits:

    0d93d7d1 release: add riscv64 binary
    9164fe17 libct/seccomp: add riscv64
    ed47e31a Makefile: set CGO_ENABLED=1 when needed
    923ae4da Makefile: add support for static PIE
    2abca872 Makefile: fix GO_BUILDMODE setting
    120ec5bd Makefile: add LDFLAGS_COMMON and LDFLAGS_STATIC
    b9940113 Dockerfile: don't use crossbuild-essential-*
    028fc57a Dockerfile: rm dpkg --add-architecture lines
    4449ce84 Dockerfile: nit
    d375351b ci/cirrus: enable rootless tests on cs9
    e1a8b52f tests/int/cgroups: filter out rdma
    02e065ef docs/systemd: fix a broken link
    9af462e4 Fix tmpfs mode opts when dir already exists
    7d1bdc7d .codespellrc: update for 2.2.5
    8397943e man/runc: fixes
    f9da684d tests/int: increase num retries for oom tests
    7fa912ed ci/cirrus: limit numcpu
    e9c1ca08 Fix Vagrant caching
    e2265a92 ci: bump bats 1.8.2 -> 1.9.0
    bbddb6bd Vagrantfile.fedora: bump to 38
    27b86b4c ci/cirrus: use vagrant from hashicorp repo
    98a1b76c tests/int: fix some checks
    1eadcede ci: bump bats 1.3.0 -> 1.8.2
    63af8b00 init: do not print environment variable value
    404ea7ab libct: fix a race with systemd removal
    f0ecf30b VERSION: back to development
    860f061b VERSION: release 1.1.7

We refresh one patch for context changes.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-07-07 21:01:01 +00:00
parent 248be027d6
commit 5dda7078ba
2 changed files with 8 additions and 8 deletions

View File

@ -17,12 +17,12 @@ Index: git/src/import/Makefile
=================================================================== ===================================================================
--- git.orig/src/import/Makefile --- git.orig/src/import/Makefile
+++ git/src/import/Makefile +++ git/src/import/Makefile
@@ -20,7 +20,7 @@ @@ -24,7 +24,7 @@
GO_BUILDMODE := "-buildmode=pie"
endif endif
endif endif
endif -GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \
-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ +GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \
+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
-ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)" -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)"
GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
-ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"

View File

@ -1,6 +1,6 @@
include runc.inc include runc.inc
SRCREV = "b6109acd4d81e8a33dd07d94e6a7f9c706d8356c" SRCREV = "ca73c9fd4b684a7ddec8b3bd892b5f76d6f21710"
SRC_URI = " \ SRC_URI = " \
git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \ git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \
file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \