From 45b7d3add14eafc25da62bab68d4ae133f8dcb57 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Nov 2014 18:46:35 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 3 ++- meta/recipes-devtools/gnu-config/gnu-config_20120814.bb | 5 +---- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 5 +---- meta/recipes-extended/cups/cups.inc | 2 ++ meta/recipes-extended/lsb/lsb_4.1.bb | 2 ++ meta/recipes-kernel/cryptodev/cryptodev_1.6.inc | 2 ++ meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 2 ++ meta/recipes-multimedia/flac/flac_1.3.0.bb | 2 ++ 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() { } CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" +CLEANBROKEN = "0" addtask configure after do_patch do_configure[dirs] = "${S} ${B}" @@ -225,7 +226,7 @@ base_do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then cd ${B} - if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then + if [ "${CLEANBROKEN}" != "1" -a -e Makefile -o -e makefile -o -e GNUmakefile ]; then ${MAKE} clean fi 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 SRC_URI[md5sum] = "bcfca5a2bb39edad4aae5a65efc84094" SRC_URI[sha256sum] = "44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b" -# Disable default since make clean doesn't work -do_configure () { - : -} +CLEANBROKEN = "1" do_compile() { : 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 \ S = "${WORKDIR}/git" -# Disable default since make clean doesn't work -do_configure () { - : -} +CLEANBROKEN = "1" do_compile() { : 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 \ LEAD_SONAME = "libcupsdriver.so" +CLEANBROKEN = "1" + inherit autotools-brokensep binconfig useradd systemd USERADD_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" SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" S = "${WORKDIR}/lsb-release-1.4" +CLEANBROKEN = "1" + do_install(){ oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} 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" SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f" S = "${WORKDIR}/cryptodev-linux-${PV}" + +CLEANBROKEN = "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" inherit allarch update-alternatives +CLEANBROKEN = "1" + do_compile() { : } 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 \ SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd" SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc" +CLEANBROKEN = "1" + inherit autotools-brokensep gettext EXTRA_OECONF = "--disable-oggtest \ -- cgit 1.2.3-korg