diff options
Diffstat (limited to 'poky/meta/classes')
| -rw-r--r-- | poky/meta/classes/archiver.bbclass | 10 | ||||
| -rw-r--r-- | poky/meta/classes/base.bbclass | 4 | ||||
| -rw-r--r-- | poky/meta/classes/crosssdk.bbclass | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass index 31c9b7eb4b..d68add9e5d 100644 --- a/poky/meta/classes/archiver.bbclass +++ b/poky/meta/classes/archiver.bbclass @@ -267,6 +267,14 @@ python do_ar_configured() { create_tarball(d, srcdir, 'configured', ar_outdir) } +def exclude_useless_paths(tarinfo): + if tarinfo.isdir(): + if tarinfo.name.endswith('/temp') or tarinfo.name.endswith('/patches') or tarinfo.name.endswith('/.pc'): + return None + elif tarinfo.name == 'temp' or tarinfo.name == 'patches' or tarinfo.name == '.pc': + return None + return tarinfo + def create_tarball(d, srcdir, suffix, ar_outdir): """ create the tarball from srcdir @@ -291,7 +299,7 @@ def create_tarball(d, srcdir, suffix, ar_outdir): bb.note('Creating %s' % tarname) tar = tarfile.open(tarname, 'w:gz') - tar.add(srcdir, arcname=os.path.basename(srcdir)) + tar.add(srcdir, arcname=os.path.basename(srcdir), filter=exclude_useless_paths) tar.close() # creating .diff.gz between source.orig and source diff --git a/poky/meta/classes/base.bbclass b/poky/meta/classes/base.bbclass index abb4eadf50..2a6a6cb6d7 100644 --- a/poky/meta/classes/base.bbclass +++ b/poky/meta/classes/base.bbclass @@ -303,7 +303,9 @@ base_do_configure() { if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then oe_runmake clean fi - find ${B} -ignore_readdir_race -name \*.la -delete + # -ignore_readdir_race does not work correctly with -delete; + # use xargs to avoid spurious build failures + find ${B} -ignore_readdir_race -name \*.la -type f -print0 | xargs -0 rm -f fi fi if [ -n "${CONFIGURESTAMPFILE}" ]; then diff --git a/poky/meta/classes/crosssdk.bbclass b/poky/meta/classes/crosssdk.bbclass index ddb98d22bc..03b0c602c3 100644 --- a/poky/meta/classes/crosssdk.bbclass +++ b/poky/meta/classes/crosssdk.bbclass @@ -21,10 +21,10 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" -TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" -TARGET_CFLAGS = "${BUILD_CFLAGS}" -TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" -TARGET_LDFLAGS = "${BUILD_LDFLAGS}" +TARGET_CPPFLAGS = "" +TARGET_CFLAGS = "" +TARGET_CXXFLAGS = "" +TARGET_LDFLAGS = "" TARGET_FPU = "" |