From patchwork Sat Sep 21 10:04:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 49401 X-Patchwork-Delegate: steve@sakoman.com 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 50FF6CF9C69 for ; Sat, 21 Sep 2024 10:05:53 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.92.89.62]) by mx.groups.io with SMTP id smtpd.web10.6831.1726913145121235100 for ; Sat, 21 Sep 2024 03:05:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=U/7u07Tr; spf=pass (domain: outlook.com, ip: 40.92.89.62, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tUB1Fy/0k4PwWwNx7u3Cll3hdm0cZnWOJkDlb1P/VRFlPxXLdBLshZr/i1k56QjsB2CkBJnko17cAqUKagkIfViZvDtvzh5xmkzs6uVoXtw4gzwPYgUvntmb0tRcozHVdTKAxj4lrtL+PCMTIwOv2RU11NK9/EZhumAe11GNV5xNnZtLyXFLmzyUCNpsqhdZPtgaJtcP2hu+6logbLOxbX9PcAzcW7g0T4gpXEPvXZvUD2Zk3WvPpDYv9XSUFeZunNLTGycEA/2kzNvcHRIGBn2DFtq2Z+hh4YYrZxxM6zsCKi8hTAynjM8PTYYn97v/YSfBmk9hTLq1nm69LW7c7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=89bn7diFaR5blaw3V3+KcXDmOtWb8w9IrN3H8im5Hzg=; b=NWdWJtHOVfZrMXGp6HNDj5GP14oGW34QvO3skd9KHZTfCzAozvm//OxvtQf3CFn9E2EbxtMRl90YnOv2OA7ShtZi/pPV4LqMof6+Z+KbI8uJZ8S8v3/+pI52qokoQe/nteZh0+wdsXW4w+O6xOsHhcEWu30kMnCYKKrDRiC6eGkTL3/GgpaMAg3+aTvnIPeKOTxUxJrjyFeWzNSqZxiOvY7r7Pha3AvgQOdqkbRtUafjGDIBF2i2BvfT2Z/28Z5sq3tpH8quC5XeFNa/KR7E5lVcasNcfgojlVlw4LN+iBYNw9U/D3N0iuZ6JszasZblZwLHnkv2Co3ivNn6x6nS0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=89bn7diFaR5blaw3V3+KcXDmOtWb8w9IrN3H8im5Hzg=; b=U/7u07Tr4VuSoa7tx0CvEAi49mjTsCU6CDqWIpe6IQ2HnM2T7nV6BHAMwLKeGth/M6J+3fL7AOa0xzWeIpD3tTZ0hTzWXfsUixDhkQ5ObwC4J4rJlPjtkLw6vdinkkSFPK83Z2X9nYuteHJDJK7xMmFSi2Ca0QpJYzY6L+Ha1PoQjOoy7oZ/7kFFmnpwVOM4pL3ZBkLfQXe30FKsNEXoBoelyEN2wsqEVSlK49H0UJkqQbtgPqWNThk45s1QzmZjiBJXbyIFngiEPx2mAB1iwP20d/NeY1q0OxsrENQXxRZQudoa7kQ2LJIdCSomLUwt3jK7hwsGKR2v2l614ZBgOQ== Received: from GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) by AM7PR07MB6246.eurprd07.prod.outlook.com (2603:10a6:20b:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.23; Sat, 21 Sep 2024 10:05:36 +0000 Received: from GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a]) by GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a%6]) with mapi id 15.20.7982.022; Sat, 21 Sep 2024 10:05:36 +0000 From: Konrad Weihmann To: openembedded-core@lists.openembedded.org CC: steve@sakoman.com, Konrad Weihmann , Richard Purdie Subject: [kirkstone][PATCH 1/3] runqemu: keep generating tap devices Date: Sat, 21 Sep 2024 10:04:42 +0000 Message-ID: X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: FR0P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::14) To GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) X-Microsoft-Original-Message-ID: <20240921100444.377583-1-kweihmann@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR07MB9120:EE_|AM7PR07MB6246:EE_ X-MS-Office365-Filtering-Correlation-Id: 72e9c9d6-d301-4014-2a24-08dcda24f018 X-Microsoft-Antispam: BCL:0;ARA:14566002|5062599005|5072599009|8060799006|7092599003|19110799003|15080799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: JM3W7R24wEzcNLEzvOjaCw8ICUmSBYSLFetdQZu7NwrK7UzAmS5dfgCjnb75ep46qX4Ld49n9Cz1NxGyj6jTcxnxTxJHQe2pxk6OAgJ5BIExzOonWjDxDWwfj/CoHzwGfvo13aWr7HN1QgoiDh4P5/MUXzlHMiwEVnoj5mhQl0gNJ5A8Ozo6mKneo2sMOfU/dMTP5YRRsOy+/17Mmd/af1+8YQK+vyHE9O4nExXG2biBD5S7LdH9xm1Uy+mMtAhzadfQkHZVogTYwKs5X4jgA/HZGOkHruLU1f2otOkR6cA57geXF7ZSy4/EeFHNnpRnU10PwMHeM0dumzLgnvppJ0ZW+3Gwg7WSYWa/5ADPDaRPlS+yJsyhqbCfbmZfJu91szuPVcbkbuJAO7rmxnT50imh/b0gzaesbmrzdKHsULl3n3iVnteC1w5pKfT5yXsoLukemoyjj1yr/8O6m5+64RvobhJyRLOQoApg1TP4owfHV+GDmlDRs5fWBdXYnt7yYVqveuw66Kf7Rf9GqgHr3wzh8IuflcdbHJuJz0fKCFq0emc/wtuM5x/Q5fcT7PF1Jn0E0y3Xi+WBa74mvlvZMTf3tLzB9UJkPskd2xeS5IQiWZmtwEAzDRk2cHJdVlf+0DJ4gBDTKJQVPTHXuNCsxwPIDK81Gxat2dWJLvbTLQ3kqAI5RrBkS1mnqNjgxvv1EEyKo4uinv9pOXDLfRKJTbTYT4eeVFkJBvYigN4tSPXm2ZdjF7rGwVg7T58ZkQ1Yk2Y1WmWGdRP+NGrns8Lqvrtl6xyZpeiwHSVaksjh1vU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HN6ZI5IgF+iSsAEg+0gSNvNy0J0A6H/rFfOFN4ivAPg+BGyNVpiBPpp0AwqRbXDDvFhdayS13EnY2RvtdMzJxuQyLOXzUVoYhYBfQaHTsMZ8gReLTRoMUx8K+m2MWIq7fw79ZM1ZC83vYP+JR4vsYDzE9VnFpwj2oIm4rAAoCdt1nNv0EuMg0AaQI82s5ildDr5MLUbuxFrZ3GDSowDTfgu7lqxBKd/EvG9oiQfXB9RexZGYb94OI9AbV5jUOFsD2jTmYJHQz9tM9O/+qhWuaJnPCqkgkGBPb+L+P2uYZubpkD11V+N0UDB/Zfg7AEC/P4tfuzuOEJV8r24nbLp6UlW9EHxcJvKDzzMcC34C/xf8SdsMwcf4ry3xk9WN2bXeunymVriCgCb6UF8jcpNr1jubcU0Ai6SmTKWJr/+06q/lHXP9iCQAzdNPPrCt0f6YsXc4NZuQed2Ltwq4Ea27NvVFwCw/tColOAHBVVL2Bx1WRe2UeYaWkf4nsDbdpDf0MfJ6opp+cFu85n+FgXUT3oSlqRHcNX6ARfk10Kr3wavjpGkvuTYMtG6r31iEynHH4W3/+OioOmGaWUQAXlxsL5SXUYr9BW2twUceLyrj9WfcZioSZZUzC8iKVyzryyAwOvIwYc42zxohhwpkEFm7itCtEq2Alv7HAWFT8iluQsVo5UJ5aM3s50iTwdzmICkSGi3tMdm+2WoCmK98UQdGG3lQLg0IiOwFW+PIL7ggPQHYwauApILwfV/aMbvtTuxEjYOF0YzWvJRUPPELdTHrQLb5W1G4E1TIf/K6wE/2unke3xreEltJR5NzozpVXtvwlw6aMjqMUs6j4gKCvPjVSGLoE8W3Ft8DBJ55HrfRQvDbEyj1ewjQ7TR/MVWDM+EF9BLnW8betcJS3E5GBeq10y5XhmyfzQtILt6A/KxqlsCI112veMkk3TJ0DdC7tG74QfnSQdbMb1lKwwbT3Z1nK63AabrseOKM/G/SCiMbD10QGN1jUgAGROvDD14WngMfGbJB7sXyV2/q5+2Z5M4/oM108sg6s/JozjP8wyLWtigwO6quEw4cNo+p2eO8PtiIFkHiMBOKYQliRPqxrNKw2kqXLwRDJKpYkh+LrxoVYPZytxGozA97zO5kp2mngj0laXYvT49uSrJzRgqOZpirtiGPEFJD4QHqJEl2CA+cKjy8npuM/gSG5rBxpEBEutF7fw0Ne5vKLtRPoTvuEFx+FCkOg25Bl5gaB351r7atSW3KiogX6rtwMfzuGT5jSbYlLgZ8kvy9AGzux0rnAmSvEX78Uro7ePMwv/aGgOgjMXM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72e9c9d6-d301-4014-2a24-08dcda24f018 X-MS-Exchange-CrossTenant-AuthSource: GV1PR07MB9120.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2024 10:05:36.3301 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR07MB6246 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, 21 Sep 2024 10:05:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204765 in case there is no tap device the script tries to generate a new one. The new device is then unguarded for a moment, so the newly generated device could be acquired by a different instance or user, before it is locked to the instance with acquire_taplock. To fix that keep generating new tap devices in case the lock can't be acquired up to 5 times. If no tap device can be locked it fails in the existing error handling (From OE-Core rev: 23876576d054ebbab9b02c0012782aa56feda123) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie --- scripts/runqemu | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index ba7c1b2461..8a417a7c24 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1150,16 +1150,20 @@ to your build configuration. uid = os.getuid() logger.info("Setting up tap interface under sudo") cmd = ('sudo', self.qemuifup, str(uid), str(gid), self.bindir_native) - try: - tap = subprocess.check_output(cmd).decode('utf-8').strip() - except subprocess.CalledProcessError as e: - logger.error('Setting up tap device failed:\n%s\nRun runqemu-gen-tapdevs to manually create one.' % str(e)) - sys.exit(1) - lockfile = os.path.join(lockdir, tap) - self.taplock = lockfile + '.lock' - self.acquire_taplock() - self.cleantap = True - logger.debug('Created tap: %s' % tap) + for _ in range(5): + try: + tap = subprocess.check_output(cmd).decode('utf-8').strip() + except subprocess.CalledProcessError as e: + logger.error('Setting up tap device failed:\n%s\nRun runqemu-gen-tapdevs to manually create one.' % str(e)) + sys.exit(1) + lockfile = os.path.join(lockdir, tap) + self.taplock = lockfile + '.lock' + if self.acquire_taplock(): + self.cleantap = True + logger.debug('Created tap: %s' % tap) + break + else: + tap = None if not tap: logger.error("Failed to setup tap device. Run runqemu-gen-tapdevs to manually create.") From patchwork Sat Sep 21 10:04:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 49400 X-Patchwork-Delegate: steve@sakoman.com 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 4EE14CF9C5B for ; Sat, 21 Sep 2024 10:05:53 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.92.89.62]) by mx.groups.io with SMTP id smtpd.web10.6831.1726913145121235100 for ; Sat, 21 Sep 2024 03:05:45 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=aCaU2AyS; spf=pass (domain: outlook.com, ip: 40.92.89.62, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qBg5te0MzkWSKgk+QLOv2hTjV0gRs3rEkxqpwf5JN8quyE5giWKBFLUfXRW/kKZEvyVktoHImj7tUp7bXK9wb7mA9+OIJ8TX8SwR6MDGy50PAiGznJv+wmt+CfyqLvznR5bUJ+jNPifL7BoVrzwCedXbNWxbWxRlQvtxC/oPvJBe+dZ5BKCOlkkO9PqtJslurxr4hTdYtMHCqcyD0oXgc41Ki+Bzc6m69uFxA1RA15HMYrrOY/R4FhbEF1wq7KbRT/jEi4BsB/Ak1NIDOZKLR+/MoYGOe7gqtgknvNx3UMceVBGoqBEB2GYt/UApYk1mAharCPSWFs2NI7KeuE0j+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=lbgD0NSXMny7qpIC7WRM7h56nY38UYzSbapJmqtwKTM=; b=hGFbnaCi+izu2fJc0yBYwz5sQ9aMGW6/DSt5tOKm2ITWl3fy5wIQqYunu5ShQeHP+prYmD+W75gYARISZuyNpIeR6MPl6hjUMBE0obGmGbPGHzox42UA2PVjud5Gi8vzF4cZOEGs0YxCHp2F5dLU6VvTFxBSyMa/ex+zsvdF+70Ab+EbhM7RimHjh6SwKb6ICaC1Z2ZNs9Ff1sDemQ5C8MC2Duhxn99H+q/rb74OVU0Dj0+kH++R5NwL+hyDrvmDvXTbloVkefnDwlem4uC11RCFHTgX5uodiii7JYVmCBQByTc5Cny1NbXXCFGXZJMUKyvvimmu3Aep+6HulVNXDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lbgD0NSXMny7qpIC7WRM7h56nY38UYzSbapJmqtwKTM=; b=aCaU2AyS5Myeo4UMwHy+ms5MUCsIjtAcjJdIyuedTDTLr9GvyP81YQLi8z+hbAxP5cv6f7vZ2cDTSW6ZYAZmeVePr9VqDzfxzrW0Kry+YWbT2Ky53eAhm4W9twqhu/WR1fRBDSYgUItbIMoBhIVPl/XeTVTwo7SAiS3YG7zLMlIZIV/PdeRsKBez9AgEV8Z62qIhQHfT+AU6vK4rh3So8v9LEsxxI81iknhDK9SfQS1AXkgD/ijol4Hv+BJi3FBNXDnKUCZya9RNewwuK1lvcOFUPTAiVMYT7QExh4A7b9hNvMnJiVynMqgZDA1ktRLV9aqmLmTZ0pokbrc7GcY6aA== Received: from GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) by AM7PR07MB6246.eurprd07.prod.outlook.com (2603:10a6:20b:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.23; Sat, 21 Sep 2024 10:05:41 +0000 Received: from GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a]) by GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a%6]) with mapi id 15.20.7982.022; Sat, 21 Sep 2024 10:05:41 +0000 From: Konrad Weihmann To: openembedded-core@lists.openembedded.org CC: steve@sakoman.com, Konrad Weihmann , Richard Purdie Subject: [kirkstone][PATCH 2/3] testimage: fallback for empty IMAGE_LINK_NAME Date: Sat, 21 Sep 2024 10:04:43 +0000 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240921100444.377583-1-kweihmann@outlook.com> References: <20240921100444.377583-1-kweihmann@outlook.com> X-ClientProxiedBy: FR0P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::14) To GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) X-Microsoft-Original-Message-ID: <20240921100444.377583-2-kweihmann@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR07MB9120:EE_|AM7PR07MB6246:EE_ X-MS-Office365-Filtering-Correlation-Id: b2fa3dc2-55e2-4484-dd5e-08dcda24f2f7 X-Microsoft-Antispam: BCL:0;ARA:14566002|5072599009|8060799006|7092599003|19110799003|15080799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: TteFV9IJrIRbDyjU1X/hFsIT49qxUAW09BxtabAApETTciy4M1BB3LxQt6KhhH7NCfp6zC5fPbsN1bRabnrtJ93Skwc5TNc6FgN+a5mDqr6PYHWprlJeTDGI/r5QF6IS3FjDqq2e3AwCgCkDpzeS7TptKl9bAErNtSEXriC7hnenc+A0ciOdiPz0zzE4pvKGmkK/njZ1Pxha5U5wvEgvAIN6WcIE0sKZM6uLogLe1g2UYrnZgD8LlRmEt5X4nImEsMIe9ZwQGPtgFnr5WBrhy3QlRYE8WhOulb2r2Fb1UkF6CJr0l/9AcGRp3HV9tX8AmiPt75ua+75lDPiR3OYZZwdK1GMeUKQTUz7yK8UFTpFX7G+49pQwX006NsI9GtUd5QrFjrfjl7oKduYtJ2cu/RY5YQXoYf3mbZQy6z9+MXZaafhN9ALBmQXjEcRmp6CgcrlNltn4LQDR/pmjeNGX7N/JkQP/U57Yw3l8UI/jdC2jC17zvKYkfvf60Kog611VReT8FrokL1H5lc6rYrssVfKCY9ELmVluE/f51Mmq9zbH61WmCEzDGnfFjsiCUFf4xl8hxM9xgyjBoTED89T7dC26uBvfAW1cB6przluqgID7n8m/vq8i92ksTXLg5hGJkFOqDZDvfGBoLiUrkq+K9ywvjC2CTSYjmdHg663otsIgXWRhqSnTCGJ4vyLSLbyVN7Jqx8Uu30+mjPZHVsZgWQ/gDZfh3Zp24IinjH2JMkG+IRpsGl7n/1ZglMbiuUl++X8rF99uPpn2dEx3BHbBqQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MytAdH+ne19ouBukIFKFjaNyxIp3rrdW6jROtEFnjIOuLDXVKOJ5IZiq8uAwXHXHS40ihP28E93aFV0tCms1okOOhR1QZH6eQSChO9YejZ55+yBRunP6m4Nf5K8Pjb7VHJs4/p8bTxTfjp3MeYVFHrkAndW2xyGxrtppkzlOYCRbK0XRK1DRsP2d5MAmHBzcdBwo4QcuR9XjlLt2Xg25mUGeWVDHVDWLT2lGaALzz0CDZhENuOaEbjjg5+QmyAfwlvzA1fxIuGs/8Q2b97f5pSGcZxyZRWjBWk7h7zTbPkgEFGd2VDDfumIHABEVTzVm4IrR8Xx5OF+oxfFsx2IIySPlD0SGpHuO3p8XnDJWh7WAaY1kUMTXzdk4xPjufK1J01hUad0g1oGEeEBcuC/tgvWsJEn4bCLkVplcKabSyY4j53crD6qq0YuGFSs4gCeO3C32vZumIRpRhbG53Taopv9M/M92dHdG+F/fhYmNyhr2Y4hNFngT8sDwmvRm2H8oQtcq3woaeGisiNfuaQeZN1MmBZZV+HsBduJhwSO7MqKw4kI24UWiFdvC4K9qtPlDm0osn7jqBzpPEZEl1brKz7bKi/d60LaIlM6tpbEVquSSnffA/zzzL42+6zCLTyyUMHMgsez8W+jaxi4s1jlH5xK0XzkPE4RBnvkuD3+6g+0KarbaSWi1sTdxEYIPhH1Ji+EGaDe/hffkZ/l5lJiFaDyEFYOdtPM6hq/e46QVcMrZrlGGFRb9iFsAEUMPT3fSyCjrBeVtwMm37Pp0mUt4+/Pw6fTqoctywNYS3Ulhh3ZW0gkityldYk54s9aVGV0LFlgJuuyvQrQHxSWPm18BkTLUzMjCNDI01Ol59cqNmDmBeadTO2YcmUhPBHDthbtnvGzug+hmlQ+g6/bpAr3svyiS81zJxbHrWPsY7GEyZT3YYh9JnHzIvnx7SW4IyysaVItSuRcn6xlSpSEVCXL1SczC64XE4dTkAPxXhmV093y7y5GrZmtZNUT9qlf0qqkKDmOHthzN79mGfeQFICTPoLOdMRlcuGOF4MOcQJSb2Ing7A0g+lySB4rKiccg746gfhKkOgqo+FpdvrNyVUnLl6mqeyLaJuH/VcyBJFg2E8lRFVfOc8s58vRLi2N6qWGsQw48/oZrwaedd9xbRkGW4hiud2FzSNU8NmFSZX+NfvC+F5pGEUv56OUW7a5oySHbw8SlTEjXazMJiiMEUlA0N4i2pikORrwdEIZWvgXmi5Q/F7iI1QYUdawhNN5kjAoWKZSqJZ3tE0eYQgoFHilGXnEa1Pu/DgEcHGoBmOAUxDM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2fa3dc2-55e2-4484-dd5e-08dcda24f2f7 X-MS-Exchange-CrossTenant-AuthSource: GV1PR07MB9120.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2024 10:05:41.1857 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR07MB6246 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, 21 Sep 2024 10:05:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204764 if IMAGE_LINK_NAME is set empty to disable the symlinking for image artifacts in deploy, testimage fails, as the path assembly is incorrect. In that case fallback to IMAGE_NAME (From OE-Core rev: c7a4e7e294992acc589c62adcaf6cd32659f2f9b) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 0241f29dfb..a91cdb9a1f 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -98,7 +98,7 @@ TESTIMAGELOCK:qemuall = "" TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" -TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR" +TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR IMAGE_LINK_NAME" testimage_dump_target () { } @@ -209,7 +209,7 @@ def testimage_main(d): bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME'))) tdname = "%s.testdata.json" % image_name try: From patchwork Sat Sep 21 10:04:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 49402 X-Patchwork-Delegate: steve@sakoman.com 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 624C8CF9C64 for ; Sat, 21 Sep 2024 10:05:53 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.92.91.90]) by mx.groups.io with SMTP id smtpd.web10.6832.1726913149051348302 for ; Sat, 21 Sep 2024 03:05:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=FjPV9kyj; spf=pass (domain: outlook.com, ip: 40.92.91.90, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sh7ox+qE31RDbDqV94YCbh9cgMsaxpqU7QEO9oAplNATM358tYfncW97EZ4cMXPnipWrYjQG5lKfH8sbxGM50GG8FPs3CyFJ5Z66P9K30THEdaxZ4PEI20JE+bbU6oBGUMfW/H4w65af5d7v4rQ58swXnENEAgnPYqBdT4olX0lg1TGN0ideogSCY0wqdX7K8YrxzjxnHrSPpXtP56bu+/lDBVPqMj0V1mb961Px8SDudyUQuzm/08uoQXs2Rx7qEcfYVCo4sabTPpnLGNsfGDa6DjydH3L7t/dK/Dse4xasgI9uPHfM/A8Q2ORrU9SiiubAGdY6Bd5kI1qE8baKkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=gKV1/KABZNr1pNLaYMB4FOlO3MZlBNXfh8tTWItLRm8=; b=pn9RWfXyXuD2HHry+3aNA/gDpYWXbTRWA6ouZiYSEXrxRFOMRY4L2odq+i7jIC7dSlL+DJ004WO1WzRSdNv1CraNenphFGATbLbLIar7dWs9TEVdcsTmE3+o1Qvxb7fmg5cewV+s9qOZXcUhb8ryt52NTy+L3pbQ8rer+E78LQ3o+u2PX616+S2vVDEDu5Jt1/ak+25DRtkDirYLcmYlE6gz/1tLq6DLsp+w6iz5SvzlZ/l0xQaY6BCUDgoImA0FyunTpL+AFjdyjIMKIKdsfjBL1c2+//+GMIhTazxk48iJgTr1Eyg8d3y3647/Pi/XUhTx9tuLHdU3gqjxiuUf2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gKV1/KABZNr1pNLaYMB4FOlO3MZlBNXfh8tTWItLRm8=; b=FjPV9kyjTeXksND+yRhWQPnlx1MOvLuLJICYGVPwRUug7fXaAkHlkCF833fshslndWuB+3vxtAXY54Eu/eGiw1hzrWXSt7bcIiUBx+w7/VBBY/EgDbmFvpGscIYZLCnixuE3XUEbHFB0J+pt28HJj4ugqpHl/Gb11hsYxVh92pNz8oFSB5YBd5NJKQLkgdERYsXEXJxS9qb87E+yDn/0I73b9kczrJJdHz3D3cbWH6ChuIg4S8eIaBhZez5+/5yMcmNJ9u0jra3QstoTzSi4MDOO9YkKiBPLVXx+CYbnpgHiNVF7RI5GhfVg/lgED11PeNr5HMPqcaDCfatW9bGj5w== Received: from GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) by AM7PR07MB6246.eurprd07.prod.outlook.com (2603:10a6:20b:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.23; Sat, 21 Sep 2024 10:05:46 +0000 Received: from GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a]) by GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a%6]) with mapi id 15.20.7982.022; Sat, 21 Sep 2024 10:05:46 +0000 From: Konrad Weihmann To: openembedded-core@lists.openembedded.org CC: steve@sakoman.com, Konrad Weihmann , Richard Purdie Subject: [kirkstone][PATCH 3/3] testexport: fallback for empty IMAGE_LINK_NAME Date: Sat, 21 Sep 2024 10:04:44 +0000 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240921100444.377583-1-kweihmann@outlook.com> References: <20240921100444.377583-1-kweihmann@outlook.com> X-ClientProxiedBy: FR0P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::14) To GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) X-Microsoft-Original-Message-ID: <20240921100444.377583-3-kweihmann@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR07MB9120:EE_|AM7PR07MB6246:EE_ X-MS-Office365-Filtering-Correlation-Id: e8aa3f4d-f630-4a6a-a317-08dcda24f60e X-Microsoft-Antispam: BCL:0;ARA:14566002|5072599009|8060799006|7092599003|19110799003|15080799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: 7fsLiAVExdLJN5OJYczG2ZvH9JJsfjJaOvOqQE2hQFtVwXbqPWbvv+yEJm7kAQjnVlEhyp9wENgOxDSCkK+5SPVc96ca53fp6GleveyPQI4tW5s82L+mVuW/sTCaWLfiGD2rmTqPfZfLchjh8nYChezpAVDL5nXZBug7Vbn3fviFsdVZyzfSu8XDA+Ksr0TRm/byp4olFdWML40GLZZXbjSGX1yXOtzz4Z9ib4LLtAquVmKQTs/UItxew+UBxpyLVtu3Mqd+HVYaoYhzQ+Fuucb7WlQqG5RJY1qnNThfSCCL5xS3plvIouMkA7i7YBloK/2XGlFbeTQeZJ/N4F4/fBnU8GpscBhw8FL6+CtNh4fJzK891kDgSNgfGx5lIjf2zwPnjhf//J3jVFrRJD48Cfpnfw3JxbIJuYYoIaqYt4YOXL8C7y2e8VJZclmvWDYgk9YL4toE+Y7NncTdmecSXioV6NNjV+iuZ/ERES/AkBp3bsD14ZjrnSPxm/vcYqkVToSide8rX/wTmmYWJgED870GT+81gODLJM9jYJzMmZ5xK2Zn0bl/mf6HDrtXRg9whr5KBYJvjWSV1FdAcCxuDHUkB1Yfq5u8fmcQ2imqeftBZR4Bag/adGpZ3Jx/jPZPuw4nvNvwQgrMGkWcTg3RqDdQTdotsxQ6RmRFPaDe7jAO0nF4VKUs8mqqjtCzhAfIHQ4cOyWyz6bHRWmi8Qamo+loPDxZ6JNqputUXdyQrlvLc1GwdTQbjASYSunOaLys X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lFlxKiXw+OZFTsgVyTaDd2hM22o0q3AKgacGWW2tjrqXq9I63BRZwTH7+6GOH22AUHEhF64KIynY3rZc/l9AlccWR2xGk5T8t4hJujqq22TA26AYEWkK2sft7H3p7AC2IuyJJsdgt4nRMEh9zlvuQVz/C9EOfJakfKlKhezQVhzX5IN5ZmLhUOuegZhsWyrGuyjeDmIZXLkR64XPjSr73LNDPFAhGQzcKgVaqK1raCIt93Vdc2KlzPUwkJci8mb6+nulpIM6kLP4hQCugybVN9QxEhqNa/aWFgPWR5m7tkJH69a4QBYYnJYQvwkGkisRU6qNogdM/vHp3gFmEizUVKEHlNSLhFd+VT13xrLvIzgBNxuQyRqlwGSA9jL8O+KmGJI2TwSJZyNRqy4g8NJsKnMD7i2qzQoXXhBVd+PDGQrKm1RXpcTJh8r+xFA3FDZXzSq+ieG3ryXpm505L9bIAb82YwRfrlduOZUwFi5iIgLCv6/sKBOxargtzYyebpLMb0e2ddtV1Wg7NjHxfnTaEtZRr35Pt7y8ul7XLIPTep8f8hy0z1Xvsfu3VyMjR+gcVFtkHy+N1jYrIFiAbupn5HjG7LbCYfewe/IZjnbxiNOIM2oAFfbbQv0CitErY9/BQJQotyWW2VgZ5+M8fpfMZLlfDK9Q8RVs7RJn/a278mWWQEHivHxSZ8GRXdmi9Y2Oz29eQVo5/Mo7O2/JMukkH+0LWs4eIqRV/WlYGt0tIc3n9YdCLfj9HRgkXpZ0WHvooXr3e6xGl+HUeiMXeLO5zFe6tdb2WNnwqqwp6aQ97t4bDJ0jdKekqmHnilpGEvmdoan+imCqzMYWAKD6xkY0k14eRfuH2NJA74GNfhuRFJSzhHqMvrvbHiqF5KQfp8yTC/Ps9pTfVjUci2cHxIwBQuO3rH5DNdr3qR5qJsaDnQyAMNOaK3CdOw5gDoltO+mnSB72B2I0XKQAe+YBFBcOOuBAgRJzeGnt+2T1k/m75X3TX1JkDDr3hudmt+eowtE7V1YQH7OnZsS5SSZwRI08MxuXbQBZXjN3usz6CFx8A7oc+CiwmD2r0j73malEQ1+UYm+UmwD43Ecs+2qu19FxOrvVvm5zPtBASx9yI4aZXBnhuWgAFfH+9PcBejngnAsQOQzOeEdQQny/xjL1GBcfqV2cpRpFAk72uKdAcN/kcsIp/0+tui53yQ3jfV6IwjbAmtiE+KPiND31XPi1c8YD8m98lMLV1On9kmPCU41qisCCJilFX+JLJX1CCrAM4yiOlRFqBghSJEw95erl6Sdbu0Y3ugMzXjlTNimKPCXKcaY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8aa3f4d-f630-4a6a-a317-08dcda24f60e X-MS-Exchange-CrossTenant-AuthSource: GV1PR07MB9120.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2024 10:05:46.3369 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR07MB6246 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, 21 Sep 2024 10:05:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204766 if IMAGE_LINK_NAME is set empty to disable the symlinking for image artifacts in deploy, testexport fails, as the path assembly is incorrect. In that case fallback to IMAGE_NAME (From OE-Core rev: 0c1d098e6dd08fa3a5aafca656457ac6badcef89) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie --- meta/classes/testexport.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 1b0fb44a4a..deb68ec6ce 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -50,7 +50,7 @@ def testexport_main(d): from oeqa.runtime.context import OERuntimeTestContextExecutor image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME'))) tdname = "%s.testdata.json" % image_name td = json.load(open(tdname, "r"))