diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2022-06-12 01:00:01 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-20 12:09:46 -0400 |
commit | 9c8e3597f70ff453f302c5b54cd8bc5ad85dd2c9 (patch) | |
tree | b16ceb67369785bf2792d344607fc1d97fa043c9 | |
parent | b9a94a5fb6f608d53ddbfe2a60cbc8a670922550 (diff) | |
download | meta-virtualization-9c8e3597f70ff453f302c5b54cd8bc5ad85dd2c9.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 4 |
1 files 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" | |||
16 | 16 | ||
17 | GO_IMPORT = "import" | 17 | GO_IMPORT = "import" |
18 | 18 | ||
19 | inherit goarch | 19 | inherit goarch go systemd |
20 | inherit go | ||
21 | 20 | ||
22 | # This disables seccomp and apparmor, which are on by default in the | 21 | # This disables seccomp and apparmor, which are on by default in the |
23 | # go package. | 22 | # go package. |
@@ -66,6 +65,7 @@ FILES:docker-registry += "${systemd_unitdir}/system/docker-registry.service" | |||
66 | FILES:docker-registry += "${sysconfdir}/docker-distribution/*" | 65 | FILES:docker-registry += "${sysconfdir}/docker-distribution/*" |
67 | FILES:docker-registry += "${localstatedir}/lib/registry/" | 66 | FILES:docker-registry += "${localstatedir}/lib/registry/" |
68 | 67 | ||
68 | SYSTEMD_PACKAGES = "docker-registry" | ||
69 | SYSTEMD_SERVICE:docker-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" | 69 | SYSTEMD_SERVICE:docker-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" |
70 | SYSTEMD_AUTO_ENABLE:docker-registry = "enable" | 70 | SYSTEMD_AUTO_ENABLE:docker-registry = "enable" |
71 | 71 | ||