diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 58 |
1 files changed, 50 insertions, 8 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7c252dd46b..f8074d866c 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -7,7 +7,7 @@ | |||
7 | # | 7 | # |
8 | # There are the following default steps but PACKAGEFUNCS can be extended: | 8 | # There are the following default steps but PACKAGEFUNCS can be extended: |
9 | # | 9 | # |
10 | # a) package_get_auto_pr - get PRAUTO from remote PR service | 10 | # a) package_convert_pr_autoinc - convert AUTOINC in PKGV to ${PRSERV_PV_AUTOINC} |
11 | # | 11 | # |
12 | # b) perform_packagecopy - Copy D into PKGD | 12 | # b) perform_packagecopy - Copy D into PKGD |
13 | # | 13 | # |
@@ -585,12 +585,20 @@ def runtime_mapping_rename (varname, pkg, d): | |||
585 | #bb.note("%s after: %s" % (varname, d.getVar(varname))) | 585 | #bb.note("%s after: %s" % (varname, d.getVar(varname))) |
586 | 586 | ||
587 | # | 587 | # |
588 | # Package functions suitable for inclusion in PACKAGEFUNCS | 588 | # Used by do_packagedata (and possibly other routines post do_package) |
589 | # | 589 | # |
590 | 590 | ||
591 | package_get_auto_pr[vardepsexclude] = "BB_TASKDEPDATA" | ||
591 | python package_get_auto_pr() { | 592 | python package_get_auto_pr() { |
592 | import oe.prservice | 593 | import oe.prservice |
593 | import re | 594 | |
595 | def get_do_package_hash(pn): | ||
596 | if d.getVar("BB_RUNTASK") != "do_package": | ||
597 | taskdepdata = d.getVar("BB_TASKDEPDATA", False) | ||
598 | for dep in taskdepdata: | ||
599 | if taskdepdata[dep][1] == "do_package" and taskdepdata[dep][0] == pn: | ||
600 | return taskdepdata[dep][6] | ||
601 | return None | ||
594 | 602 | ||
595 | # Support per recipe PRSERV_HOST | 603 | # Support per recipe PRSERV_HOST |
596 | pn = d.getVar('PN') | 604 | pn = d.getVar('PN') |
@@ -602,15 +610,22 @@ python package_get_auto_pr() { | |||
602 | 610 | ||
603 | # PR Server not active, handle AUTOINC | 611 | # PR Server not active, handle AUTOINC |
604 | if not d.getVar('PRSERV_HOST'): | 612 | if not d.getVar('PRSERV_HOST'): |
605 | if 'AUTOINC' in pkgv: | 613 | d.setVar("PRSERV_PV_AUTOINC", "0") |
606 | d.setVar("PKGV", pkgv.replace("AUTOINC", "0")) | ||
607 | return | 614 | return |
608 | 615 | ||
609 | auto_pr = None | 616 | auto_pr = None |
610 | pv = d.getVar("PV") | 617 | pv = d.getVar("PV") |
611 | version = d.getVar("PRAUTOINX") | 618 | version = d.getVar("PRAUTOINX") |
612 | pkgarch = d.getVar("PACKAGE_ARCH") | 619 | pkgarch = d.getVar("PACKAGE_ARCH") |
613 | checksum = d.getVar("BB_TASKHASH") | 620 | checksum = get_do_package_hash(pn) |
621 | |||
622 | # If do_package isn't in the dependencies, we can't get the checksum... | ||
623 | if not checksum: | ||
624 | bb.warn('Task %s requested do_package unihash, but it was not available.' % d.getVar('BB_RUNTASK')) | ||
625 | #taskdepdata = d.getVar("BB_TASKDEPDATA", False) | ||
626 | #for dep in taskdepdata: | ||
627 | # bb.warn('%s:%s = %s' % (taskdepdata[dep][0], taskdepdata[dep][1], taskdepdata[dep][6])) | ||
628 | return | ||
614 | 629 | ||
615 | if d.getVar('PRSERV_LOCKDOWN'): | 630 | if d.getVar('PRSERV_LOCKDOWN'): |
616 | auto_pr = d.getVar('PRAUTO_' + version + '_' + pkgarch) or d.getVar('PRAUTO_' + version) or None | 631 | auto_pr = d.getVar('PRAUTO_' + version + '_' + pkgarch) or d.getVar('PRAUTO_' + version) or None |
@@ -628,7 +643,7 @@ python package_get_auto_pr() { | |||
628 | srcpv = bb.fetch2.get_srcrev(d) | 643 | srcpv = bb.fetch2.get_srcrev(d) |
629 | base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] | 644 | base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] |
630 | value = conn.getPR(base_ver, pkgarch, srcpv) | 645 | value = conn.getPR(base_ver, pkgarch, srcpv) |
631 | d.setVar("PKGV", pkgv.replace("AUTOINC", str(value))) | 646 | d.setVar("PRSERV_PV_AUTOINC", str(value)) |
632 | 647 | ||
633 | auto_pr = conn.getPR(version, pkgarch, checksum) | 648 | auto_pr = conn.getPR(version, pkgarch, checksum) |
634 | except Exception as e: | 649 | except Exception as e: |
@@ -638,6 +653,22 @@ python package_get_auto_pr() { | |||
638 | d.setVar('PRAUTO',str(auto_pr)) | 653 | d.setVar('PRAUTO',str(auto_pr)) |
639 | } | 654 | } |
640 | 655 | ||
656 | # | ||
657 | # Package functions suitable for inclusion in PACKAGEFUNCS | ||
658 | # | ||
659 | |||
660 | python package_convert_pr_autoinc() { | ||
661 | pkgv = d.getVar("PKGV") | ||
662 | |||
663 | # Adjust pkgv as necessary... | ||
664 | if 'AUTOINC' in pkgv: | ||
665 | d.setVar("PKGV", pkgv.replace("AUTOINC", "${PRSERV_PV_AUTOINC}")) | ||
666 | |||
667 | # Change PRSERV_PV_AUTOINC and EXTENDPRAUTO usage to special values | ||
668 | d.setVar('PRSERV_PV_AUTOINC', '@PRSERV_PV_AUTOINC@') | ||
669 | d.setVar('EXTENDPRAUTO', '@EXTENDPRAUTO@') | ||
670 | } | ||
671 | |||
641 | LOCALEBASEPN ??= "${PN}" | 672 | LOCALEBASEPN ??= "${PN}" |
642 | 673 | ||
643 | python package_do_split_locales() { | 674 | python package_do_split_locales() { |
@@ -2251,7 +2282,7 @@ python do_package () { | |||
2251 | package_qa_handle_error("var-undefined", msg, d) | 2282 | package_qa_handle_error("var-undefined", msg, d) |
2252 | return | 2283 | return |
2253 | 2284 | ||
2254 | bb.build.exec_func("package_get_auto_pr", d) | 2285 | bb.build.exec_func("package_convert_pr_autoinc", d) |
2255 | 2286 | ||
2256 | ########################################################################### | 2287 | ########################################################################### |
2257 | # Optimisations | 2288 | # Optimisations |
@@ -2323,9 +2354,20 @@ addtask do_package_setscene | |||
2323 | # Copy from PKGDESTWORK to tempdirectory as tempdirectory can be cleaned at both | 2354 | # Copy from PKGDESTWORK to tempdirectory as tempdirectory can be cleaned at both |
2324 | # do_package_setscene and do_packagedata_setscene leading to races | 2355 | # do_package_setscene and do_packagedata_setscene leading to races |
2325 | python do_packagedata () { | 2356 | python do_packagedata () { |
2357 | bb.build.exec_func("package_get_auto_pr", d) | ||
2358 | |||
2326 | src = d.expand("${PKGDESTWORK}") | 2359 | src = d.expand("${PKGDESTWORK}") |
2327 | dest = d.expand("${WORKDIR}/pkgdata-pdata-input") | 2360 | dest = d.expand("${WORKDIR}/pkgdata-pdata-input") |
2328 | oe.path.copyhardlinktree(src, dest) | 2361 | oe.path.copyhardlinktree(src, dest) |
2362 | |||
2363 | bb.build.exec_func("packagedata_translate_pr_autoinc", d) | ||
2364 | } | ||
2365 | |||
2366 | # Translate the EXTENDPRAUTO and AUTOINC to the final values | ||
2367 | packagedata_translate_pr_autoinc() { | ||
2368 | find ${WORKDIR}/pkgdata-pdata-input -type f | xargs --no-run-if-empty \ | ||
2369 | sed -e 's,@PRSERV_PV_AUTOINC@,${PRSERV_PV_AUTOINC},g' \ | ||
2370 | -e 's,@EXTENDPRAUTO@,${EXTENDPRAUTO},g' -i | ||
2329 | } | 2371 | } |
2330 | 2372 | ||
2331 | addtask packagedata before do_build after do_package | 2373 | addtask packagedata before do_build after do_package |