[bitbake-devel] [PATCH] data_smart: Fix remove operator and its interaction with data expansion

Richard Purdie richard.purdie at linuxfoundation.org
Mon Sep 15 10:14:58 UTC 2014


On Sun, 2014-09-14 at 21:17 +0100, Burton, Ross wrote:
> On 13 September 2014 08:50, Richard Purdie
> <richard.purdie at linuxfoundation.org> wrote:
> > If you have:
> >
> > FOO = "${bindir}/X Y"
> > FOO_remove = "${bindir}/X"
> >
> > the expected result is "Y". Currently this doesn't work since the removed
> > expressions are not expanded first. This patch adjusts things so the
> > expressions are expanded before being processed for removal.
> 
> Whilst the actual expansion works as expected now (consider this a
> tested-by), the output in bitbake -e doesn't make sense:
> 
> i.e. with PACKAGES_remove = "${PN}-staticdev ${PN}-locale" in a distro config:
> 
> # $PACKAGES [5 operations]
> #   set /home/ross/foo/poky/meta/conf/bitbake.conf:264
> #     "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
> ${PACKAGE_BEFORE_PN} ${PN}"
> #   _remove /home/ross/foo/meta-foo/conf/distro/foo.conf:201
> #     "${PN}-staticdev ${PN}-locale"
> #   set /home/ross/foo/poky/meta/conf/documentation.conf:308
> #     [doc] "The list of packages to be created from the recipe."
> #   prepend /home/ross/foo/poky/meta/recipes-support/curl/curl_7.37.1.bb:43
> #     "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc"
> #   _remove /home/ross/foo/meta-foo/recipes-support/curl/curl_%.bbappend:1
> #     "${PN}-dev"
> # computed:
> #   "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc
> ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
> ${PACKAGE_BEFORE_PN} ${PN}"
> PACKAGES="libcurl libcurl-dev libcurl-staticdev libcurl-doc curl-dbg
> curl-doc  curl"
> 
> The PACKAGES value is right, but the "computed" value displayed by -e isn't.

This is the "pre expansion" value, so its right but the comment needs
improving...

Cheers,

Richard





More information about the bitbake-devel mailing list