diff options
Diffstat (limited to 'meta/recipes-core/initscripts/initscripts_1.0.bb')
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 32c527799e..e61ac554f3 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -2,9 +2,8 @@ SUMMARY = "SysV init scripts" HOMEPAGE = "https://github.com/fedora-sysv/initscripts" DESCRIPTION = "Initscripts provide the basic system startup initialization scripts for the system. These scripts include actions such as filesystem mounting, fsck, RTC manipulation and other actions routinely performed at system startup. In addition, the scripts are also used during system shutdown to reverse the actions performed at startup." SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r155" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://functions;beginline=7;endline=7;md5=829e563511c9a1d6d41f17a7a4989d6a" INHIBIT_DEFAULT_DEPS = "1" @@ -31,7 +30,6 @@ SRC_URI = "file://functions \ file://read-only-rootfs-hook.sh \ file://volatiles \ file://save-rtc.sh \ - file://GPLv2.patch \ file://dmesg.sh \ file://logrotate-dmesg.conf \ ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ @@ -39,31 +37,33 @@ SRC_URI = "file://functions \ S = "${WORKDIR}" -SRC_URI_append_arm = " file://alignment.sh" -SRC_URI_append_armeb = " file://alignment.sh" +SRC_URI:append:arm = " file://alignment.sh" +SRC_URI:append:armeb = " file://alignment.sh" KERNEL_VERSION = "" -DEPENDS_append = " update-rc.d-native" -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" +DEPENDS:append = " update-rc.d-native" +PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell" -RDEPENDS_${PN} = "initd-functions \ +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" -RPROVIDES_${PN}-functions = "initd-functions" -RCONFLICTS_${PN}-functions = "lsbinitscripts" -FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" -FILES_${PN}-sushell = "${base_sbindir}/sushell" +RRECOMMENDS:${PN} = "${PN}-functions" +RPROVIDES:${PN}-functions = "initd-functions" +RCONFLICTS:${PN}-functions = "lsbinitscripts" +FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" +FILES:${PN}-sushell = "${base_sbindir}/sushell" HALTARGS ?= "-d -f" +VARLIBMOUNTARGS ?= "" do_configure() { sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot + sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh } do_install () { @@ -106,7 +106,11 @@ do_install () { install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then - echo "l root root 0755 /var/log /var/volatile/log" >> ${D}${sysconfdir}/default/volatiles/00_core + sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ + ${D}${sysconfdir}/default/volatiles/00_core + fi + if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then + sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core fi install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ @@ -130,13 +134,13 @@ do_install () { update-rc.d -r ${D} rmnologin.sh start 99 2 3 4 5 . update-rc.d -r ${D} sendsigs start 20 0 6 . update-rc.d -r ${D} urandom start 38 S 0 6 . - update-rc.d -r ${D} umountnfs.sh start 31 0 1 6 . + update-rc.d -r ${D} umountnfs.sh stop 31 0 1 6 . update-rc.d -r ${D} umountfs start 40 0 6 . update-rc.d -r ${D} reboot start 90 6 . update-rc.d -r ${D} halt start 90 0 . update-rc.d -r ${D} save-rtc.sh start 25 0 6 . update-rc.d -r ${D} banner.sh start 02 S . - update-rc.d -r ${D} checkroot.sh start 06 S . + update-rc.d -r ${D} checkroot.sh start 05 S . update-rc.d -r ${D} mountall.sh start 03 S . update-rc.d -r ${D} hostname.sh start 39 S . update-rc.d -r ${D} mountnfs.sh start 15 2 3 4 5 . @@ -169,7 +173,7 @@ MASKED_SCRIPTS = " \ sysfs \ urandom" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if type systemctl >/dev/null 2>/dev/null; then if [ -n "$D" ]; then OPTS="--root=$D" @@ -185,4 +189,4 @@ pkg_postinst_${PN} () { fi } -CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" +CONFFILES:${PN} += "${sysconfdir}/init.d/checkroot.sh" |