mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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.
(From OE-Core rev: f25dd633fffe6560f191526d1869e657e129bad9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -7,7 +7,7 @@ SRC_URI = "file://init-boot.sh"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
|
||||
install -m 0755 ${S}/init-boot.sh ${D}/init
|
||||
|
||||
# Create device nodes expected by some kernels in initramfs
|
||||
# before even executing /init.
|
||||
|
||||
@@ -26,31 +26,31 @@ do_install() {
|
||||
install -d ${D}/init.d
|
||||
|
||||
# base
|
||||
install -m 0755 ${WORKDIR}/init ${D}/init
|
||||
install -m 0755 ${WORKDIR}/nfsrootfs ${D}/init.d/85-nfsrootfs
|
||||
install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs
|
||||
install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish
|
||||
install -m 0755 ${S}/init ${D}/init
|
||||
install -m 0755 ${S}/nfsrootfs ${D}/init.d/85-nfsrootfs
|
||||
install -m 0755 ${S}/rootfs ${D}/init.d/90-rootfs
|
||||
install -m 0755 ${S}/finish ${D}/init.d/99-finish
|
||||
|
||||
# exec
|
||||
install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec
|
||||
install -m 0755 ${S}/exec ${D}/init.d/89-exec
|
||||
|
||||
# mdev
|
||||
install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev
|
||||
install -m 0755 ${S}/mdev ${D}/init.d/01-mdev
|
||||
|
||||
# udev
|
||||
install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev
|
||||
install -m 0755 ${S}/udev ${D}/init.d/01-udev
|
||||
|
||||
# e2fs
|
||||
install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs
|
||||
install -m 0755 ${S}/e2fs ${D}/init.d/10-e2fs
|
||||
|
||||
# debug
|
||||
install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug
|
||||
install -m 0755 ${S}/debug ${D}/init.d/00-debug
|
||||
|
||||
# lvm
|
||||
install -m 0755 ${WORKDIR}/lvm ${D}/init.d/09-lvm
|
||||
install -m 0755 ${S}/lvm ${D}/init.d/09-lvm
|
||||
|
||||
# overlayroot needs to run after rootfs module but before finish
|
||||
install -m 0755 ${WORKDIR}/overlayroot ${D}/init.d/91-overlayroot
|
||||
install -m 0755 ${S}/overlayroot ${D}/init.d/91-overlayroot
|
||||
|
||||
# Create device nodes expected by some kernels in initramfs
|
||||
# before even executing /init.
|
||||
|
||||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
|
||||
install -m 0755 ${S}/init-live.sh ${D}/init
|
||||
install -d ${D}/dev
|
||||
mknod -m 622 ${D}/dev/console c 5 1
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
|
||||
install -m 0755 ${S}/init-live.sh ${D}/init
|
||||
install -d ${D}/dev
|
||||
mknod -m 622 ${D}/dev/console c 5 1
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh
|
||||
install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh
|
||||
}
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
@@ -10,7 +10,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh
|
||||
install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh
|
||||
}
|
||||
|
||||
# While this package maybe an allarch due to it being a
|
||||
|
||||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh
|
||||
install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh
|
||||
}
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIM
|
||||
RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh
|
||||
install -m 0755 ${S}/init-install.sh ${D}/install.sh
|
||||
}
|
||||
|
||||
# While this package maybe an allarch due to it being a
|
||||
|
||||
@@ -11,7 +11,7 @@ S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/init.d
|
||||
install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh
|
||||
install -m 0755 ${S}/init-install-efi.sh ${D}/init.d/install-efi.sh
|
||||
}
|
||||
|
||||
FILES:${PN} = "/init.d/install-efi.sh"
|
||||
|
||||
@@ -16,7 +16,7 @@ S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/init.d
|
||||
install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
|
||||
install -m 0755 ${S}/init-install.sh ${D}/init.d/install.sh
|
||||
}
|
||||
|
||||
FILES:${PN} = "/init.d/install.sh"
|
||||
|
||||
@@ -13,7 +13,7 @@ S = "${WORKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/init.d
|
||||
install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live
|
||||
install -m 0755 ${S}/setup-live ${D}/init.d/80-setup-live
|
||||
}
|
||||
|
||||
FILES:${PN} = "/init.d/80-setup-live"
|
||||
|
||||
Reference in New Issue
Block a user