From 60ac43ecf77a65a75f1a816038d1f1a79ce8fd61 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 3 Jun 2021 15:57:33 +0800
Subject: [PATCH] docker-ce: update for stx 5.0

* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

* remove do_copy_config_files since it's not
  needed after using stx-metadata

Issue-ID: INF-215

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I28c4e8fee64204a908a392cbc51fd0961113d978
---
 .../docker/docker-ce_git.bbappend                  | 28 +++++++---------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/meta-starlingx/meta-stx-virt/recipes-containers/docker/docker-ce_git.bbappend b/meta-starlingx/meta-stx-virt/recipes-containers/docker/docker-ce_git.bbappend
index c8ce3b5..ef574d5 100644
--- a/meta-starlingx/meta-stx-virt/recipes-containers/docker/docker-ce_git.bbappend
+++ b/meta-starlingx/meta-stx-virt/recipes-containers/docker/docker-ce_git.bbappend
@@ -1,36 +1,24 @@
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "docker-config"
-DSTSUFX0 = "stx-configfiles"
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH = "docker-config"
 
 LICENSE_append = "& Apache-2.0"
 LIC_FILES_CHKSUM += "\
-	file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-	"
-
-SRC_URI += " \
-	git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
+	file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 	"
 
 RDEPENDS_${PN}_append = " logrotate"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
-    cp -f ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE
-}
-
 do_install_append () {
     rm -f ${D}${sysconfdir}/docker
     install -d -m 0755 ${D}${sysconfdir}/docker
     install -d -m 0755 ${D}/${sysconfdir}/pmon.d 
     install -d -m 0755 ${D}/${sysconfdir}/systemd/system/docker.service.d 
     
-    install -D -m 644 ${WORKDIR}/${DSTSUFX0}/files/docker-pmond.conf ${D}/${sysconfdir}/pmon.d/docker.conf
+    install -D -m 644 ${STX_METADATA_PATH}/files/docker-pmond.conf ${D}/${sysconfdir}/pmon.d/docker.conf
     
-    install -D -m 644 ${WORKDIR}/${DSTSUFX0}/files/docker-stx-override.conf \
+    install -D -m 644 ${STX_METADATA_PATH}/files/docker-stx-override.conf \
     	${D}/${sysconfdir}/systemd/system/docker.service.d/docker-stx-override.conf
-    install -D -m 644 ${WORKDIR}/${DSTSUFX0}/files/docker.logrotate ${D}/${sysconfdir}/logrotate.d/docker.logrotate
+    install -D -m 644 ${STX_METADATA_PATH}/files/docker.logrotate ${D}/${sysconfdir}/logrotate.d/docker.logrotate
 }
-- 
2.16.6