summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts
diff options
context:
space:
mode:
authorPetter Mabäcker <petter@technux.se>2015-01-06 22:29:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:27 +0000
commit4eb3db9a2ca8eaff64b64b8f56dac25d4734571c (patch)
tree000a810f0f115a87e20469d144f93ac08f30c8c1 /meta/recipes-core/initrdscripts
parent00fbca6950505446748580fe58bd64ab673d5cc9 (diff)
downloadpoky-4eb3db9a2ca8eaff64b64b8f56dac25d4734571c.tar.gz
meta: set proper S value
After removal of auto-creating S we must ensure that all recipes are using a proper value for S. Fix all recipes that only need to set S equals to WORKDIR. [YOCTO #5627] (From OE-Core rev: 9d220b1bfe4589736604dd5a7129e3699377d830) Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb2
7 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index 0ede20b15d..7ae7969f5e 100644
--- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
@@ -5,6 +5,8 @@ SRC_URI = "file://init-boot.sh"
5 5
6PR = "r2" 6PR = "r2"
7 7
8S = "${WORKDIR}"
9
8do_install() { 10do_install() {
9 install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init 11 install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
10} 12}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 403127be09..89b900dba9 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -14,6 +14,8 @@ SRC_URI = "file://init \
14 file://e2fs \ 14 file://e2fs \
15 file://debug" 15 file://debug"
16 16
17S = "${WORKDIR}"
18
17do_install() { 19do_install() {
18 install -d ${D}/init.d 20 install -d ${D}/init.d
19 21
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index ac54902415..b54cb619f1 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -7,6 +7,8 @@ SRC_URI = "file://init-live.sh"
7 7
8PR = "r12" 8PR = "r12"
9 9
10S = "${WORKDIR}"
11
10do_install() { 12do_install() {
11 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init 13 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
12} 14}
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
index a54960c596..c03bd2d765 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
@@ -5,6 +5,8 @@ SRC_URI = "file://init-install-efi-testfs.sh"
5 5
6RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" 6RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
7 7
8S = "${WORKDIR}"
9
8do_install() { 10do_install() {
9 install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh 11 install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh
10} 12}
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
index 7195dc2718..b0994d78c3 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
@@ -7,6 +7,8 @@ PR = "r1"
7 7
8RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" 8RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
9 9
10S = "${WORKDIR}"
11
10do_install() { 12do_install() {
11 install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh 13 install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh
12} 14}
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
index db4cf544e8..937bfd4d38 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
@@ -5,6 +5,8 @@ SRC_URI = "file://init-install-testfs.sh"
5 5
6RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" 6RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
7 7
8S = "${WORKDIR}"
9
8do_install() { 10do_install() {
9 install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh 11 install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh
10} 12}
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 7bf31c9cf8..6241a90e20 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -5,6 +5,8 @@ SRC_URI = "file://init-install.sh"
5 5
6PR = "r9" 6PR = "r9"
7 7
8S = "${WORKDIR}"
9
8RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" 10RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
9 11
10do_install() { 12do_install() {