[OE-core] [oe-commits] Alexander Kanavin : remake: update to 4.1+dbg-1.1
Martin Jansa
martin.jansa at gmail.com
Thu Mar 10 11:58:51 UTC 2016
On Fri, Sep 04, 2015 at 03:37:10PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: fb781bee39e312eef1d89c2d7f5ab27e8da1ee32
> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fb781bee39e312eef1d89c2d7f5ab27e8da1ee32
>
> Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> Date: Thu Sep 3 18:34:18 2015 +0300
>
> remake: update to 4.1+dbg-1.1
>
> remake-remove-errors-about-colophon-and-cygnus-comma.patch has been merged upstream
Fails to build after make was built. Shouldn't it be at least blacklisted
by default so that potential user will need to explicitly decide between
make and remake (and unmerge the other one from sysroot first)?
ERROR: remake-4.1+dbg-1.1-r0 do_populate_sysroot: The recipe remake is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/sysroot-providers/make
Matched in manifest-qemuarm-makedepend.populate_sysroot
manifest-qemuarm-makedevs.populate_sysroot
manifest-qemuarm-make.populate_sysroot
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/gnumake.h
Matched in manifest-qemuarm-make.populate_sysroot
Please verify which recipe should provide the above files.
The build has stopped as continuing in this scenario WILL break things, if not now, possibly in the future (we've seen builds fail several months later). If the system knew how to recover from this automatically it would however there are several different scenarios which can result in this and we don't know which one this is. It may be you have switched providers of something like virtual/kernel (e.g. from linux-yocto to linux-yocto-dev), in that case you need to execute the clean task for both recipes and it will resolve this error. It may be you changed DISTRO_FEATURES from systemd to udev or vice versa. Cleaning those recipes should again resolve this error however switching DISTRO_FEATURES on an existing build directory is not supported, you should really clean out tmp and rebuild (reusing sstate should be safe). It could be the overlapping files detected are harmless in which case adding them to SSTATE_DUPWHITELIST may be the correct solution. It could also be your build is including two different conflicting versions of things (e.g. bluez 4 and bluez 5 and the correct solution for that would be to resolve the conflict. If in doubt, please ask on the mailing list, sharing the error and filelist above.
ERROR: remake-4.1+dbg-1.1-r0 do_populate_sysroot: If the above message is too much, the simpler version is you're advised to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix things in most (but not all) cases.
ERROR: remake-4.1+dbg-1.1-r0 do_populate_sysroot: Function failed: sstate_task_postfunc
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/remake/4.1+dbg-1.1-r0/temp/log.do_populate_sysroot.9947
>
> inherit pkgconfig has been added because m4 macros defined by pkgconfig are now used
> in configure.ac
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>
> ---
>
> meta/recipes-devtools/remake/remake.inc | 4 +--
> ...ve-errors-about-colophon-and-cygnus-comma.patch | 39 ----------------------
> .../{remake_git.bb => remake_4.1+dbg-1.1.bb} | 8 ++---
> 3 files changed, 4 insertions(+), 47 deletions(-)
>
> diff --git a/meta/recipes-devtools/remake/remake.inc b/meta/recipes-devtools/remake/remake.inc
> index 6ac833e..df889fc 100644
> --- a/meta/recipes-devtools/remake/remake.inc
> +++ b/meta/recipes-devtools/remake/remake.inc
> @@ -1,4 +1,4 @@
> -SUMMARY = "Makefile debugger which is gnumake 3.81 compatible"
> +SUMMARY = "Makefile debugger which is gnumake compatible"
> DESCRIPTION = "remake is a patched and modernized version of GNU make \
> utility that adds improved error reporting, the ability to trace \
> execution in a comprehensible way, and a debugger."
> @@ -8,7 +8,7 @@ SECTION = "devel"
>
> SRC_URI = "git://github.com/rocky/remake.git"
>
> -inherit autotools gettext update-alternatives
> +inherit autotools gettext update-alternatives pkgconfig
>
> ALTERNATIVE_${PN} = "make"
> ALTERNATIVE_LINK_NAME[make] = "${bindir}/make"
> diff --git a/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch b/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch
> deleted file mode 100644
> index 98b6460..0000000
> --- a/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 1316f10a97a4a2f5d11a30ec367aa61101318742 Mon Sep 17 00:00:00 2001
> -From: "Maxin B. John" <maxin.john at enea.com>
> -Date: Wed, 6 Aug 2014 15:05:56 +0200
> -Subject: [PATCH] remake: remove errors about @colophon and @cygnus commands
> - not defined
> -
> -texinfo5 needs replacing @ with @@ when it is part of the text
> -
> -Upstream-Status: Backport
> -Signed-off-by: Maxin B. John <maxin.john at enea.com>
> ----
> - doc/remake.texi | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/doc/remake.texi b/doc/remake.texi
> -index cd73437..fa5ba16 100644
> ---- a/doc/remake.texi
> -+++ b/doc/remake.texi
> -@@ -2752,7 +2752,7 @@ this list, we would like to add your names!
> - @printindex cp
> -
> - @tex
> --% I think something like @colophon should be in texinfo. In the
> -+% I think something like @@colophon should be in texinfo. In the
> - % meantime:
> - \long\def\colophon{\hbox to0pt{}\vfill
> - \centerline{The body of this manual is set in}
> -@@ -2764,7 +2764,7 @@ this list, we would like to add your names!
> - \centerline{{\sl\fontname\tensl\/}}
> - \centerline{are used for emphasis.}\vfill}
> - \page\colophon
> --% Blame: doc at cygnus.com, 1991.
> -+% Blame: doc@@cygnus.com, 1991.
> - @end tex
> -
> - @bye
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-devtools/remake/remake_git.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
> similarity index 80%
> rename from meta/recipes-devtools/remake/remake_git.bb
> rename to meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
> index 2ba2b80..c61913d 100644
> --- a/meta/recipes-devtools/remake/remake_git.bb
> +++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
> @@ -1,4 +1,3 @@
> -PR = "r1"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> @@ -6,14 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> require remake.inc
>
> SRC_URI += "file://version-remake.texi.patch \
> - file://remake-remove-errors-about-colophon-and-cygnus-comma.patch \
> "
> -SRCREV = "f05508e521987c8494c92d9c2871aec46307d51d"
> +SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561"
> S = "${WORKDIR}/git"
>
> -PV = "3.82+dbg-0.9+git${SRCPV}"
> -
> -DEPENDS += "readline"
> +DEPENDS += "readline guile"
> # Need to add "gettext-native" dependency to remake-native.
> # By default only "gettext-minimal-native" is added
> # when inherit gettext.
>
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160310/60352a15/attachment-0002.sig>
More information about the Openembedded-core
mailing list