summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2020-06-02 15:42:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:32 +0100
commitccbeea1c0b8ab80f8e57cce9b0f7a333ecfd6fc7 (patch)
tree00547911c2fc3d85bfb2a19d3e80f44881ab4e2a
parent850abc548b46f0c41ac92f18cb6659aeda461530 (diff)
downloadpoky-ccbeea1c0b8ab80f8e57cce9b0f7a333ecfd6fc7.tar.gz
init-system-helpers: avoid superfluous update-rc.d
Debians init-system-helpers bundle an own, perl written update-rc.d which doesn't fulfill embedded/cross-build requirements as our own in meta/recipes-core/update-rc.d does. To avoid unnecessary conflicts or questions, do not bundle it by default. Whoever wants it is invited to have an .bbappend. (From OE-Core rev: 4e5a55c7ecf7100bb87dcad31723ee27b7006ac2) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/init-system-helpers_1.57.bb9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.57.bb b/meta/recipes-core/initscripts/init-system-helpers_1.57.bb
index d41bb94791..46f5bbf442 100644
--- a/meta/recipes-core/initscripts/init-system-helpers_1.57.bb
+++ b/meta/recipes-core/initscripts/init-system-helpers_1.57.bb
@@ -16,8 +16,6 @@ SECTION = "base"
16LICENSE = "BSD-3-Clause & GPLv2" 16LICENSE = "BSD-3-Clause & GPLv2"
17LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" 17LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072"
18 18
19DEPENDS = "perl"
20
21SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726" 19SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726"
22SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git" 20SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git"
23 21
@@ -30,17 +28,14 @@ do_install() {
30 install -d -m 0755 ${D}${sbindir} 28 install -d -m 0755 ${D}${sbindir}
31 install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir} 29 install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir}
32 install -m 0755 ${S}/script/service ${D}${sbindir} 30 install -m 0755 ${S}/script/service ${D}${sbindir}
33 install -m 0755 ${S}/script/update-rc.d ${D}${sbindir}
34} 31}
35 32
36PACKAGES += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d" 33PACKAGES += "${PN}-invoke-rc.d ${PN}-service"
37 34
38FILES_${PN} = "" 35FILES_${PN} = ""
39FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" 36FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d"
40FILES_${PN}-service = "${sbindir}/service" 37FILES_${PN}-service = "${sbindir}/service"
41FILES_${PN}-update-rc.d = "${sbindir}/update-rc.d"
42 38
43ALLOW_EMPTY_${PN} = "1" 39ALLOW_EMPTY_${PN} = "1"
44 40
45RDEPENDS_${PN}-update-rc.d = "perl" 41RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service"
46RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"