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"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
 
-SRCREV_distribution= "d607c6ccb9372e05556624f973119a23d3a42987"
-SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \
+SRCREV_distribution = "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a"
+SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \
            file://docker-registry.service \
            file://0001-build-use-to-use-cross-go-compiler.patch \
           "
 
 PACKAGES =+ "docker-registry"
 
-PV = "v2.8.3+git"
-S = "${WORKDIR}/git/src/github.com/docker/distribution"
+PV = "v3.0.0-beta.1"
+S = "${WORKDIR}/git/src/github.com/distribution/distribution/v3"
 
 GO_IMPORT = "import"
 
@@ -20,7 +20,7 @@ inherit goarch go systemd
 
 # This disables seccomp and apparmor, which are on by default in the
 # go package. 
-EXTRA_OEMAKE="BUILDTAGS=''"
+EXTRA_OEMAKE = "BUILDTAGS=''"
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
@@ -48,7 +48,7 @@ do_install() {
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
             install -d ${D}${systemd_unitdir}/system
-            install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system
+            install -m 644 ${UNPACKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system
         fi
 
         install -d ${D}/${sysconfdir}/docker-distribution/registry/
@@ -73,5 +73,3 @@ SYSTEMD_AUTO_ENABLE:docker-registry = "enable"
 RDEPENDS:${PN}-ptest:remove = "${PN}"
 
 CVE_PRODUCT = "docker_registry"
-
-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>
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index 4635c6ec..a95e860e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -88,7 +88,7 @@ FORCE:
- # Build a binary from a cmd.
- bin/%: cmd/% FORCE
+Index: distribution/Makefile
+===================================================================
+--- distribution.orig/Makefile
++++ distribution/Makefile
+@@ -60,7 +60,7 @@ version/version.go:
+ 
+ bin/%: cmd/% FORCE ## build individual binary
         @echo "$(WHALE) $@${BINARY_SUFFIX}"
--       @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
-+       @${GO} build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
+-       @go build -buildmode=pie ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} --ldflags '-extldflags "-Wl,-z,now" -s' ${GO_TAGS}  ./$<
++       @${GO} build -buildmode=pie ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} --ldflags '-extldflags "-Wl,-z,now" -s' ${GO_TAGS}  ./$<
  
  binaries: $(BINARIES) ## build binaries
         @echo "$(WHALE) $@"
--- 
-2.19.1
-