summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-05 18:46:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:19 +0000
commite6cbda6419beb7b09a82325507f492f4f95e8776 (patch)
treef1e369b649a534f1f1a008fb6d5787f3cf235c91 /meta
parent2020ba7c48793c2a628d90b63fd91d5c283de5ca (diff)
downloadpoky-e6cbda6419beb7b09a82325507f492f4f95e8776.tar.gz
base: Improve makefile clean handling, introduce CLEANBROKEN variable
It turns out we have quite a number of Makefiles out there without a clean target. Rather than have all cases code an empty do_configure, add a CLEANBROKEN variable which when set to "1" will disable the attempt to "make clean". This patch also adjusts various recipes which either have this problem fixed, or have been reported to have make clean failures. (From OE-Core rev: 45b7d3add14eafc25da62bab68d4ae133f8dcb57) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass3
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_20120814.bb5
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_git.bb5
-rw-r--r--meta/recipes-extended/cups/cups.inc2
-rw-r--r--meta/recipes-extended/lsb/lsb_4.1.bb2
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev_1.6.inc2
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb2
-rw-r--r--meta/recipes-multimedia/flac/flac_1.3.0.bb2
8 files changed, 14 insertions, 9 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e1b25ff134..c135939709 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -217,6 +217,7 @@ python base_eventhandler() {
217} 217}
218 218
219CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" 219CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate"
220CLEANBROKEN = "0"
220 221
221addtask configure after do_patch 222addtask configure after do_patch
222do_configure[dirs] = "${S} ${B}" 223do_configure[dirs] = "${S} ${B}"
@@ -225,7 +226,7 @@ base_do_configure() {
225 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then 226 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then
226 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then 227 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then
227 cd ${B} 228 cd ${B}
228 if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then 229 if [ "${CLEANBROKEN}" != "1" -a -e Makefile -o -e makefile -o -e GNUmakefile ]; then
229 ${MAKE} clean 230 ${MAKE} clean
230 fi 231 fi
231 find ${B} -name \*.la -delete 232 find ${B} -name \*.la -delete
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
index 21d24f07ee..f5fce6f020 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
@@ -17,10 +17,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV
17SRC_URI[md5sum] = "bcfca5a2bb39edad4aae5a65efc84094" 17SRC_URI[md5sum] = "bcfca5a2bb39edad4aae5a65efc84094"
18SRC_URI[sha256sum] = "44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b" 18SRC_URI[sha256sum] = "44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b"
19 19
20# Disable default since make clean doesn't work 20CLEANBROKEN = "1"
21do_configure () {
22 :
23}
24 21
25do_compile() { 22do_compile() {
26 : 23 :
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index ef9e323349..754a99a4b0 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -17,10 +17,7 @@ SRC_URI = "git://git.sv.gnu.org/config.git \
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20# Disable default since make clean doesn't work 20CLEANBROKEN = "1"
21do_configure () {
22 :
23}
24 21
25do_compile() { 22do_compile() {
26 : 23 :
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index fbdc48eab1..945f69a2c4 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -15,6 +15,8 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
15 15
16LEAD_SONAME = "libcupsdriver.so" 16LEAD_SONAME = "libcupsdriver.so"
17 17
18CLEANBROKEN = "1"
19
18inherit autotools-brokensep binconfig useradd systemd 20inherit autotools-brokensep binconfig useradd systemd
19 21
20USERADD_PACKAGES = "${PN}" 22USERADD_PACKAGES = "${PN}"
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index d265731e04..e012497550 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -21,6 +21,8 @@ SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
21SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" 21SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
22S = "${WORKDIR}/lsb-release-1.4" 22S = "${WORKDIR}/lsb-release-1.4"
23 23
24CLEANBROKEN = "1"
25
24do_install(){ 26do_install(){
25 oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} 27 oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
26 28
diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
index 946faac7d2..6a93a35a39 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "eade38998313c25fd7934719cdf8a2ea"
9SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f" 9SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f"
10 10
11S = "${WORKDIR}/cryptodev-linux-${PV}" 11S = "${WORKDIR}/cryptodev-linux-${PV}"
12
13CLEANBROKEN = "1"
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index a107f804fa..a2f16d1406 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -34,6 +34,8 @@ S = "${WORKDIR}/git"
34 34
35inherit allarch update-alternatives 35inherit allarch update-alternatives
36 36
37CLEANBROKEN = "1"
38
37do_compile() { 39do_compile() {
38 : 40 :
39} 41}
diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb b/meta/recipes-multimedia/flac/flac_1.3.0.bb
index fdf38e9ea9..cf786a473d 100644
--- a/meta/recipes-multimedia/flac/flac_1.3.0.bb
+++ b/meta/recipes-multimedia/flac/flac_1.3.0.bb
@@ -21,6 +21,8 @@ SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
21SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd" 21SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd"
22SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc" 22SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
23 23
24CLEANBROKEN = "1"
25
24inherit autotools-brokensep gettext 26inherit autotools-brokensep gettext
25 27
26EXTRA_OECONF = "--disable-oggtest \ 28EXTRA_OECONF = "--disable-oggtest \