Constantin Musca : prserv: add LOCALCOUNT to AUTOINCs migration feature

oe-commits Martin Jansa 1 participant 1 message Jan 26, 2013 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20130122160542.D7B3110368@opal

Martin Jansa

author

2013-01-26 22:52 UTC #1 lore raw

Quoted 8 lines · On Tue, Jan 22, 2013 at 04:05:42PM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: ffab86f13cafb10d8d6273b6af8cd9a3c84eae20
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ffab86f13cafb10d8d6273b6af8cd9a3c84eae20

Author: Constantin Musca <[email protected]>
Date:   Tue Jan 22 11:39:30 2013 +0200

Quoted 7 lines

prserv: add LOCALCOUNT to AUTOINCs migration feature
- use migrate_localcount.bbclass to generate AUTOINC entries which are exported to LOCALCOUNT_DUMPFILE
- import the generated AUTOINC entries
- one can migrate LOCALCOUNT to AUTOINC by executing:
bitbake-prserv-tool migrate_localcount

It probably does not work correctly with recipes with bumped PE

Summary: There were 266 ERROR messages shown, returning a non-zero exit code.

ERROR: Package version for package libphone-ui-shr-locale-sv went backwards which would break package feeds from (1:0.0.1+gitr19+6dde9f5ed47f7e102866b55bcc2b8512708f7adb-r2 to 1:0.0.1+gitr0+6dde9f5ed47f7e102866b55bcc2b8512708f7adb-r2.0)

sqlite> select * from PRMAIN_nohist where version like '%libphone-ui-shr%';

AUTOINC-libphone-ui-shr-0.0.1+gitr|cortexa8-vfp-neon|AUTOINC+6dde9f5ed47f7e102866b55bcc2b8512708f7adb|20
AUTOINC-libphone-ui-shr-0.0.1+gitr|x86_64|AUTOINC+6dde9f5ed47f7e102866b55bcc2b8512708f7adb|20
AUTOINC-libphone-ui-shr-0.0.1+gitr|arm920tt|AUTOINC+6dde9f5ed47f7e102866b55bcc2b8512708f7adb|20
AUTOINC-libphone-ui-shr-0.0.1+gitr|xscalete|AUTOINC+6dde9f5ed47f7e102866b55bcc2b8512708f7adb|20

ERROR: Package version for package mkdump went backwards which would break package feeds from (2:1.0.0+gitr49+fd67082900ca1dc04e6fc827d05ad4106a1c838e-r5.0 to 2:1.0.0+gitr0+fd67082900ca1dc04e6fc827d05ad4106a1c838e-r5.0.0)

sqlite> select * from PRMAIN_nohist where version like '%mkdump%';

AUTOINC-mkdump-1.0.0+gitr|cortexa8-vfp-neon|AUTOINC+fd67082900ca1dc04e6fc827d05ad4106a1c838e|49
AUTOINC-mkdump-1.0.0+gitr|x86_64|AUTOINC+fd67082900ca1dc04e6fc827d05ad4106a1c838e|49
AUTOINC-mkdump-1.0.0+gitr|arm920tt|AUTOINC+fd67082900ca1dc04e6fc827d05ad4106a1c838e|49
AUTOINC-mkdump-1.0.0+gitr|xscalete|AUTOINC+fd67082900ca1dc04e6fc827d05ad4106a1c838e|49

....

Regards,

Quoted 129 lines

[YOCTO #3071]

Signed-off-by Constantin Musca <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---

 meta/classes/migrate_localcount.bbclass |   47 +++++++++++++++++++++++++++++++
 meta/conf/migrate_localcount.conf       |    1 +
 scripts/bitbake-prserv-tool             |   32 +++++++++++++++++++++
 3 files changed, 80 insertions(+), 0 deletions(-)

meta/classes/migrate_localcount.bbclass new file +47 -0

new file mode 100644
index 0000000..59f14e8
@@ -0,0 +1,47 @@
+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
+
+    if isinstance(e, bb.event.RecipeParsed):
+        pv = e.data.getVar('PV', True)
+        if not 'AUTOINC' in pv:
+            return
+
+        localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', e.data)
+        pn = e.data.getVar('PN', True)
+        revs = localcounts.get_by_pattern('%%-%s_rev' % pn)
+        counts = localcounts.get_by_pattern('%%-%s_count' % pn)
+        if not revs or not counts:
+            return
+
+        srcrev = bb.fetch2.get_srcrev(e.data)
+        bpv = pv[:pv.find(srcrev)]
+
+        if len(revs) != len(counts):
+            bb.warn("The number of revs and localcounts don't match in %s" % pn)
+            return
+
+        version = 'AUTOINC-%s-%s' % (pn, bpv)
+        pkgarch = e.data.getVar('PACKAGE_ARCH', True)
+        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', True))
+        df = e.data.getVar('LOCALCOUNT_DUMPFILE', True)
+        flock = bb.utils.lockfile("%s.lock" % df)
+        with open(df, 'a') as fd:
+            fd.write('PRAUTO$%s$%s$%s = "%s"\n' %
+                    (version, pkgarch, srcrev, str(value)))
+        bb.utils.unlockfile(flock)
+}
+
+addhandler migrate_localcount_handler

meta/conf/migrate_localcount.conf new file +1 -0

new file mode 100644
index 0000000..e486e03
@@ -0,0 +1 @@
+INHERIT += "migrate_localcount"

scripts/bitbake-prserv-tool +32 -0

index f3855df..4654e6d 100755
@@ -47,6 +47,35 @@ 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 -rf $df
+    clean_cache
+    echo "Exporting LOCALCOUNT to AUTOINCs..."
+    bitbake -R conf/migrate_localcount.conf -p
+    [ ! $? -eq 0 ] && echo "Exporting failed!" && exit 1
+
+    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 $1 in

@@ -56,6 +85,9 @@ export)
 import)
     do_import $2
     ;;
+migrate_localcount)
+    do_migrate_localcount
+    ;;
 *)
     help
     exit 1

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]