Skip to contentSkip to conversation

initscripts/init-system-helpers: fix mountnfs.sh dependency

PATCH In review Jens Rehsack 2 participants 3 messages Jun 2, 2020 – Jun 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 initscripts/init-system-helpers: fix mountnfs.sh dependency

With commit c9fc9110be33fe0f24bc3a7c242b584a4ca33e04
Author: Yue Tao <[email protected]>
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.

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../initscripts/init-system-helpers_1.57.bb   | 46 +++++++++++++++++++
 .../initscripts/initscripts_1.0.bb            |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 meta/recipes-core/initscripts/init-system-helpers_1.57.bb
meta/conf/distro/include/maintainers.inc +1 -0
index 51e6da669c..adac9fd824 100644
@@ -265,6 +265,7 @@ RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <[email protected]>"
 RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER_pn-init-system-helpers = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-live-boot = "Anuj Mittal <[email protected]>"
meta/recipes-core/initscripts/init-system-helpers_1.57.bb new file +46 -0

46 lines not on this page · raw message

meta/recipes-core/initscripts/initscripts_1.0.bb +1 -0
index 1a59b82fbf..4080c4a495 100644
@@ -50,6 +50,7 @@ PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','
 PACKAGES =+ "${PN}-functions ${PN}-sushell"
 RDEPENDS_${PN} = "initd-functions \
                   ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
+                  init-system-helpers-service \
 		 "
 # Recommend pn-functions so that it will be a preferred default provider for initd-functions
 RRECOMMENDS_${PN} = "${PN}-functions"
Signature · 1 line
2.17.1
#1 lore raw

PATCH v4 2/2 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.

---
 .../recipes-core/initscripts/init-system-helpers_1.57.bb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
meta/recipes-core/initscripts/init-system-helpers_1.57.bb +2 -7
index d41bb94791..46f5bbf442 100644
@@ -16,8 +16,6 @@ SECTION = "base"
 LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072"
 
-DEPENDS = "perl"
-
 SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726"
 SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git"
 
@@ -30,17 +28,14 @@ do_install() {
 	install -d -m 0755 ${D}${sbindir}
 	install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir}
 	install -m 0755 ${S}/script/service ${D}${sbindir}
-	install -m 0755 ${S}/script/update-rc.d ${D}${sbindir}
 }
 
-PACKAGES += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
+PACKAGES += "${PN}-invoke-rc.d ${PN}-service"
 
 FILES_${PN} = ""
 FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d"
 FILES_${PN}-service = "${sbindir}/service"
-FILES_${PN}-update-rc.d = "${sbindir}/update-rc.d"
 
 ALLOW_EMPTY_${PN} = "1"
 
-RDEPENDS_${PN}-update-rc.d = "perl"
-RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
+RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service"
Signature · 1 line
2.17.1
#2 lore raw
In reply to Jens Rehsack
Quoted 55 lines · Jens Rehsack

With commit c9fc9110be33fe0f24bc3a7c242b584a4ca33e04
Author: Yue Tao <[email protected]>
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.

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../initscripts/init-system-helpers_1.57.bb   | 46 +++++++++++++++++++
 .../initscripts/initscripts_1.0.bb            |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 meta/recipes-core/initscripts/init-system-helpers_1.57.bb
meta/conf/distro/include/maintainers.inc +1 -0
index 51e6da669c..adac9fd824 100644
@@ -265,6 +265,7 @@ RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <[email protected]>"
 RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER_pn-init-system-helpers = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-live-boot = "Anuj Mittal <[email protected]>"
meta/recipes-core/initscripts/init-system-helpers_1.57.bb new file +12 -0
new file mode 100644
index 0000000000..d41bb94791
@@ -0,0 +1,46 @@
+SUMMARY = "helper tools for all init systems"
+DESCRIPTION = "This package contains helper tools that are necessary for switching between \
+the various init systems that Debian contains (e. g. sysvinit or \
+systemd). An example is deb-systemd-helper, a script that enables systemd unit \
+files without depending on a running systemd. \
+\
+It also includes the \"service\", \"invoke-rc.d\", and \"update-rc.d\" scripts which \
+provide an abstraction for enabling, disabling, starting, and stopping \
+services for all supported Debian init systems as specified by the policy. \
+\
+While this package is maintained by pkg-systemd-maintainers, it is NOT \
+specific to systemd at all. Maintainers of other init systems are welcome to \

meta/recipes-core/initscripts/init-system-helpers_1.57.bb line 22

Quoted 10 lines
meta/recipes-core/initscripts/init-system-helpers_1.57.bb new file +10 -0
+include their helpers in this package."
+HOMEPAGE = "https://salsa.debian.org/debian/init-system-helpers"
+SECTION = "base"
+LICENSE = "BSD-3-Clause & GPLv2"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072"
+
+DEPENDS = "perl"
+
+SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726"
+SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git"

I'm getting this:

WARNING: init-system-helpers-1.57-r0 do_fetch: Failed to fetch URL git://salsa.debian.org/debian/init-system-helpers.git, attempting MIRRORS if available

Quoted 41 lines
meta/recipes-core/initscripts/init-system-helpers_1.57.bb new file +24 -0
+
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install() {
+	install -d -m 0755 ${D}${sbindir}
+	install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir}
+	install -m 0755 ${S}/script/service ${D}${sbindir}
+	install -m 0755 ${S}/script/update-rc.d ${D}${sbindir}
+}
+
+PACKAGES += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
+
+FILES_${PN} = ""
+FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d"
+FILES_${PN}-service = "${sbindir}/service"
+FILES_${PN}-update-rc.d = "${sbindir}/update-rc.d"
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN}-update-rc.d = "perl"
+RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service ${PN}-update-rc.d"
meta/recipes-core/initscripts/initscripts_1.0.bb +1 -0
index 1a59b82fbf..4080c4a495 100644
@@ -50,6 +50,7 @@ PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','
 PACKAGES =+ "${PN}-functions ${PN}-sushell"
 RDEPENDS_${PN} = "initd-functions \
                   ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
+                  init-system-helpers-service \
 		 "
 # Recommend pn-functions so that it will be a preferred default provider for initd-functions
 RRECOMMENDS_${PN} = "${PN}-functions"
Signature · 1 line
2.17.1