skopeo: use container-host bbclass to provide configuration

Instead of providing storage and registries configuration files
in this package, we inherit container-host which will provide a
common definition of these configs.

This allows multiple packages to ensure that the configuration
files are present, and not conflict in their installation.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index a719671c..66168ca8 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -21,8 +21,6 @@ RDEPENDS:${PN} = " \
 
 SRC_URI = " \
     git://github.com/containers/skopeo;branch=main;protocol=https \
-    file://storage.conf \
-    file://registries.conf \
     file://0001-makefile-add-GOBUILDFLAGS-to-go-build-call.patch \
 "
 
@@ -35,6 +33,8 @@ S = "${WORKDIR}/git"
 inherit goarch
 inherit pkgconfig
 
+inherit container-host
+
 # This CVE was fixed in the container image go library skopeo is using.
 # See:
 # https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-10214
@@ -83,9 +83,6 @@ do_install() {
 
         install ${S}/src/import/bin/skopeo ${D}/${sbindir}/
         install ${S}/src/import/default-policy.json ${D}/${sysconfdir}/containers/policy.json
-
-        install ${WORKDIR}/storage.conf ${D}/${sysconfdir}/containers/storage.conf
-        install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
 }
 
 do_install:append:class-native() {