[OE-core] [PATCH 3/3] yocto-compat-layer: include bitbake-diffsigs output

Leonardo Sandoval leonardo.sandoval.gonzalez at linux.intel.com
Wed Apr 5 15:26:19 UTC 2017


On Wed, 2017-04-05 at 15:36 +0200, Patrick Ohly wrote:
> After filtering out potential false positives, it becomes feasible to
> include the output of bitbake-diffsigs for those tasks which
> definitely have a change.
> 
> Depends on bitbake-diffsigs with the "--signature" parameter.
> 
> Enhanced output now is:
> 
>    AssertionError: False is not true : Layer meta-xxxx changed 120 signatures, initial differences (first hash without, second with layer):
>       gstreamer1.0-plugins-base:do_fetch: 76973f19f2e30d282152bdd7e4efe5bb -> e6e7c6fa9f2bd59d7d8d107f7c6ca1ac
>          Task dependencies changed from:
>          ['PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'base_do_fetch']
>          to:
>          ['GST_IMX_PATCHES_TO_APPEND', 'PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'base_do_fetch']
>          basehash changed from d679d30bd1ea41c56e57419b57587f3c to 090a79b45f5fa26d10f9d34e2ed7a1e6
>             List of dependencies for variable SRC_URI changed from '{'PV', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]'}' to '{'GST_IMX_PATCHES_TO_APPEND', 'PV', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]'}'
>          changed items: {'GST_IMX_PATCHES_TO_APPEND'}
>          Dependency on variable GST_IMX_PATCHES_TO_APPEND was added
>          Variable SRC_URI value changed:
>          "     http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz     file://get-caps-from-src-pad-when-query-caps.patch     file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch     file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch     file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch     file://make-gio_unix_2_0-dependency-configurable.patch     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch     file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch     file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch     file://0003-riff-add-missing-include-directories-when-calling-in.patch     file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch [--] {+${GST_IMX_PATCHES_TO_APPEND}+}"
> 
>       pulseaudio:do_install: 6bb6fe23e11a6d5fef9c3a25e73e4f9c -> 3f54ea75673a792e307197cfa6ef2694
>          basehash changed from ac4efcfa783bd04a5a98a2c38719aedd to 37679d99623a37c8df955da3a01415a5
>          Variable do_install value changed:
>          @@ -1,3 +1,7 @@
>               autotools_do_install
>            	install -d ${D}${sysconfdir}/default/volatiles
>           	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
>          +    if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then
>          +        install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
>          +        install -m 0644 ${WORKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
>          +    fi
> 
> [YOCTO #11161]
> 
> Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
> ---
>  scripts/lib/compatlayer/cases/common.py | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py
> index b91da9b..d909d5b 100644
> --- a/scripts/lib/compatlayer/cases/common.py
> +++ b/scripts/lib/compatlayer/cases/common.py
> @@ -76,4 +76,14 @@ class CommonCompatLayer(OECompatLayerTestCase):
>                         (self.tc.layer['name'], len(sig_diff)))
>              for diff in sorted(sig_diff_filtered):
>                  msg.append('   %s: %s -> %s' % diff)
> +                try:
> +                    recipe, taskname = diff[0].rsplit(':', 1)
> +                    output = check_command('Determining signature difference failed.',
> +                                           'bitbake-diffsigs --task %s %s --signature %s %s' %
> +                                           (recipe, taskname, diff[1], diff[2])).decode('utf-8')
> +                except RuntimeError as error:
> +                    output = str(error)

Patrick, just a minor comment:  there is no need for the 'if' check,
because the try and the except bodies set the output variable. 

Leo

> +                if output:
> +                    msg.extend(['      ' + line for line in output.splitlines()])
> +                    msg.append('')
>              self.assertTrue(False, '\n'.join(msg))
> -- 
> git-series 0.9.1





More information about the Openembedded-core mailing list