From 0ea0ae357af514184bc71b2970fbd98e596d2099 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Wed, 8 Feb 2017 15:46:32 +0200 Subject: docker: Replace /usr/share with ${datadir} Make use of bitbake variable where appropriate, this makes the recipe portable. Signed-off-by: Amarnath Valluri Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-containers/docker/docker_git.bb') 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() { install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init fi - mkdir -p ${D}/usr/share/docker/ - cp ${WORKDIR}/hi.Dockerfile ${D}/usr/share/docker/ - install -m 0755 ${S}/contrib/check-config.sh ${D}/usr/share/docker/ + mkdir -p ${D}${datadir}/docker/ + cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/ + install -m 0755 ${S}/contrib/check-config.sh ${D}${datadir}/docker/ } inherit useradd USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r docker" -FILES_${PN} += "/lib/systemd/system/*" +FILES_${PN} += "${systemd_unitdir}/system/*" -FILES_${PN}-contrib += "/usr/share/docker/check-config.sh" +FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" RDEPENDS_${PN}-contrib += "bash" # DO NOT STRIP docker -- cgit v1.2.3-54-g00ecf