diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-01 22:50:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-02 15:15:26 +0100 |
| commit | f25dd633fffe6560f191526d1869e657e129bad9 (patch) | |
| tree | d49fa26293f1dca91ca1b00235b19b6579784379 /meta/recipes-core/initscripts | |
| parent | 86fec41b1e809d1a2fa2feadc26d29020df53d39 (diff) | |
| download | openembedded-core-f25dd633fffe6560f191526d1869e657e129bad9.tar.gz | |
recipes: Update S = WORKDIR recipes to use ${S} correctly
Where recipes use S = ${WORKDIR}, ensure they are referencing ${S} correctly
to access files as soon we want to stop doing this in WORKDIR at which point
they would break unless corrected.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initscripts')
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index e61ac554f3..68eeb5e117 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -61,9 +61,9 @@ 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 + sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/halt + sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/reboot + sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${S}/read-only-rootfs-hook.sh } do_install () { @@ -84,27 +84,27 @@ do_install () { # Holds state information pertaining to urandom install -d ${D}${localstatedir}/lib/urandom - install -m 0644 ${WORKDIR}/functions ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d + install -m 0644 ${S}/functions ${D}${sysconfdir}/init.d + install -m 0755 ${S}/bootmisc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/checkroot.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/halt ${D}${sysconfdir}/init.d + install -m 0755 ${S}/hostname.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/mountall.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/mountnfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/reboot ${D}${sysconfdir}/init.d + install -m 0755 ${S}/rmnologin.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/sendsigs ${D}${sysconfdir}/init.d + install -m 0755 ${S}/single ${D}${sysconfdir}/init.d + install -m 0755 ${S}/umountnfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/urandom ${D}${sysconfdir}/init.d sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' - install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core + install -m 0755 ${S}/devpts.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/devpts ${D}${sysconfdir}/default + install -m 0755 ${S}/sysfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/populate-volatile.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/save-rtc.sh ${D}${sysconfdir}/init.d + install -m 0644 ${S}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then 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 @@ -112,22 +112,22 @@ do_install () { 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}/ + install -m 0755 ${S}/dmesg.sh ${D}${sysconfdir}/init.d + install -m 0644 ${S}/logrotate-dmesg.conf ${D}${sysconfdir}/ if [ "${TARGET_ARCH}" = "arm" ]; then - install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d + install -m 0755 ${S}/alignment.sh ${D}${sysconfdir}/init.d fi if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then install -d ${D}/${base_sbindir} - install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} + install -m 0755 ${S}/sushell ${D}/${base_sbindir} fi # # Install device dependent scripts # - install -m 0755 ${WORKDIR}/banner.sh ${D}${sysconfdir}/init.d/banner.sh - install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs + install -m 0755 ${S}/banner.sh ${D}${sysconfdir}/init.d/banner.sh + install -m 0755 ${S}/umountfs ${D}${sysconfdir}/init.d/umountfs # # Create runlevel links # |