diff options
author | Amarnath Valluri <amarnath.valluri@intel.com> | 2017-02-08 15:46:32 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-09 09:13:56 -0500 |
commit | 0ea0ae357af514184bc71b2970fbd98e596d2099 (patch) | |
tree | 42fd6192061e404f9390fffe31ae150bdea266ec | |
parent | a2e5525909a0cdc44a41b4fb0130433040638727 (diff) | |
download | meta-virtualization-0ea0ae357af514184bc71b2970fbd98e596d2099.tar.gz |
docker: Replace /usr/share with ${datadir}
Make use of bitbake variable where appropriate, this makes the recipe portable.
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index c208a025..6805d786 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -142,18 +142,18 @@ do_install() { | |||
142 | install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init | 142 | install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init |
143 | fi | 143 | fi |
144 | 144 | ||
145 | mkdir -p ${D}/usr/share/docker/ | 145 | mkdir -p ${D}${datadir}/docker/ |
146 | cp ${WORKDIR}/hi.Dockerfile ${D}/usr/share/docker/ | 146 | cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/ |
147 | install -m 0755 ${S}/contrib/check-config.sh ${D}/usr/share/docker/ | 147 | install -m 0755 ${S}/contrib/check-config.sh ${D}${datadir}/docker/ |
148 | } | 148 | } |
149 | 149 | ||
150 | inherit useradd | 150 | inherit useradd |
151 | USERADD_PACKAGES = "${PN}" | 151 | USERADD_PACKAGES = "${PN}" |
152 | GROUPADD_PARAM_${PN} = "-r docker" | 152 | GROUPADD_PARAM_${PN} = "-r docker" |
153 | 153 | ||
154 | FILES_${PN} += "/lib/systemd/system/*" | 154 | FILES_${PN} += "${systemd_unitdir}/system/*" |
155 | 155 | ||
156 | FILES_${PN}-contrib += "/usr/share/docker/check-config.sh" | 156 | FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" |
157 | RDEPENDS_${PN}-contrib += "bash" | 157 | RDEPENDS_${PN}-contrib += "bash" |
158 | 158 | ||
159 | # DO NOT STRIP docker | 159 | # DO NOT STRIP docker |