From: "Khem Raj" <raj.khem@gmail.com>
To: Bjarne Michelsen <bjarne_michelsen@hotmail.com>,
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] devtool: default to empty string, if LIC_FILES_CHKSUM is not available
Date: Mon, 6 Jul 2020 12:50:47 -0700 [thread overview]
Message-ID: <0f90bcd9-199e-df33-00d2-11009898430a@gmail.com> (raw)
In-Reply-To: <20200706194226.4892-1-bjarne_michelsen@hotmail.com>
On 7/6/20 12:42 PM, Bjarne Michelsen wrote:
> [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.
>
would it do just for recipes which use CLOSED for license ?
since we are synthesizing the checksum, It would be good to remain
prudent and not empty it out in general when non existent, perhaps
a warning for user to fix it in such cases would be appropriate
> Signed-off-by: Bjarne Michelsen <bjarne_michelsen@hotmail.com>
> ---
> scripts/lib/devtool/upgrade.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
> index ebe72282bb..0c1de8cdc7 100644
> --- a/scripts/lib/devtool/upgrade.py
> +++ b/scripts/lib/devtool/upgrade.py
> @@ -550,12 +550,12 @@ def upgrade(args, config, basepath, workspace):
> try:
> logger.info('Extracting current version source...')
> rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides)
> - old_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM'))
> + old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
> logger.info('Extracting upgraded version source...')
> rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch,
> args.srcrev, args.srcbranch, args.branch, args.keep_temp,
> tinfoil, rd)
> - new_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM'))
> + new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
> license_diff = _generate_license_diff(old_licenses, new_licenses)
> 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)
> except bb.process.CmdError as e:
>
>
>
>
next prev parent reply other threads:[~2020-07-06 19:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 19:42 [PATCH] devtool: default to empty string, if LIC_FILES_CHKSUM is not available Bjarne Michelsen
2020-07-06 19:50 ` Khem Raj [this message]
2020-07-06 21:47 ` [OE-core] " Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f90bcd9-199e-df33-00d2-11009898430a@gmail.com \
--to=raj.khem@gmail.com \
--cc=bjarne_michelsen@hotmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox