summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2020-06-02 15:42:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:32 +0100
commit850abc548b46f0c41ac92f18cb6659aeda461530 (patch)
tree8b071a75a969ba829fc5cc16ba58711a16ca2e13 /meta
parente0b8083761fc1512227f1589fadb03a36243eb88 (diff)
downloadpoky-850abc548b46f0c41ac92f18cb6659aeda461530.tar.gz
initscripts/init-system-helpers: fix mountnfs.sh dependency
With commit c9fc9110be33fe0f24bc3a7c242b584a4ca33e04 Author: Yue Tao <Yue.Tao@windriver.com> Date: Fri May 25 10:48:08 2018 +0800 initscripts: Avoid starting rpcbind daemon twice Check the status before start it to avoid duplicates. the use of a script {/usr/sbin/}service is introduced - maybe earlier provided by systemd, nowadays mostly by init-system-helpers from debian project. For the very first shot, maybe discussions and improvements based on that script collection, use just the init-system-helpers-service in initscripts/mountnfs.sh to avoid problems mounting NFS in later boot stage. (From OE-Core rev: db690c3bf4664ce71fc21650fbcd8b6ac2eb71f1) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-core/initscripts/init-system-helpers_1.57.bb46
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb1
3 files changed, 48 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index dc20126d9b..6496a48e40 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -264,6 +264,7 @@ RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <alex.kanavin@gmail.com>"
264RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" 264RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>"
265RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <trini@konsulko.com>" 265RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <trini@konsulko.com>"
266RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" 266RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>"
267RECIPE_MAINTAINER_pn-init-system-helpers = "Anuj Mittal <anuj.mittal@intel.com>"
267RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <otavio.salvador@ossystems.com.br>" 268RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <otavio.salvador@ossystems.com.br>"
268RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <otavio.salvador@ossystems.com.br>" 269RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <otavio.salvador@ossystems.com.br>"
269RECIPE_MAINTAINER_pn-initramfs-live-boot = "Anuj Mittal <anuj.mittal@intel.com>" 270RECIPE_MAINTAINER_pn-initramfs-live-boot = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.57.bb b/meta/recipes-core/initscripts/init-system-helpers_1.57.bb
new file mode 100644
index 0000000000..d41bb94791
--- /dev/null
+++ b/meta/recipes-core/initscripts/init-system-helpers_1.57.bb
@@ -0,0 +1,46 @@
1SUMMARY = "helper tools for all init systems"
2DESCRIPTION = "This package contains helper tools that are necessary for switching between \
3the various init systems that Debian contains (e. g. sysvinit or \
4systemd). An example is deb-systemd-helper, a script that enables systemd unit \
5files without depending on a running systemd. \
6\
7It also includes the \"service\", \"invoke-rc.d\", and \"update-rc.d\" scripts which \
8provide an abstraction for enabling, disabling, starting, and stopping \
9services for all supported Debian init systems as specified by the policy. \
10\
11While this package is maintained by pkg-systemd-maintainers, it is NOT \
12specific to systemd at all. Maintainers of other init systems are welcome to \
13include their helpers in this package."
14HOMEPAGE = "https://salsa.debian.org/debian/init-system-helpers"
15SECTION = "base"
16LICENSE = "BSD-3-Clause & GPLv2"
17LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072"
18
19DEPENDS = "perl"
20
21SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726"
22SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git"
23
24S = "${WORKDIR}/git"
25
26do_configure[noexec] = "1"
27do_compile[noexec] = "1"
28
29do_install() {
30 install -d -m 0755 ${D}${sbindir}
31 install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir}
32 install -m 0755 ${S}/script/service ${D}${sbindir}
33 install -m 0755 ${S}/script/update-rc.d ${D}${sbindir}
34}
35
36PACKAGES += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
37
38FILES_${PN} = ""
39FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d"
40FILES_${PN}-service = "${sbindir}/service"
41FILES_${PN}-update-rc.d = "${sbindir}/update-rc.d"
42
43ALLOW_EMPTY_${PN} = "1"
44
45RDEPENDS_${PN}-update-rc.d = "perl"
46RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1a59b82fbf..4080c4a495 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -50,6 +50,7 @@ PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','
50PACKAGES =+ "${PN}-functions ${PN}-sushell" 50PACKAGES =+ "${PN}-functions ${PN}-sushell"
51RDEPENDS_${PN} = "initd-functions \ 51RDEPENDS_${PN} = "initd-functions \
52 ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ 52 ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
53 init-system-helpers-service \
53 " 54 "
54# Recommend pn-functions so that it will be a preferred default provider for initd-functions 55# Recommend pn-functions so that it will be a preferred default provider for initd-functions
55RRECOMMENDS_${PN} = "${PN}-functions" 56RRECOMMENDS_${PN} = "${PN}-functions"