From 9c8e3597f70ff453f302c5b54cd8bc5ad85dd2c9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Sun, 12 Jun 2022 01:00:01 -0700 Subject: docker-distribution: fix the inehrit and systemd settings In order for systemd variables such as SYSTEMD_AUTO_ENABLE to have effect, we need to inherit the systemd class. We also need to specify the package which contains the service. As go.bbclass already inherits goarch.bbclass, we only need to inehrit go.bbclass. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/docker-distribution/docker-distribution_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index 0dbdc490..395694aa 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb @@ -16,8 +16,7 @@ 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. @@ -66,6 +65,7 @@ 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" -- cgit v1.2.3-54-g00ecf