From patchwork Wed Dec 11 10:45:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13903332 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 3C9A0E77180 for ; Wed, 11 Dec 2024 10:45:24 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.49]) by mx.groups.io with SMTP id smtpd.web11.7999.1733913918052840056 for ; Wed, 11 Dec 2024 02:45:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Y1iA+pr7; spf=pass (domain: siemens.com, ip: 40.107.20.49, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EkG+5MkfwF+zvMXwWvlse7MV4bNN29vaz1CWNkFlyba2hUxWLejfrxlNNWHnZOMUBK14bfPNMx4AQqmKEGe9mKDA7eU8NqXXukltIYgxCupCksAL2yHiYgEUKtDmn3Z/4v2vaCE3P82aRMXO3Ws0HmzLsDPSEb1OTS/vPYkK22GcIXxVCgebDlZ4x+BI/XL2OdEkj/TQNFJ386gV1sGrAiV7PFPXvVx03/XhalNsZpRcOpn6hBa4rxUJIOMr8k/BkMn3FRZIab9NfwIJ4mAgtWS6Z0km51ic6R77WLcSnF509EUnWtPFRy2Hr5jw7cX26a0Ct/lNpLBlMhSoMRV1sw== 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=QvTFtSqzpVAxb9TT8iLGQcGrQ9NBr++wcCWr0shoFnM=; b=wHKw6mZFoG9iQsk9/D8Id7m6EcIqqewTmkgj1b6+1LHLWQzDg1qzCSH6rWppnKxT8miWR3nvuZw0QiCcIOPY5YaULNNfzwWm2FiGQsJixfKwgdvI9VDqjHdM0twdiZ9tTeI65vIQ4BHgXGW3ke4SejEHxpxChcOF38mfAYsJXyt4ugJaUHqiiotWpD52sxZtELK7NBszPl9J1csXFn97fchbxGbybsYFLoyyM0cMseL5zH2uTMsJ16xoIN7xuBp//ZxNNdEjrbS/sKxRtyKrr/wjCP128BBKHt20dOKZqgysEq32IWsWZzu/Hr7dd8hEreVuU5s4zjTEBnJz1S3SkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QvTFtSqzpVAxb9TT8iLGQcGrQ9NBr++wcCWr0shoFnM=; b=Y1iA+pr7flHOZUsVJUpDCvXPxD/uOljzZRGnJIBJGRVhiCRgNR5Plif7vLAanEWwauloo+vI1upRsNMQBWdm8jt9TXomuiloeHmVyXspICqIunpYzZ7mNvpor1pUu4ol0og9LA9/mawFZW+5KdEVWb1AVhWjR2UJw/XAWJ1jHhwxk/VMV4dt/xZaaVo2bHDAd1q3XyKYYKnn30u+1mgn/D30zbf2HyROKxHW7jTRHEe/glKUxmeewHmBN2LstPSUJAUZG1ZxHFclGiiKlF0V0LpyGCIv4dO2YkI9gnoXYgZpw6Sci7gSIMS0HaQP4Y61PSTsBuPlI+pkfD7Spdq6Lg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS2PR10MB6870.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5f6::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8251.14; Wed, 11 Dec 2024 10:45:14 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%6]) with mapi id 15.20.8251.011; Wed, 11 Dec 2024 10:45:14 +0000 Message-ID: Date: Wed, 11 Dec 2024 11:45:13 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core][PATCH] qemu-arm: Roll back to qemu_arm_defconfig Content-Language: en-US Cc: Quirin Gylstorff Autocrypt: addr=jan.kiszka@siemens.com; keydata= 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 X-ClientProxiedBy: FR0P281CA0038.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::21) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS2PR10MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: c4c69da5-751e-49ea-978e-08dd19d0e50d X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?BSTJkDcdSSgkYBk5T8fkEDj07j5HfZu?= =?utf-8?q?ULSQSvOgxLSB4E1JVfsYzruu0961sMV576S0/WmhnEHXx8yqqfOku3cwuo7Y+xhgG?= =?utf-8?q?HxCQ7e2OEMSavkEWYcIgReJrRXvEykGItT1hPzT4PBMWfHdigUaUoT5Dqtg+MKjSE?= =?utf-8?q?equlGyp7X3hNIFvy/BO+CTTFKcXkB041LuZIl+yqt2SsPDNS9cBgiyYySa9w1yIrq?= =?utf-8?q?+inNI+zQcrRkK9yvWhyOeK/nvpnDqUWbyJIcRrDw0bFLj+hTkREY1bhevZJKBUOms?= =?utf-8?q?eU/VA8b2bvrDdxcEzrwO6G8PcQt+yS+hgEeZRr6iAmfLVMCjSjMDwL7cZo+Y5VUlu?= =?utf-8?q?HNf7AilmuyIMfLxHW/6qgzrJN7m+QnHBlxhNkpW/efYkWhxSURsF3i5UOcKuZhTHd?= =?utf-8?q?dhAt1zhFX9tzeDnNMDfu4oFmRta00w2s5gSApVPoVW+zJSA7c0vjr6wuX1AxSHtMY?= =?utf-8?q?5AE7RqaoSy3MP5pOwOyFTGOaV20diIeFI/NU24kJy4Lv/TNkGu0FCwSRoEE7JBA7A?= =?utf-8?q?9mkzcHMhAB/N9FQDmrMqGt+f1iI0sEt2vy0Uy2zZ52IP9Ub/zNDltt9YaYYKWOO3k?= =?utf-8?q?5qVcOgyensb4FPRxtEHGTWygF/9RZE/Iy0etKDNXezBDfd2wbrCz4I3d6ukz/b3A9?= =?utf-8?q?6BNIker6GwmM4vnERY7XnGknnBLQPVMqHVXWd1WYJwTJc1EoYLrHCbcXZ9YQ8qqRH?= =?utf-8?q?HOi5Bjr0J3A2MSWcUoMztRfS88FJJk2OO2O3qE8tx661NIyCjNw+MkTqMDohLXd5/?= =?utf-8?q?t9chezQfgkpxml86KaByWm5yKOMcbv9gXBhqhdjnm0A61rMZJD1sCyAOw8f5MTvFW?= =?utf-8?q?kWKUTOGkMHP3RVEglxL+ag0tI3MG7VI/lOH2AQPEhZDvC50UI9qjteEDrpgxkrF/T?= =?utf-8?q?TPSRdhJyulI6mFUWEq+6vGoZhql+MMLoviUxh/k2S2I3t2m0dCJ+RxTzWjjFfGjzN?= =?utf-8?q?JDk/u32KVP+ghNbM0iXJpXDJq2dWWbXvdfgSZ9wVZzFE9Im2MLp3LkCJe7pXysuCd?= =?utf-8?q?VGDerSBt7EcGDtvNkWcPXX0BD9SO2gQUGYSjUrwkxCwR5tgMI4YRQ7pu8AG666HS0?= =?utf-8?q?J7xIXbVBFP+VurZDQhSyKTNXI3v//ekvIPFDsn8pbkDgcRGbhRmEJPfMLK1foyie5?= =?utf-8?q?clWwz3jEf5Yoi0ic3XGbMWW74k3g/0YLG8ht6wGbRye0Do8BXkIfmp+afjhko6dQ0?= =?utf-8?q?cNpULz5zQi5cyUB+1J7lNTTvHobvoJfgW3sR5x6b3jKTIxNwF2smYFIrOidxIEeob?= =?utf-8?q?Yeb33329JDAE1g4LfM4AI7bYk+kiobzpcxPsuO3VwDEm109ZU1wrnUFw=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?r6XLOws6oxDzHlqEcW0AZmIxgdEj?= =?utf-8?q?yjapCjkY3z4msQ6+RMuxUc43Fh02lr866+dJxswu4wz2hDeeQQKN3RSPSwp7qVJrr?= =?utf-8?q?xP4nasseEx5Gwoe2E/QiIMwqkjjg1kRtF6/YTuzL1NqimTU13Ob0dPpQr410j4OAS?= =?utf-8?q?G2DiL7dP+RjE17bzTQMpzqlDHD7HnOp1o5HDPyxSmCj3PQ9HPI+baJeKy+UUT+GRI?= =?utf-8?q?3Hr56xN26zw0gFnlVtz4W9fBLx+piex+wN1qhkpSnwb17sETE4uKprLa8MBZiKe4Y?= =?utf-8?q?E7VsQVnjB92SAwfJOTBqNKTD6EeUXcSbAaSoqQpEofwScDSXJwgJhbttH0o4T5sEC?= =?utf-8?q?Ec2VDPjBxBJRQytmq6kD3JzmhYNjXWSVNC8AnJSK4XzVQg92Yk8Ef2RvO2YM4y9Bz?= =?utf-8?q?/RWSYVhZiK3UutsZDa/71ZcO1ZPgHP/daQ+CWgkW9wLAUXESQFWq6X5YiXBphb1E0?= =?utf-8?q?j8PVDJHaBJlpF6Ag2NSY7A8vEp58iFELw32rW1AYcEM9YN0a11ci5KjlqDgfOHBH/?= =?utf-8?q?mNcft9ZcByoePdMaX8e5yF961NqVJtvNJF7s69ueDXI5uNTVuVNZWbDc777lytcIO?= =?utf-8?q?6cDjSPGT11S7pYdb9TgygTYqdLaLOqXW94OSA8GMVl4odzSDERYIXrYX6nGY7s9Dd?= =?utf-8?q?8izGyBBsD0C27kG8zxvPWb6Y/uHghz5kZtBKDjCv7nFQLgFfMmKuYIVEiPcKV4YO7?= =?utf-8?q?foGu/3QMht8NhCuJvRchkVqS2ZESeE14OdOzMhFZh+YgsnrlTYXVxu4rSui45s+a4?= =?utf-8?q?AG8nZ4psHDcZ+h9VfN8Ob8kq963bAnuXFCUKw7uZcxuqSGpe6NAWXyHAie0dO0k6r?= =?utf-8?q?EjRFVG6g+DlS1u/vISSJbIIZq4lI7KVIwOAnWEVM7ysiuKWACKuqTzlPVcsDoFUNF?= =?utf-8?q?3ZQy10zzuch8lz8J37gV0sIV8QEoIePHe7OktUSCtYOdje77qkk4OhW63UfcJmJmC?= =?utf-8?q?OpLBLNspHSYamylYIyVNV8kV0pwc7ORgIwsNVVhhHHbSJEWo/ljDjBTyNwKi5afVR?= =?utf-8?q?YiyE1cJXIAfmHnifTbEsh2dHNN5v0lPblipqOkpz8nKZEm4k/WySkPkXHq4eMxYJ3?= =?utf-8?q?rGqVhPJMKqAj+yC8FNNmIC3UPNdtxVeH2xU3Z1w+zChxyFfNxhdf2X1PJY0/o4kbu?= =?utf-8?q?aWQ8VE7aAAiq9qDqwrfsIoADSk+3XflRfjVx24dqQE3pLJ/73on/cUEgTtGCPTkyZ?= =?utf-8?q?0Fcb3jVogCuBo+87xnjbp+aEf4zaCWodjkUTV0tkVTT9ktA+hksg/bH0BSCabnjIA?= =?utf-8?q?TanaosJqPV2QC7wEFh3f17EkF6Ttkqr3hapNETNgI687GmC9xtRu6mhh1AniFmcio?= =?utf-8?q?uf9mVCGr3XlOlmUyw28uiJj3HMjfEVvSzzlJ3qUM/mg7J8m5q8k4/O/5z/pxemZoa?= =?utf-8?q?vAWhVNedaxLNsjDwOlY+lTL4fZzsn9SllGwMSCcScjEriDI5vjepI2nESYvu3O3pD?= =?utf-8?q?/um7hL+WvwkyciiEKZ6py/k2B6VFL5/7hzCw5cqlgkO7pNIg327LZigC5MKI05ODI?= =?utf-8?q?kCb4kvcgpFMQxNyFeXUl0ghtTNYzKuGOsw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4c69da5-751e-49ea-978e-08dd19d0e50d X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2024 10:45:14.4178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: deTO0gloaYkH7wXi6srMb4pt8CG7H77gcDEW6mdrrDNZGYIYSlmWz1+w1UygZep7rVQtud9Y2d78z1hpgMkjNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6870 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 ; Wed, 11 Dec 2024 10:45:24 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/17403 From: Jan Kiszka As long as the root cause of losing CONFIG_AUDIT while generating the merged defconfig is not fully understood and resolved, move back to the known-to-work qemu-specific config. That unbreaks our IEC test case [2]. There was a second issue, affecting the qemu_arm_defconfig directly. To fix that, we also need to update the cip-kernel-config revision along this. [1] https://lore.kernel.org/cip-dev/5ed0fb0d-b505-4155-b330-069881cd9072@siemens.com/ [2] https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/8580918327 Signed-off-by: Jan Kiszka --- conf/machine/qemu-arm.conf | 2 +- recipes-kernel/linux/cip-kernel-config.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf index 17c08832..d2dd81f4 100644 --- a/conf/machine/qemu-arm.conf +++ b/conf/machine/qemu-arm.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "armhf" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0" diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc index cbc7e3e3..d26ff3fb 100644 --- a/recipes-kernel/linux/cip-kernel-config.inc +++ b/recipes-kernel/linux/cip-kernel-config.inc @@ -14,7 +14,7 @@ SRC_URI:append = " ${@ \ if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ }" -SRCREV_cip-kernel-config ?= "bb2485db01c5ce14ec571b9fb9e03f90c686a69f" +SRCREV_cip-kernel-config ?= "b14ada5877ab5280188f3549c21891b7a830896c" do_fetch[vardeps] += "SRCREV_cip-kernel-config"