diff options
| author | Bjarne Michelsen <bjarne_michelsen@hotmail.com> | 2020-07-06 21:42:26 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-16 22:28:40 +0100 |
| commit | 2f954473bb0e16093728d9af34bcdc13cbbdb406 (patch) | |
| tree | 5aac964b873e46069eea0d1768239a18bfc8b1fa /scripts | |
| parent | 67829609289fa5c13e413e64c97113fd505a207f (diff) | |
| download | poky-2f954473bb0e16093728d9af34bcdc13cbbdb406.tar.gz | |
devtool: default to empty string, if LIC_FILES_CHKSUM is not available
[Bug 13971] https://bugzilla.yoctoproject.org/show_bug.cgi?id=13971
A recipe using LICENSE=CLOSED would normally not have LIC_FILES_CHKSUM
set.
If LIC_FILES_CHKSUM was not set, it would cause `devtool upgrade` to fail.
This fixes the issue by defaulting to an empty string if
LIC_FILES_CHKSUM is not found.
[YOCTO #13971]
(From OE-Core rev: 9c7f3281884c50dbd05e2966e2409255c127ebfa)
Signed-off-by: Bjarne Michelsen <bjarne_michelsen@hotmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 95e112f0f465868e98285509ea0d1a624a439ac2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/upgrade.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index cb6dce378a..327916ade3 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
| @@ -550,12 +550,12 @@ def upgrade(args, config, basepath, workspace): | |||
| 550 | try: | 550 | try: |
| 551 | logger.info('Extracting current version source...') | 551 | logger.info('Extracting current version source...') |
| 552 | rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) | 552 | rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) |
| 553 | old_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM')) | 553 | old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) |
| 554 | logger.info('Extracting upgraded version source...') | 554 | logger.info('Extracting upgraded version source...') |
| 555 | rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch, | 555 | rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch, |
| 556 | args.srcrev, args.srcbranch, args.branch, args.keep_temp, | 556 | args.srcrev, args.srcbranch, args.branch, args.keep_temp, |
| 557 | tinfoil, rd) | 557 | tinfoil, rd) |
| 558 | new_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM')) | 558 | new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) |
| 559 | license_diff = _generate_license_diff(old_licenses, new_licenses) | 559 | license_diff = _generate_license_diff(old_licenses, new_licenses) |
| 560 | rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure) | 560 | rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure) |
| 561 | except bb.process.CmdError as e: | 561 | except bb.process.CmdError as e: |