From patchwork Sat Mar 12 05:35:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Reyna, David" X-Patchwork-Id: 5127 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 16C7BC433F5 for ; Sat, 12 Mar 2022 05:35:38 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.2333.1647063336833664161 for ; Fri, 11 Mar 2022 21:35:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=tBLiTbBj; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=007057a150=david.reyna@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22C5ZL8j015013 for ; Fri, 11 Mar 2022 21:35:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : mime-version; s=PPS06212021; bh=BIB3InyzcpTeaizpZUYK4EQ2gh1izWX1Y6qIAqAjMrI=; b=tBLiTbBjIB9PzlFwfMW+hS5wBitQSO6HW7qAnpB1yJdY8BJWGoIGYp1QwhO1bhWOpvNI ByFRNPMzBZaA26eklBnzfTQfbJQLNTQKEj1TGRpFboIdhCLpTpkTJAM+pbAkxPevbigN pWtTHLUQc+ztxh03Tox43l+iWIRKHxEOK58a9vojT4vs2RSTqEbWTSdHWoV5iqC6aRVn OuE/hQjm6YWRInwDCAn6qBcWOfYfGIV/FmqUs83CE4D3EYyKleG6xp/OWCMvbgxUyL42 BqRxWMoSaeWx6BiZ/ptWslrLK7BuDxNNGkdT2ksLO56iJyddzhcmvfU0x0J4WahDa79Z nw== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3enew6vfqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Mar 2022 21:35:35 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVLjJVPwg6Mth1lknpNwUlsJGk6B3jXQQcxs5zKjaiX4Wz1uurUtNpbYYO1txIViHF/QT9eWUSeYX3eWab1nR6/TkVwKhWsp4PWuzffDL3jWBhNiiEOp3TajSmcLvvXqYG4rFd5qIyIfWTRrbRwlwa/vycuJrRKCrBW2B+aE7i2tmGaiuN6qLcppq/skStkkumvJWIXI7EuXGf/h4ZYk+1QdzOTS2YGSg0Z5EeUdHvmaK8zmHM0+1EX9mAY5LBWooV/3SQrBcx8avavVz2YFJmFa/om5rF4V/0CAFxCaY97pSt7qvq1wMxDFRaGV3FDUzvFJHxuwmQ7WRCO2rUfm6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BIB3InyzcpTeaizpZUYK4EQ2gh1izWX1Y6qIAqAjMrI=; b=XFJ+rFeu+KOKVEeG7YrJOxYz2KJhOfWs08/HBNobn832wUani8wiSxHiEdRdwVUDzB2yoKspzKEazMo7dgCb0XvRqBLPN4/WXRcYvw9fVvfXhigREfGTGlP/zIMkjHkcCpifvPhVQ47sTtpUFrAiqLN+Z/gpdCBCs099+1Wkz2veIzt8ntW8pNm/MD28KgouFlyOJYzT9sgGD/B9RC7NUbCfa/MnWgYXyZJAE0mO/qZEbBG64xQr5vANSAQ+CvVK8mgETTEocM58/m/KtnMGjkmI0H9atiro8oT5XaC0K/GKRxL6mTpqSetxvPgGQAndOR82wj6IvZIA+jm7MRmcQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from BY5PR11MB4167.namprd11.prod.outlook.com (2603:10b6:a03:185::28) by DM8PR11MB5704.namprd11.prod.outlook.com (2603:10b6:8:23::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.16; Sat, 12 Mar 2022 05:35:32 +0000 Received: from BY5PR11MB4167.namprd11.prod.outlook.com ([fe80::f0c6:ef53:bffd:962e]) by BY5PR11MB4167.namprd11.prod.outlook.com ([fe80::f0c6:ef53:bffd:962e%6]) with mapi id 15.20.5038.027; Sat, 12 Mar 2022 05:35:31 +0000 From: "Reyna, David" To: "toaster@lists.yoctoproject.org" Subject: FW: [bitbake-devel] [PATCH] toaster: Fix IMAGE_INSTALL issues with _append vs :append Thread-Topic: [bitbake-devel] [PATCH] toaster: Fix IMAGE_INSTALL issues with _append vs :append Thread-Index: AQHYNIZNKb+51jKdP0KRGKzfQQ1Vwqy7LZ8QgAAPN6A= Date: Sat, 12 Mar 2022 05:35:31 +0000 Message-ID: References: <20220310135344.612089-1-richard.purdie@linuxfoundation.org> <16DB888AE6064C9B.27059@lists.openembedded.org> In-Reply-To: <16DB888AE6064C9B.27059@lists.openembedded.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0250a3d2-8abc-4933-c336-08da03ea1feb x-ms-traffictypediagnostic: DM8PR11MB5704:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6Ley0I+OsvgD+C2SKW+iZtFlD7XH0imiXQJI+qpwG8SxlQRX3O4D8coB5BJy1V5zq1GZWU74cOQvEIQEYkZ+sry7ExscQWDVHV37yLNvnmVGBNqtvyQ4Maw+voIC4U2VH1euTXlEZ37iJiEAx3vEdB/J8gtBBEuODAjADzCsQFNhVXNqbQbM6K3wdZrsSOnrnVPa8v3OpMEBSYtQm/2OfGBNlNHFkJDRhI4lu9+cwPPvDD53hK1npR4Iz41AtZ/MVymAV5MXxRLH/9uyscvvACAao+fiIaFCsyPVKeTSmvC7+2dSYlVFGQHovJ028eH5IZMmj0OhGv6AhAeiXnRgfQxkqb933lX8oVdfpYcMdQflj3DHzlHnIzu54Yp65dtmn8BSSxsdpO9TF4aDLgu+xcdkF+v0hZfkQZUddFIBOWl5KHQlB6n7eSvxq/Dgxi2I5y2vMrjZCgem8w7x1YsgPKhUMMoFBZLd27sYW95WpX9VBgDBXmVvqsRuJXYLrhr+dTOstQ2oGz0CS1wYrYq6DdKtoD0KSb4tLj9CirivCICfcQCiDIW4EzFsXYU/iVP9Lgy8eze/U77sJSMwtDUcrt/ohOhu5J75LD5Y+If4YI9IOFfRlckhji+r8W2TZ8hN98nLpVq2JH2VWrLL9TzxueBqPf8t+lzDrsfL71hk8riZRH3YesZjjeATBCM5w6zaG0TZnekZajR+PKFmZQKTeQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB4167.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(7696005)(76116006)(6506007)(2906002)(53546011)(9686003)(38070700005)(86362001)(508600001)(66946007)(8936002)(66476007)(64756008)(66446008)(66556008)(71200400001)(19627405001)(5660300002)(52536014)(6916009)(38100700002)(33656002)(316002)(99936003)(122000001)(83380400001)(8676002)(55016003)(186003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: qSmAHGAvY+tJdw/7PkYUDRvgUKGy4EXYbn/FxUUXGE6kqke7iLNoKJCjeamEvgLsd8qdm8eFqLw+jiZGX3FfNHZGjt43Lfi6D/0lnpsyyba0YomuAj7YRzPYpvPqPH4L2HA95XD4zUMHEr5g6oq/STYe4RXYSKzSz29b0DODV7d2dczY0XXM/4f6s/RjyQqLTIuz7OKo6bF1iU0WXR+QlDqo8977ZXvLu4aVmj/ZnxNDoUUaoJpqipTATCTDu9Xm+o5RsENAfkEduawYcHE/7MKD8Wm1emoRQmvQtlqp92P8fdKC77yRC22ViQekGF1FmTw2AjmNfOzog+UmUbPtf7hMjXArqE0B1cSDYVw/KSmg7cV1BIvQxPuK/8SOPh0dXE6HSQUzyiB/g3t7m0JU3q4gGe0iENpNEytoJ+rjdSq7kZNXa+kesenvELcAy+5ZINvlkKyzCnPmIMXtYe7bpOpVWOzYxgy/VmufpEDD5QBGN+5769W6vesQzkXrRJmEVGKNmGcIiO8KoNVz0sZ5vanCPDtKAU4sao8BPX7jA15Jwn1cD87yCpnILAcnZj+h0asjrDG+SroJ2fHLRMiXc5qiixoF3j6kdSurVHMxpj6eNpb7WxqgLqiUIlp60Wkc2Tgni58nIGHQ8ajRUbodpKTl4RVptZazAFD6BgDu+zt44rgiI1WlvrAEiFLRDb5YfvdEAVRGkDk8TZ9pFWVKFh5wFqDnABjrhsCGNq4HoX5gd1VFhEP24zwjBAHDfApII46RdOLCqgz9ucg9LlHF0PJUf1RTyoZMuayUBG7UI4UPyHz9NlCIhGPbA0YtdNNyF+334RFNiqvFcGByGrH0/BM6IIX0jiyi69Z7p89wGplxxuRCMIoiWkkI5YZ/cGVyhiVoGRFGkQAv2Y41+xj22JL37XEGOx3VWs0szevhsigGNNCQZQT3nUySJ/P2t6NwpyR9mFAskfTF+K9V4sam43HmUccG10TPxLtSJCrzAuGs1XmkDmcRxsEXhhAf0G5REl2ur/TyB756Le2D33mrKwSE5MOwT19ZCE5CiFwpTXx2S0kVEtsjboNxDOcyV3JVPnswV6Yd8fX/RoZh/gBg3i9anATlNEHHzxLo906sYDFzAo3ItJsWk8v1xGLN0lMAn3MXpuAOgefvB+AhQ8TnkuvF5icMZnwXbvDNTsjCwe7gI7pZdJe2vSwXziHdVG3JD4yJrGjrwogsY20DgVlF17c3NygaqZXcBt4NairLdPf0A8iMIRmXDBzUoEKlLx2Q9lUbxaKZosb/GXp2KqGhk2QidsnpgI4o9Bky5kHJAUhPh84YAnh0PoMLX0tszTNm1aLhGWtLNLTiJ+H5yQSdVhbpHXteCC2mDgN82oxdLXsKBOfuZwNh+r2xW4ontl0il56fnT48q2ob3pRV5td10jU/6R0/tmRSwJiA+HyBUjWZaBh2KOVYrBo2KB0BVs/k9V6m1EUstz5o94Z8H+oQX7zUn4pXNItnK9Mmee6pb4xxX7bxR4Y4rTwjqAp7WVH4pSSkR3JJ9lcnfdUvzQ+NMJD0UeIIYa0w9+e/VUevyppNz+8aDVT2RKw7D1dguuwF8i8WrCa/hs6n0SJDdyY+IYDZDHYaHy7EPSIysF/QHIkWKJnvTIh2fTN3U1lFBfPwCLpoW3/QT/ET2uXb2z+/oCZ1kLGd7jFrngTfqDO7/tShomPGqBGL4yKwKtRttTo/rw4QZd258Ovty4Rj6Ui5cw== MIME-Version: 1.0 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB4167.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0250a3d2-8abc-4933-c336-08da03ea1feb X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2022 05:35:31.8184 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: boBsyotkoOF2szVzL6CO+WUaw1EoMtbTQ0oF6NRyFcpbCGVqkGEaqOV/qhbUzpAbx5BYc4Z0WtCEPx65NDARzJnFhhMWtrBWPeAj5WdIZA8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5704 X-Proofpoint-ORIG-GUID: wYiiKG7waaZkEx2uwPazC9u_bb9JzqG- X-Proofpoint-GUID: wYiiKG7waaZkEx2uwPazC9u_bb9JzqG- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-12_02,2022-03-11_02,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 priorityscore=1501 suspectscore=0 mlxscore=0 clxscore=1011 spamscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203120032 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, 12 Mar 2022 05:35:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5768 > "I have a suspicion that exiting toaster databases may struggle with the change and there are some migration steps missing for the whole overrides syntax change step." The syntax schema is not captured in the database, only the name/values pairs. It is used in the UI and the code generation for the respective project's 'local.conf'. See Bug 14758 "Toaster: add overrides to UI and parameter generation" Patch in progress. David -----Original Message----- From: bitbake-devel@lists.openembedded.org On Behalf Of Richard Purdie Sent: Thursday, March 10, 2022 5:54 AM To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel] [PATCH] toaster: Fix IMAGE_INSTALL issues with _append vs :append After the override syntax change, toaster isn't working correctly. This is because it uses IMAGE_INSTALL_append instead of IMAGE_INSTALL:append. This tweaks the code accordingly to fix this. I have a suspicion that exiting toaster databases may struggle with the change and there are some migration steps missing for the whole overrides syntax change step. Signed-off-by: Richard Purdie --- lib/toaster/orm/fixtures/settings.xml | 2 +- lib/toaster/orm/models.py | 2 +- .../toastergui/templates/projectconf.html | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/toaster/orm/fixtures/settings.xml b/lib/toaster/orm/fixtures/settings.xml index 78c0fdca7f..ab3ea021f5 100644 --- a/lib/toaster/orm/fixtures/settings.xml +++ b/lib/toaster/orm/fixtures/settings.xml @@ -19,7 +19,7 @@ ${TOPDIR}/../sstate-cache - DEFCONF_IMAGE_INSTALL_append + DEFCONF_IMAGE_INSTALL:append diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 4c94b407d7..6d772367d8 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1717,7 +1717,7 @@ class CustomImageRecipe(Recipe): def generate_recipe_file_contents(self): """Generate the contents for the recipe file.""" - # If we have no excluded packages we only need to _append + # If we have no excluded packages we only need to :append if self.excludes_set.count() == 0: packages_conf = "IMAGE_INSTALL:append = \" " diff --git a/lib/toaster/toastergui/templates/projectconf.html b/lib/toaster/toastergui/templates/projectconf.html index d62691df1d..3b91b6679b 100644 --- a/lib/toaster/toastergui/templates/projectconf.html +++ b/lib/toaster/toastergui/templates/projectconf.html @@ -73,7 +73,7 @@ {% if image_install_append_defined %}
- IMAGE_INSTALL_append + IMAGE_INSTALL:append
@@ -83,7 +83,7 @@