starlingx/meta-starlingx
Code Issues Proposed changes

docker-distribution: uprev to 2.7.1 for stx 5.0

Browse Source 
* version 2.7.1 is required by registry-token-server
  in stx 5.0

* combine the bbappend and bb file

* add INSANE_SKIP to skip two QA issues

* update the stx-preferred-vers.inc

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ie56f3781c7045347dad5b6418c28288159ac6c13
This commit is contained in:
Jackie Huang 2021-05-25 16:20:41 +08:00
parent 304129ced4
commit 96ed04852d
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-stx-distro/conf/distro/include/stx-preferred-vers.inc
View File

@ -39,7 +39,7 @@ PREFERRED_VERSION_python-adal = "1.0.2"
PREFERRED_VERSION_python-osprofiler = "2.3.0+%" PREFERRED_VERSION_python-osprofiler = "2.3.0+%"
PREFERRED_VERSION_python-amqp = "2.5.2" PREFERRED_VERSION_python-amqp = "2.5.2"
PREFERRED_VERSION_python-ryu = "4.24+%" PREFERRED_VERSION_python-ryu = "4.24+%"
PREFERRED_VERSION_docker-distribution = "v2.6.2" PREFERRED_VERSION_docker-distribution = "v2.7.1"
PREFERRED_VERSION_kuberenetes = "1.16.%" PREFERRED_VERSION_kuberenetes = "1.16.%"
PREFERRED_VERSION_ruby = "2.0.0-p648" PREFERRED_VERSION_ruby = "2.0.0-p648"
PREFERRED_VERSION_ruby-native = "2.0.0-p648" PREFERRED_VERSION_ruby-native = "2.0.0-p648"

16
meta-stx-virt/recipes-containers/docker-distribution/docker-distribution_git.bb
View File

@ -3,18 +3,18 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
LICENSE = "Apache-2.0" LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
GO_PKG_PATH = "github.com/docker/distribution" PKG_NAME = "github.com/docker/distribution"
GO_IMPORT = "import" GO_IMPORT = "import"
SRCREV_distribution="48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89" SRCREV_distribution="2461543d988979529609e8cb6fca9ca190dc48da"
SRC_URI = " \ SRC_URI = " \
git://github.com/docker/distribution.git;branch=release/2.6;name=distribution;destsuffix=git/src/${GO_PKG_PATH} \ git://github.com/docker/distribution.git;branch=release/2.7;name=distribution;destsuffix=git/src/${PKG_NAME} \
file://${BPN}.service \ file://${BPN}.service \
file://config.yml \ file://config.yml \
" "
PV = "v2.6.2" PV = "v2.7.1"
S = "${WORKDIR}/git/src/${GO_PKG_PATH}" S = "${WORKDIR}/git/src/${PKG_NAME}"
inherit goarch inherit goarch
inherit go inherit go
@ -71,6 +71,8 @@ SYSTEMD_AUTO_ENABLE_${BPN} = "disable"
SYSROOT_PREPROCESS_FUNCS += "docker_distribution_sysroot_preprocess" SYSROOT_PREPROCESS_FUNCS += "docker_distribution_sysroot_preprocess"
docker_distribution_sysroot_preprocess () { docker_distribution_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${GO_PKG_PATH} install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
cp -r ${S} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${GO_PKG_PATH}) cp -r ${S} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
} }
INSANE_SKIP_${PN} = "already-stripped ldflags"

9
meta-stx-virt/recipes-containers/docker-distribution/docker-distribution_git.bbappend
View File

@ -1,9 +0,0 @@
PKG_NAME = "github.com/docker/distribution"
SYSROOT_PREPROCESS_FUNCS += "docker_distribution_sysroot_preprocess"
docker_distribution_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
cp -r ${S} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}