diff options
Diffstat (limited to 'recipes-containers/docker-distribution')
-rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 14 | ||||
-rw-r--r-- | recipes-containers/docker-distribution/files/0001-build-use-to-use-cross-go-compiler.patch | 21 |
2 files changed, 15 insertions, 20 deletions
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index dbca0d55..495b0d17 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb | |||
@@ -3,16 +3,16 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" |
5 | 5 | ||
6 | SRCREV_distribution= "d607c6ccb9372e05556624f973119a23d3a42987" | 6 | SRCREV_distribution = "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a" |
7 | SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \ | 7 | SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \ |
8 | file://docker-registry.service \ | 8 | file://docker-registry.service \ |
9 | file://0001-build-use-to-use-cross-go-compiler.patch \ | 9 | file://0001-build-use-to-use-cross-go-compiler.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | PACKAGES =+ "docker-registry" | 12 | PACKAGES =+ "docker-registry" |
13 | 13 | ||
14 | PV = "v2.8.3+git" | 14 | PV = "v3.0.0-beta.1" |
15 | S = "${WORKDIR}/git/src/github.com/docker/distribution" | 15 | S = "${WORKDIR}/git/src/github.com/distribution/distribution/v3" |
16 | 16 | ||
17 | GO_IMPORT = "import" | 17 | GO_IMPORT = "import" |
18 | 18 | ||
@@ -20,7 +20,7 @@ inherit goarch go systemd | |||
20 | 20 | ||
21 | # This disables seccomp and apparmor, which are on by default in the | 21 | # This disables seccomp and apparmor, which are on by default in the |
22 | # go package. | 22 | # go package. |
23 | EXTRA_OEMAKE="BUILDTAGS=''" | 23 | EXTRA_OEMAKE = "BUILDTAGS=''" |
24 | 24 | ||
25 | do_compile() { | 25 | do_compile() { |
26 | export GOARCH="${TARGET_GOARCH}" | 26 | export GOARCH="${TARGET_GOARCH}" |
@@ -48,7 +48,7 @@ do_install() { | |||
48 | 48 | ||
49 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 49 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
50 | install -d ${D}${systemd_unitdir}/system | 50 | install -d ${D}${systemd_unitdir}/system |
51 | install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system | 51 | install -m 644 ${UNPACKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system |
52 | fi | 52 | fi |
53 | 53 | ||
54 | install -d ${D}/${sysconfdir}/docker-distribution/registry/ | 54 | install -d ${D}/${sysconfdir}/docker-distribution/registry/ |
@@ -73,5 +73,3 @@ SYSTEMD_AUTO_ENABLE:docker-registry = "enable" | |||
73 | RDEPENDS:${PN}-ptest:remove = "${PN}" | 73 | RDEPENDS:${PN}-ptest:remove = "${PN}" |
74 | 74 | ||
75 | CVE_PRODUCT = "docker_registry" | 75 | CVE_PRODUCT = "docker_registry" |
76 | |||
77 | COMPATIBLE_HOST:riscv64 = "null" | ||
diff --git a/recipes-containers/docker-distribution/files/0001-build-use-to-use-cross-go-compiler.patch b/recipes-containers/docker-distribution/files/0001-build-use-to-use-cross-go-compiler.patch index f97a60ca..0f00b998 100644 --- a/recipes-containers/docker-distribution/files/0001-build-use-to-use-cross-go-compiler.patch +++ b/recipes-containers/docker-distribution/files/0001-build-use-to-use-cross-go-compiler.patch | |||
@@ -13,19 +13,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
13 | Makefile | 2 +- | 13 | Makefile | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/Makefile b/Makefile | 16 | Index: distribution/Makefile |
17 | index 4635c6ec..a95e860e 100644 | 17 | =================================================================== |
18 | --- a/Makefile | 18 | --- distribution.orig/Makefile |
19 | +++ b/Makefile | 19 | +++ distribution/Makefile |
20 | @@ -88,7 +88,7 @@ FORCE: | 20 | @@ -60,7 +60,7 @@ version/version.go: |
21 | # Build a binary from a cmd. | 21 | |
22 | bin/%: cmd/% FORCE | 22 | bin/%: cmd/% FORCE ## build individual binary |
23 | @echo "$(WHALE) $@${BINARY_SUFFIX}" | 23 | @echo "$(WHALE) $@${BINARY_SUFFIX}" |
24 | - @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< | 24 | - @go build -buildmode=pie ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} --ldflags '-extldflags "-Wl,-z,now" -s' ${GO_TAGS} ./$< |
25 | + @${GO} build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< | 25 | + @${GO} build -buildmode=pie ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} --ldflags '-extldflags "-Wl,-z,now" -s' ${GO_TAGS} ./$< |
26 | 26 | ||
27 | binaries: $(BINARIES) ## build binaries | 27 | binaries: $(BINARIES) ## build binaries |
28 | @echo "$(WHALE) $@" | 28 | @echo "$(WHALE) $@" |
29 | -- | ||
30 | 2.19.1 | ||
31 | |||