Skip to contentSkip to conversation

docker: remove docker.service.rpm

PATCH In review Chen Qi 2 participants 2 messages Jan 3, 2020 – Jan 8, 2020

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 docker: remove docker.service.rpm

This file is useless and misleading. Remove it.

---
 recipes-containers/docker/docker-ce_git.bb | 1 +
 recipes-containers/docker/docker-moby.bb   | 1 +
 2 files changed, 2 insertions(+)
recipes-containers/docker/docker-ce_git.bb +1 -0
index 817795f..8b8136d 100644
@@ -107,6 +107,7 @@ do_install() {
 		install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
+		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
 	else
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
recipes-containers/docker/docker-moby.bb +1 -0
index 0936fdf..0e1f4e2 100644
@@ -126,6 +126,7 @@ do_install() {
 		install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
+		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
 	else
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
Signature · 1 line
2.17.1
#1 lore raw

merged

Bruce

In message: [meta-virtualization][PATCH] docker: remove docker.service.rpm

Quoted 37 lines · on 03/01/2020 Chen Qi wrote:

This file is useless and misleading. Remove it.

---
 recipes-containers/docker/docker-ce_git.bb | 1 +
 recipes-containers/docker/docker-moby.bb   | 1 +
 2 files changed, 2 insertions(+)
recipes-containers/docker/docker-ce_git.bb +1 -0
index 817795f..8b8136d 100644
@@ -107,6 +107,7 @@ do_install() {
 		install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
+		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
 	else
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
recipes-containers/docker/docker-moby.bb +1 -0
index 0936fdf..0e1f4e2 100644
@@ -126,6 +126,7 @@ do_install() {
 		install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
+		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
 	else
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
Signature · 1 line
2.17.1