summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/initscripts')
-rw-r--r--meta/recipes-core/initscripts/init-system-helpers_1.68.bb (renamed from meta/recipes-core/initscripts/init-system-helpers_1.66.bb)4
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/functions21
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb65
3 files changed, 54 insertions, 36 deletions
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.66.bb b/meta/recipes-core/initscripts/init-system-helpers_1.68.bb
index 64e08aae68..48ac7792d3 100644
--- a/meta/recipes-core/initscripts/init-system-helpers_1.66.bb
+++ b/meta/recipes-core/initscripts/init-system-helpers_1.68.bb
@@ -16,12 +16,10 @@ SECTION = "base"
16LICENSE = "BSD-3-Clause & GPL-2.0-only" 16LICENSE = "BSD-3-Clause & GPL-2.0-only"
17LIC_FILES_CHKSUM = "file://debian/copyright;md5=c4ec20aa158fa9de26ee1accf78dcaae" 17LIC_FILES_CHKSUM = "file://debian/copyright;md5=c4ec20aa158fa9de26ee1accf78dcaae"
18 18
19SRCREV = "a5439f465dc1d1d4e12329208dc321fb806009f4" 19SRCREV = "78486a4a2a305170b66ce4d907bedadbaed10daf"
20SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master" 20SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master"
21UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))(?!_exp)" 21UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))(?!_exp)"
22 22
23S = "${WORKDIR}/git"
24
25do_configure[noexec] = "1" 23do_configure[noexec] = "1"
26do_compile[noexec] = "1" 24do_compile[noexec] = "1"
27 25
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/functions b/meta/recipes-core/initscripts/initscripts-1.0/functions
index 35aebd4a55..7fc19c808b 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/functions
+++ b/meta/recipes-core/initscripts/initscripts-1.0/functions
@@ -92,3 +92,24 @@ passed() {
92 echo -n -e "${BRACKET}[${SUCCESS} PASS ${BRACKET}]${NORMAL}" 92 echo -n -e "${BRACKET}[${SUCCESS} PASS ${BRACKET}]${NORMAL}"
93 return $rc 93 return $rc
94} 94}
95
96log_success_msg()
97{
98 echo -n $@
99 success
100 echo
101}
102
103log_failure_msg()
104{
105 echo -n $@
106 failure
107 echo
108}
109
110log_warning_msg()
111{
112 echo -n $@
113 warning
114 echo
115}
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e61ac554f3..c984257c5c 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -35,7 +35,7 @@ SRC_URI = "file://functions \
35 ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \
36" 36"
37 37
38S = "${WORKDIR}" 38S = "${UNPACKDIR}"
39 39
40SRC_URI:append:arm = " file://alignment.sh" 40SRC_URI:append:arm = " file://alignment.sh"
41SRC_URI:append:armeb = " file://alignment.sh" 41SRC_URI:append:armeb = " file://alignment.sh"
@@ -53,7 +53,6 @@ RDEPENDS:${PN} = "initd-functions \
53# Recommend pn-functions so that it will be a preferred default provider for initd-functions 53# Recommend pn-functions so that it will be a preferred default provider for initd-functions
54RRECOMMENDS:${PN} = "${PN}-functions" 54RRECOMMENDS:${PN} = "${PN}-functions"
55RPROVIDES:${PN}-functions = "initd-functions" 55RPROVIDES:${PN}-functions = "initd-functions"
56RCONFLICTS:${PN}-functions = "lsbinitscripts"
57FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" 56FILES:${PN}-functions = "${sysconfdir}/init.d/functions*"
58FILES:${PN}-sushell = "${base_sbindir}/sushell" 57FILES:${PN}-sushell = "${base_sbindir}/sushell"
59 58
@@ -61,9 +60,9 @@ HALTARGS ?= "-d -f"
61VARLIBMOUNTARGS ?= "" 60VARLIBMOUNTARGS ?= ""
62 61
63do_configure() { 62do_configure() {
64 sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt 63 sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/halt
65 sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot 64 sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/reboot
66 sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh 65 sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${S}/read-only-rootfs-hook.sh
67} 66}
68 67
69do_install () { 68do_install () {
@@ -84,50 +83,50 @@ do_install () {
84 # Holds state information pertaining to urandom 83 # Holds state information pertaining to urandom
85 install -d ${D}${localstatedir}/lib/urandom 84 install -d ${D}${localstatedir}/lib/urandom
86 85
87 install -m 0644 ${WORKDIR}/functions ${D}${sysconfdir}/init.d 86 install -m 0644 ${S}/functions ${D}${sysconfdir}/init.d
88 install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d 87 install -m 0755 ${S}/bootmisc.sh ${D}${sysconfdir}/init.d
89 install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d 88 install -m 0755 ${S}/checkroot.sh ${D}${sysconfdir}/init.d
90 install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d 89 install -m 0755 ${S}/halt ${D}${sysconfdir}/init.d
91 install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d 90 install -m 0755 ${S}/hostname.sh ${D}${sysconfdir}/init.d
92 install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d 91 install -m 0755 ${S}/mountall.sh ${D}${sysconfdir}/init.d
93 install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d 92 install -m 0755 ${S}/mountnfs.sh ${D}${sysconfdir}/init.d
94 install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d 93 install -m 0755 ${S}/reboot ${D}${sysconfdir}/init.d
95 install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d 94 install -m 0755 ${S}/rmnologin.sh ${D}${sysconfdir}/init.d
96 install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d 95 install -m 0755 ${S}/sendsigs ${D}${sysconfdir}/init.d
97 install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d 96 install -m 0755 ${S}/single ${D}${sysconfdir}/init.d
98 install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d 97 install -m 0755 ${S}/umountnfs.sh ${D}${sysconfdir}/init.d
99 install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d 98 install -m 0755 ${S}/urandom ${D}${sysconfdir}/init.d
100 sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' 99 sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g'
101 install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d 100 install -m 0755 ${S}/devpts.sh ${D}${sysconfdir}/init.d
102 install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default 101 install -m 0755 ${S}/devpts ${D}${sysconfdir}/default
103 install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d 102 install -m 0755 ${S}/sysfs.sh ${D}${sysconfdir}/init.d
104 install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d 103 install -m 0755 ${S}/populate-volatile.sh ${D}${sysconfdir}/init.d
105 install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d 104 install -m 0755 ${S}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d
106 install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d 105 install -m 0755 ${S}/save-rtc.sh ${D}${sysconfdir}/init.d
107 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core 106 install -m 0644 ${S}/volatiles ${D}${sysconfdir}/default/volatiles/00_core
108 if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then 107 if ${@bb.utils.contains('FILESYSTEM_PERMS_TABLES', 'files/fs-perms-volatile-log.txt', 'true', 'false', d)}; then
109 sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ 108 sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \
110 ${D}${sysconfdir}/default/volatiles/00_core 109 ${D}${sysconfdir}/default/volatiles/00_core
111 fi 110 fi
112 if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then 111 if ! ${@bb.utils.contains('FILESYSTEM_PERMS_TABLES', 'files/fs-perms-volatile-tmp.txt', 'true', 'false', d)}; then
113 sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core 112 sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core
114 fi 113 fi
115 install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d 114 install -m 0755 ${S}/dmesg.sh ${D}${sysconfdir}/init.d
116 install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ 115 install -m 0644 ${S}/logrotate-dmesg.conf ${D}${sysconfdir}/
117 116
118 if [ "${TARGET_ARCH}" = "arm" ]; then 117 if [ "${TARGET_ARCH}" = "arm" ]; then
119 install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d 118 install -m 0755 ${S}/alignment.sh ${D}${sysconfdir}/init.d
120 fi 119 fi
121 120
122 if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then 121 if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then
123 install -d ${D}/${base_sbindir} 122 install -d ${D}/${base_sbindir}
124 install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} 123 install -m 0755 ${S}/sushell ${D}/${base_sbindir}
125 fi 124 fi
126# 125#
127# Install device dependent scripts 126# Install device dependent scripts
128# 127#
129 install -m 0755 ${WORKDIR}/banner.sh ${D}${sysconfdir}/init.d/banner.sh 128 install -m 0755 ${S}/banner.sh ${D}${sysconfdir}/init.d/banner.sh
130 install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs 129 install -m 0755 ${S}/umountfs ${D}${sysconfdir}/init.d/umountfs
131# 130#
132# Create runlevel links 131# Create runlevel links
133# 132#
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-03 22:37:23 +0000