On Thu, 2020-08-27 at 17:12 -0500, Mark Hatle wrote: > When the PR service is enabled a number of small changes may happen > to variables. In the do_package step a call to package_get_auto_pr > will end up setting PRAUTO and modifying PKGV (if AUTOINC is there). > > PRAUTO is then used by EXTENDPRAUTO, which is then used to generate > PKGR. > > Since this behavior typically happens BEFORE the BB_UNIHASH is > calculated for do_package, we need a way to defer the expansion > until after we have the unihash value. > > Writing out the pkgdata files w/o AUTOPR and PKGV (AUTOINC) expanded > to placeholder values is the easiest way to deal with this. All > other > variables are expanded as expected. > > In the next task, typically do_packagedata, we will then use the > UNIHASH from the do_package to get the PR (AUTOPR) as well as > generate the AUTOINC replacement value (now PRSERV_PV_AUTOINC). > > The do_packagedata then translates the placeholders to the final > values > when copying the data from pkgdata to pkgdata-pdata-input. > > Signed-off-by: Mark Hatle <[email protected]> > --- > meta/classes/package.bbclass | 58 +++++++++++++++++++++++++++++++--- > -- > meta/conf/bitbake.conf | 1 + > 2 files changed, 51 insertions(+), 8 deletions(-)
This looked ok in testing apart from: https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1289 (and similar) which should reproduce with: oe-selftest -r prservice.BitbakePrTests basically the PRServ tests need updating to match the code changes. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141930): https://lists.openembedded.org/g/openembedded-core/message/141930 Mute This Topic: https://lists.openembedded.org/mt/76462561/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
