summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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
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')
-rw-r--r--meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb2
-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
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
-rw-r--r--meta/recipes-core/systemd/systemd-systemctl-native.bb2
-rw-r--r--meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb2
-rw-r--r--meta/recipes-core/udev/udev-extraconf_1.1.bb2
12 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 3d88506c05..733ae41f20 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -16,6 +16,8 @@ SRC_URI = "file://copyright \
16 file://interfaces \ 16 file://interfaces \
17 file://nfsroot" 17 file://nfsroot"
18 18
19S = "${WORKDIR}"
20
19do_install () { 21do_install () {
20 install -d ${D}${sysconfdir}/init.d \ 22 install -d ${D}${sysconfdir}/init.d \
21 ${D}${sysconfdir}/network/if-pre-up.d \ 23 ${D}${sysconfdir}/network/if-pre-up.d \
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() {
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index afdc53830a..dfb75b261b 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -35,6 +35,8 @@ SRC_URI = "file://functions \
35 file://logrotate-dmesg.conf \ 35 file://logrotate-dmesg.conf \
36" 36"
37 37
38S = "${WORKDIR}"
39
38SRC_URI_append_arm = " file://alignment.sh" 40SRC_URI_append_arm = " file://alignment.sh"
39 41
40KERNEL_VERSION = "" 42KERNEL_VERSION = ""
diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/meta/recipes-core/systemd/systemd-systemctl-native.bb
index 72bc77df4f..fbdc9c0a18 100644
--- a/meta/recipes-core/systemd/systemd-systemctl-native.bb
+++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb
@@ -9,6 +9,8 @@ inherit native
9 9
10SRC_URI = "file://systemctl" 10SRC_URI = "file://systemctl"
11 11
12S = "${WORKDIR}"
13
12do_install() { 14do_install() {
13 install -d ${D}${bindir} 15 install -d ${D}${bindir}
14 install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} 16 install -m 0755 ${WORKDIR}/systemctl ${D}${bindir}
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 657ef02204..eed2104f65 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -6,7 +6,7 @@ PR = "r10"
6 6
7SRC_URI = "file://inittab" 7SRC_URI = "file://inittab"
8 8
9S = "${WORKDIR}/sysvinit-${PV}" 9S = "${WORKDIR}"
10 10
11INHIBIT_DEFAULT_DEPS = "1" 11INHIBIT_DEFAULT_DEPS = "1"
12 12
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb
index d69056dd76..6fbd92548a 100644
--- a/meta/recipes-core/udev/udev-extraconf_1.1.bb
+++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb
@@ -13,6 +13,8 @@ SRC_URI = " \
13 file://localextra.rules \ 13 file://localextra.rules \
14" 14"
15 15
16S = "${WORKDIR}"
17
16 18
17do_install() { 19do_install() {
18 install -d ${D}${sysconfdir}/udev/rules.d 20 install -d ${D}${sysconfdir}/udev/rules.d