diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2015-02-21 16:28:42 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-24 17:41:44 +0000 |
commit | d861cc4b0493954355b32035c084bfed47d455ac (patch) | |
tree | 57b1d5c621e49b2ba2188152702e1559f02a2c89 /meta | |
parent | f7c45a4f747131c0c36bf3e278247746dacc6592 (diff) | |
download | poky-d861cc4b0493954355b32035c084bfed47d455ac.tar.gz |
recipes: Delete superfluous assignments, S = ${WORKDIR}/${BP}
Given that bitbake.conf sets the default values:
BP = "${BPN}-${PV}"
S = "${WORKDIR}/${BP}"
there are a number of recipes that set the variable S completely
superfluously, so get rid of them.
(From OE-Core rev: ebe8578df3f162045086cd60a129eb7ac3eacf4c)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/readline/readline.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/readline/readline_5.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-7.8.1.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.2.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_4.8.bb | 1 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_5.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/taglib/taglib_1.9.1.bb | 2 |
11 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 0ce3b519e6..3f662c3070 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -16,8 +16,6 @@ SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \ | |||
16 | file://config-dirent-symbols.patch \ | 16 | file://config-dirent-symbols.patch \ |
17 | file://norpath.patch" | 17 | file://norpath.patch" |
18 | 18 | ||
19 | S = "${WORKDIR}/${BPN}-${PV}" | ||
20 | |||
21 | inherit autotools texinfo | 19 | inherit autotools texinfo |
22 | 20 | ||
23 | EXTRA_AUTORECONF += "--exclude=autoheader" | 21 | EXTRA_AUTORECONF += "--exclude=autoheader" |
diff --git a/meta/recipes-core/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb index fe610e3964..c1007a2311 100644 --- a/meta/recipes-core/readline/readline_5.2.bb +++ b/meta/recipes-core/readline/readline_5.2.bb | |||
@@ -63,8 +63,6 @@ SRC_URI[patch13.sha256sum] = "0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060 | |||
63 | SRC_URI[patch14.md5sum] = "a1be30e1c6f1099bb5fcef00a2631fb8" | 63 | SRC_URI[patch14.md5sum] = "a1be30e1c6f1099bb5fcef00a2631fb8" |
64 | SRC_URI[patch14.sha256sum] = "6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817" | 64 | SRC_URI[patch14.sha256sum] = "6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817" |
65 | 65 | ||
66 | S = "${WORKDIR}/${BPN}-${PV}" | ||
67 | |||
68 | inherit autotools | 66 | inherit autotools |
69 | 67 | ||
70 | EXTRA_AUTORECONF += "--exclude=autoheader" | 68 | EXTRA_AUTORECONF += "--exclude=autoheader" |
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index eb47dada5d..7df8efa050 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -9,8 +9,6 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte | |||
9 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" | 9 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" |
10 | RDEPENDS_${PN}_class-native = "xz-native" | 10 | RDEPENDS_${PN}_class-native = "xz-native" |
11 | 11 | ||
12 | S = "${WORKDIR}/${BPN}-${PV}" | ||
13 | |||
14 | inherit autotools gettext perlnative pkgconfig systemd | 12 | inherit autotools gettext perlnative pkgconfig systemd |
15 | 13 | ||
16 | python () { | 14 | python () { |
diff --git a/meta/recipes-devtools/gdb/gdb-7.8.1.inc b/meta/recipes-devtools/gdb/gdb-7.8.1.inc index 6fa13bc582..510ea18945 100644 --- a/meta/recipes-devtools/gdb/gdb-7.8.1.inc +++ b/meta/recipes-devtools/gdb/gdb-7.8.1.inc | |||
@@ -4,8 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | 4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ |
5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" | 5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" |
6 | 6 | ||
7 | S = "${WORKDIR}/${BPN}-${PV}" | ||
8 | |||
9 | SRC_URI[md5sum] = "997492cc3475c96f35ecc8775248c9b1" | 7 | SRC_URI[md5sum] = "997492cc3475c96f35ecc8775248c9b1" |
10 | SRC_URI[sha256sum] = "d7a923d876ecfa1cec4c1c79c014c9d8e58783a25855a95cf260275f61990647" | 8 | SRC_URI[sha256sum] = "d7a923d876ecfa1cec4c1c79c014c9d8e58783a25855a95cf260275f61990647" |
11 | 9 | ||
diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb index ef0019fc7d..48a2f935be 100644 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb | |||
@@ -18,8 +18,6 @@ SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz" | |||
18 | SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2" | 18 | SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2" |
19 | SRC_URI[sha256sum] = "ea2615a62c74bea6ce3b38402f00c7513858f307f6ba7aa9fdbf0bbc12bcf407" | 19 | SRC_URI[sha256sum] = "ea2615a62c74bea6ce3b38402f00c7513858f307f6ba7aa9fdbf0bbc12bcf407" |
20 | 20 | ||
21 | S = "${WORKDIR}/${BPN}-${PV}" | ||
22 | |||
23 | inherit autotools | 21 | inherit autotools |
24 | do_configure_prepend () { | 22 | do_configure_prepend () { |
25 | mkdir -p scripts/.autostuff/m4 | 23 | mkdir -p scripts/.autostuff/m4 |
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb index 4051b7221e..8455eac78d 100644 --- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb | |||
@@ -19,8 +19,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz | |||
19 | file://0001-opkg-key-Backport-improvements.patch \ | 19 | file://0001-opkg-key-Backport-improvements.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | S = "${WORKDIR}/${BPN}-${PV}" | ||
23 | |||
24 | SRC_URI[md5sum] = "40ed2aee15abc8d550539449630091bd" | 22 | SRC_URI[md5sum] = "40ed2aee15abc8d550539449630091bd" |
25 | SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086" | 23 | SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086" |
26 | 24 | ||
diff --git a/meta/recipes-extended/texinfo/texinfo_4.8.bb b/meta/recipes-extended/texinfo/texinfo_4.8.bb index 6b36b97603..13678e093b 100644 --- a/meta/recipes-extended/texinfo/texinfo_4.8.bb +++ b/meta/recipes-extended/texinfo/texinfo_4.8.bb | |||
@@ -26,7 +26,6 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ | |||
26 | SRC_URI[md5sum] = "4e9a1a591ed236003d0d4b008bf07eef" | 26 | SRC_URI[md5sum] = "4e9a1a591ed236003d0d4b008bf07eef" |
27 | SRC_URI[sha256sum] = "1f3cdeebe65fdf510f55d765ab1031b54416aa5bc2635b6a54ef9bcb2367c917" | 27 | SRC_URI[sha256sum] = "1f3cdeebe65fdf510f55d765ab1031b54416aa5bc2635b6a54ef9bcb2367c917" |
28 | 28 | ||
29 | S = "${WORKDIR}/${BP}" | ||
30 | tex_texinfo = "texmf/tex/texinfo" | 29 | tex_texinfo = "texmf/tex/texinfo" |
31 | 30 | ||
32 | inherit gettext autotools | 31 | inherit gettext autotools |
diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_5.2.bb index d50a86e781..8dbcaa14f4 100644 --- a/meta/recipes-extended/texinfo/texinfo_5.2.bb +++ b/meta/recipes-extended/texinfo/texinfo_5.2.bb | |||
@@ -40,7 +40,6 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ | |||
40 | SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db" | 40 | SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db" |
41 | SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74" | 41 | SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74" |
42 | 42 | ||
43 | S = "${WORKDIR}/${BP}" | ||
44 | tex_texinfo = "texmf/tex/texinfo" | 43 | tex_texinfo = "texmf/tex/texinfo" |
45 | 44 | ||
46 | inherit gettext autotools | 45 | inherit gettext autotools |
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 59a04fa494..3529cb26ef 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc | |||
@@ -12,8 +12,6 @@ INC_PR = "r8" | |||
12 | 12 | ||
13 | SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" | 13 | SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" |
14 | 14 | ||
15 | S = "${WORKDIR}/${BPN}-${PV}" | ||
16 | |||
17 | inherit autotools pkgconfig distro_features_check | 15 | inherit autotools pkgconfig distro_features_check |
18 | 16 | ||
19 | FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" | 17 | FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" |
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 7a710dc532..7ddd1c7da5 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -11,8 +11,6 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros" | |||
11 | 11 | ||
12 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" | 12 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" |
13 | 13 | ||
14 | S = "${WORKDIR}/${BPN}-${PV}" | ||
15 | |||
16 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" | 14 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" |
17 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" | 15 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" |
18 | 16 | ||
diff --git a/meta/recipes-support/taglib/taglib_1.9.1.bb b/meta/recipes-support/taglib/taglib_1.9.1.bb index 55e345f1cc..746ed7e0c0 100644 --- a/meta/recipes-support/taglib/taglib_1.9.1.bb +++ b/meta/recipes-support/taglib/taglib_1.9.1.bb | |||
@@ -12,8 +12,6 @@ SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" | |||
12 | SRC_URI[md5sum] = "0d35df96822bbd564c5504cb3c2e4d86" | 12 | SRC_URI[md5sum] = "0d35df96822bbd564c5504cb3c2e4d86" |
13 | SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a" | 13 | SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a" |
14 | 14 | ||
15 | S = "${WORKDIR}/${BP}" | ||
16 | |||
17 | BINCONFIG = "${bindir}/taglib-config" | 15 | BINCONFIG = "${bindir}/taglib-config" |
18 | 16 | ||
19 | inherit cmake pkgconfig binconfig-disabled | 17 | inherit cmake pkgconfig binconfig-disabled |