On Mon, 2021-12-20 at 05:40 -0800, Matt Madison wrote:
> On Sun, Dec 19, 2021 at 3:36 PM Richard Purdie
> <richard.pur...@linuxfoundation.org> wrote:
> > 
> > On Wed, 2021-12-15 at 12:16 -0800, Matt Madison wrote:
> > > which is introducing task hash changes for some
> > > allarch package builds, and should no longer
> > > be needed with recent versions of qemu.
> > > 
> > > Signed-off-by: Matt Madison <matt@madison.systems>
> > > ---
> > >  meta/classes/qemu.bbclass | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
> > > index 01a7b86ae1..333202b7c4 100644
> > > --- a/meta/classes/qemu.bbclass
> > > +++ b/meta/classes/qemu.bbclass
> > > @@ -54,7 +54,7 @@ def qemu_run_binary(data, rootfs_path, binary):
> > >  # this dance). For others (e.g. arm) a -cpu option is not necessary, 
> > > since the
> > >  # qemu-arm default CPU supports all required architecture levels.
> > > 
> > > -QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % 
> > > d.getVar('PACKAGE_ARCH')) or ""}"
> > > +QEMU_OPTIONS = "${@d.getVar("QEMU_EXTRAOPTIONS_%s" % 
> > > d.getVar('PACKAGE_ARCH')) or ""}"
> > >  QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
> > > 
> > >  QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
> > 
> > Rather worryingly this breaks a few docs packages for reproducibility:
> > 
> > http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20211219-6kkv1f8k/packages/diff-html/
> > 
> > which raises a number of questions in my mind. Investigation is needed as 
> > the
> > hashes clearly aren't encoding everything they should :(.
> 
> I think the problem is in manpages.bbclass - the ":append" for adding
> to the pkg_postinst/pkg_postrm functions is in the wrong place.
> Fixing them so the ":append" is at the end, rather than before
> "${MAN_PKG}", causes the function text and dependencies to show up in
> dumpsig output again.

I agree, I'd come to the same conclusion and there is a patch in master-next
testing on the autobuilder to see if that does resolve the issue. I've not sent
it out yet as invalidating the data from a reproducibility perspective is
tricky.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159867): 
https://lists.openembedded.org/g/openembedded-core/message/159867
Mute This Topic: https://lists.openembedded.org/mt/87752526/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to