From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB940C433F5 for ; Sat, 19 Mar 2022 20:02:28 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web12.11035.1647720148110647982 for ; Sat, 19 Mar 2022 13:02:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Wb+MMDtL; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.44, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f44.google.com with SMTP id i64so78245wma.3 for ; Sat, 19 Mar 2022 13:02:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=I5/uuQkPJBP2FOq2bvEevg7FdJzXDdxW2AZdTVENE8E=; b=Wb+MMDtLGzxMcy/ZmVDx83s7tw74Q/OBH7ig4S/y7m91wo7G1Ihssrat/8ndW3KGgJ Y24KZwoPFXuMTtnijGSSPHPVSi+At3Ms0xnxI+s+Ceg0/sNHfBEJrqZwlsQyJ47XdN3A unK+cI0+Y7siPWBkiGDRSm+06kqF0e3WdWNJM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=I5/uuQkPJBP2FOq2bvEevg7FdJzXDdxW2AZdTVENE8E=; b=A+fm0JlSQ2DeC8po+QwDy1oFn8dWR2n9aAzrARfdjA4s6JbYb36+sSRBQBAmxH4E5U FZPnzcI3dHlF9WiXnFmmQEKaKsmHgJGxBv4RDcHpj1+OdPvobott92lPE3r+4wQTKMjB ukz0yGPNqaeQc9AS/fkyyVXzbFiYEGX65jtm81L/DfqHc4siS22nxjxLCDvms343gO2p /OfSFe2Dp5tg4krgjEM3bClkHZe1OhaxURPjOCHAH6bPFeorG3E4S2i59Nuk4VOaP+k/ 1Pl9QypT74830o0QcAKHxzxhWTkhu/Oc/d2B0olfeIiTF/oiTBhIwp+c902s6hNw8wyT BgqA== X-Gm-Message-State: AOAM532vlNjS4kzcgr3MW97uaAFLqkAjM44K7o00Alm79msXQtPb5LA2 xAazLymub4IIgJw84P/9EaPpdA== X-Google-Smtp-Source: ABdhPJyNui4kcNaMafSiqB/3CTYgk2KbYInBn8N1FTYNMSywxtjsxWhdbUiSOQBSfIyGVERE14cRxg== X-Received: by 2002:a05:600c:3556:b0:389:f440:50e6 with SMTP id i22-20020a05600c355600b00389f44050e6mr13294044wmq.159.1647720146295; Sat, 19 Mar 2022 13:02:26 -0700 (PDT) Received: from ?IPv6:2001:8b0:aba:5f3c:3ad7:b7e1:8044:d0f5? ([2001:8b0:aba:5f3c:3ad7:b7e1:8044:d0f5]) by smtp.gmail.com with ESMTPSA id f7-20020a0560001a8700b00203c23e55e0sm9332946wry.78.2022.03.19.13.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 13:02:25 -0700 (PDT) Message-ID: <0600c7782a3cdc834c890d1338eee9755dbbaa26.camel@linuxfoundation.org> Subject: Re: [Toaster] [PATCH] toaster: handle changes to "ImagePkgList" event From: Richard Purdie To: "Reyna, David" , "toaster@lists.yoctoproject.org" Date: Sat, 19 Mar 2022 20:02:21 +0000 In-Reply-To: References: <20220318104304.18460-1-david.reyna@windriver.com> <5add1e9d2e60b63604014c0db6b7ecf64d9b1d69.camel@linuxfoundation.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4-1ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 19 Mar 2022 20:02:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5785 On Fri, 2022-03-18 at 19:26 +0000, Reyna, David wrote: > > I think the fact that some values are "disappearing" is a sign the overrides > change has some impact here which needs to be fixed and this patch is just > partially working around it. > > Yes, this patch is specifically to work around the problems in the event data > encountered. Fortunately these were the only events thus affected. > > If the original data and formatting does get restored, you will observe that the > patch is written to use that original formatting. > > After the core problems are fixed, then this patch (or parts) can be dropped. > > As a result of these discoveries, I filed Bug 14764 directly against Bitbake > since there was obvious missing formatting with 'PKGSIZE'. As for the other > problems, I could not tell if they were intentional changes or not. I will > update Bug 14764 so that it is one stop shopping. I think the problem might be fixed with something like: diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index dd5c7f224ba..f365c091420 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -101,11 +101,11 @@ def _toaster_load_pkgdatafile(dirpath, filepath): for line in fin: try: kn, kv = line.strip().split(": ", 1) - m = re.match(r"^PKG_([^A-Z:]*)", kn) + m = re.match(r"^PKG:([^A-Z:]*)", kn) if m: pkgdata['OPKGN'] = m.group(1) - kn = "_".join([x for x in kn.split("_") if x.isupper()]) - pkgdata[kn] = kv.strip() + kn = kn.split(":")[0] + pkgdata[kn] = kv if kn.startswith('FILES_INFO'): pkgdata[kn] = json.loads(kv) but I haven't tested that as yet. Cheers, Richard