If BB_URI_LOCALCOUNT isn't set, the code does nothing. That code was removed in 2012:
https://git.yoctoproject.org/poky/commit/?id=d0f35207f9e19b440393a79ebf621649c495738d Therefore drop the rest of it! Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- meta/classes/migrate_localcount.bbclass | 52 ------------------------- meta/conf/migrate_localcount.conf | 1 - scripts/bitbake-prserv-tool | 40 ------------------- 3 files changed, 93 deletions(-) delete mode 100644 meta/classes/migrate_localcount.bbclass delete mode 100644 meta/conf/migrate_localcount.conf diff --git a/meta/classes/migrate_localcount.bbclass b/meta/classes/migrate_localcount.bbclass deleted file mode 100644 index 1d00c110e28..00000000000 --- a/meta/classes/migrate_localcount.bbclass +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright OpenEmbedded Contributors -# -# SPDX-License-Identifier: MIT -# - -PRSERV_DUMPDIR ??= "${LOG_DIR}/db" -LOCALCOUNT_DUMPFILE ??= "${PRSERV_DUMPDIR}/prserv-localcount-exports.inc" - -python migrate_localcount_handler () { - import bb.event - if not e.data: - return - - pv = e.data.getVar('PV') - if not 'AUTOINC' in pv: - return - - localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', e.data) - pn = e.data.getVar('PN') - revs = localcounts.get_by_pattern('%%-%s_rev' % pn) - counts = localcounts.get_by_pattern('%%-%s_count' % pn) - if not revs or not counts: - return - - if len(revs) != len(counts): - bb.warn("The number of revs and localcounts don't match in %s" % pn) - return - - version = e.data.getVar('PRAUTOINX') - srcrev = bb.fetch2.get_srcrev(e.data) - base_ver = 'AUTOINC-%s' % version[:version.find(srcrev)] - pkgarch = e.data.getVar('PACKAGE_ARCH') - value = max(int(count) for count in counts) - - if len(revs) == 1: - if srcrev != ('AUTOINC+%s' % revs[0]): - value += 1 - else: - value += 1 - - bb.utils.mkdirhier(e.data.getVar('PRSERV_DUMPDIR')) - df = e.data.getVar('LOCALCOUNT_DUMPFILE') - flock = bb.utils.lockfile("%s.lock" % df) - with open(df, 'a') as fd: - fd.write('PRAUTO$%s$%s$%s = "%s"\n' % - (base_ver, pkgarch, srcrev, str(value))) - bb.utils.unlockfile(flock) -} - -addhandler migrate_localcount_handler -migrate_localcount_handler[eventmask] = "bb.event.RecipeParsed" diff --git a/meta/conf/migrate_localcount.conf b/meta/conf/migrate_localcount.conf deleted file mode 100644 index e486e03e5ff..00000000000 --- a/meta/conf/migrate_localcount.conf +++ /dev/null @@ -1 +0,0 @@ -INHERIT += "migrate_localcount" diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool index 80028342b16..0559c4c38a6 100755 --- a/scripts/bitbake-prserv-tool +++ b/scripts/bitbake-prserv-tool @@ -55,43 +55,6 @@ do_import () return $ret } -do_migrate_localcount () -{ - df=`bitbake -R conf/migrate_localcount.conf -e | \ - grep ^LOCALCOUNT_DUMPFILE= | cut -f2 -d\"` - if [ "x${df}" == "x" ]; - then - echo "LOCALCOUNT_DUMPFILE is not defined!" - return 1 - fi - - rm -f $df - clean_cache - echo "Exporting LOCALCOUNT to AUTOINCs..." - bitbake -R conf/migrate_localcount.conf -p - [ ! $? -eq 0 ] && echo "Exporting to file $df failed!" && exit 1 - - if [ -e $df ]; - then - echo "Exporting to file $df succeeded!" - else - echo "Exporting to file $df failed!" - exit 1 - fi - - echo "Importing generated AUTOINC entries..." - [ -e $df ] && do_import $df - - if [ ! $? -eq 0 ] - then - echo "Migration from LOCALCOUNT to AUTOINCs failed!" - return 1 - fi - - echo "Migration from LOCALCOUNT to AUTOINCs succeeded!" - return 0 -} - [ $# -eq 0 ] && help && exit 1 case $2 in @@ -110,9 +73,6 @@ export) import) do_import $2 ;; -migrate_localcount) - do_migrate_localcount - ;; *) help exit 1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#205219): https://lists.openembedded.org/g/openembedded-core/message/205219 Mute This Topic: https://lists.openembedded.org/mt/108808662/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
