diff options
Diffstat (limited to 'recipes-containers/docker-distribution/docker-distribution_git.bb')
| -rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index e98639c5..dbca0d55 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb @@ -3,21 +3,20 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -SRCREV_distribution= "f7365390ef0c8bc43de18e3e87df48b495139488" -SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.7;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \ +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 \ file://docker-registry.service \ file://0001-build-use-to-use-cross-go-compiler.patch \ " PACKAGES =+ "docker-registry" -PV = "v2.7.1+git${SRCPV}" +PV = "v2.8.3+git" S = "${WORKDIR}/git/src/github.com/docker/distribution" GO_IMPORT = "import" -inherit goarch -inherit go +inherit goarch go systemd # This disables seccomp and apparmor, which are on by default in the # go package. @@ -26,16 +25,17 @@ EXTRA_OEMAKE="BUILDTAGS=''" do_compile() { export GOARCH="${TARGET_GOARCH}" export GOPATH="${WORKDIR}/git/" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" + export GOROOT="${STAGING_LIBDIR}/go" # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries export CGO_ENABLED="1" export CFLAGS="" export LDFLAGS="" - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_CFLAGS="${TARGET_CFLAGS}" export GO_GCFLAGS="" - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" export GO111MODULE=off + export GO_BUILD_FLAGS="-trimpath" cd ${S} @@ -66,9 +66,12 @@ FILES:docker-registry += "${systemd_unitdir}/system/docker-registry.service" FILES:docker-registry += "${sysconfdir}/docker-distribution/*" FILES:docker-registry += "${localstatedir}/lib/registry/" +SYSTEMD_PACKAGES = "docker-registry" SYSTEMD_SERVICE:docker-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" SYSTEMD_AUTO_ENABLE:docker-registry = "enable" RDEPENDS:${PN}-ptest:remove = "${PN}" CVE_PRODUCT = "docker_registry" + +COMPATIBLE_HOST:riscv64 = "null" |