From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7118849410521366528 X-Received: by 2002:a05:651c:14e:b0:25b:bd40:33a2 with SMTP id c14-20020a05651c014e00b0025bbd4033a2mr8112040ljd.414.1657486290161; Sun, 10 Jul 2022 13:51:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3ac:b0:488:e12b:17e9 with SMTP id v12-20020a05651203ac00b00488e12b17e9ls1169564lfp.2.gmail; Sun, 10 Jul 2022 13:51:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sjvSmvEs5bHwGUROCK3W6VHBHuNQc1Y+FbKuCFR9pFhwgfLw6KwbuIC/vhU0MaQ8ipN3X6 X-Received: by 2002:a05:6512:12c2:b0:489:c921:552e with SMTP id p2-20020a05651212c200b00489c921552emr7241967lfg.391.1657486288704; Sun, 10 Jul 2022 13:51:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657486288; cv=pass; d=google.com; s=arc-20160816; b=ccJL/Tb3BtzMHI5wquMhW4B6NdNQDTx3RtDQkJQRss4fY6CJOA6RuObZTaEAOJELEB Qvms4Z7IaE6TPpg0p/cRYJlsU+uKMLMyI59b9loJyrGI8PmZm/OSUiZ6odOum+9Ph1AQ iYsAi4kF3oSEYbcA9CS/NhFdcjwwXUkJV0ekMszZFqn6FjVo8Kz4HLjlBGdGglsC7M0E ixX0mLXJKl4RfN1kqzNq2mwD/aOSbFIKwdglWCqLNqLetcXdZhNDxFwTHJhNFfy+6tl6 1mMZVuDVKm4gtzsyquTT23Qkfbf+Ze3lxcv5tTEjFgSwyPL+66f6ve1hp1yHbOzMfYy+ YayQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:content-language:subject:from :user-agent:mime-version:date:message-id:dkim-signature; bh=VDt4bA90pUDmMxJuYFcSQBX4DoLSccdT8bj+WCZHuKg=; b=j2nFxg9dUXVDVHakM10KguJpr53iJTO65pt5lXmK0R3PmwwuHWFLmJxRYmpT2eOqxc 38UGaHGdzdZp6yo7FjgBZYq2s4dANUtvwI5keU4lNSbFEUE43MwieiNTiq/xqYsWb/rj jX1nW5BV2cWdSpn5wiMnRhKJ/v/KrObJ8v1GkZhdrGqWilTpqyTgs8HDsrYdVAWSR0wE kx4rxBn+6MZI/G7rDuUaT9LulZyhYNEZvjzxzGegwVtJWqWd+Y6P8ygXOAzC8WYAdzmi /ZxNa1GyeX+Cb6sGU1mroMfqVknb7ldQ7laA+13QqlhCuPVG+w49nbUUhbchyrRmnT9C nPVA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GxOuJc5l; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.70 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com. [40.107.22.70]) by gmr-mx.google.com with ESMTPS id u2-20020ac258c2000000b004830f9faad9si153257lfo.1.2022.07.10.13.51.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jul 2022 13:51:28 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.70 as permitted sender) client-ip=40.107.22.70; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GxOuJc5l; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.70 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L01iqGUIUlLsR2Va5rbgaokJhTTTlG0JX4K+SBlmXGUqjAirUXiKoizlDfFqiXfI5FwPTxm7DkAYTufmicY0nvR9dxXGSkgSVGVeLVNu0FRUYZCSGLyaEKYHgfRilxoso1xFrOiBdMIs1hwq4kwis3tM8CPcTmp+nJaN+lDOVV2kZlqi+bd5TohT4D7nolQanevzHpFeA2u5x26OE51XIJWKUwqBM6QpwmC9Zp9Dk1ZcjgMst2IjaGUNN0LNmy31mI7j2pLffD3hYNFMO0ONSssu4ibzaKzggsAIWZuw88GW1YNNR4tkgoUw/EyvRyudzA/w3Qqf2yWdVjWpOYCU5Q== 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=VDt4bA90pUDmMxJuYFcSQBX4DoLSccdT8bj+WCZHuKg=; b=XkoDXZPvuJoOlXoiKdbmiLnkO9YtCW3eu4ec8GdQeZLz2QTjOpdLUw7N+HXF7TthcGjs24qFCXMdqxMzqVjuq93C+MS94/9nNr7VBO0fIrCKD5eB+CywfgiPU72WN1bGpktqi/okmg0jgcdAshOhcLAMHWBjBDySPPKkt8KRG+ceiMzbutNXY+2PtcY5vUNstN/PhISd1QaCVe1jco+dv6pxoa7qfdrGsNMEurYMlXvV2Ahe/XU/gXrBu3lcitcFi7qKq4YBIGrNugzNwnQ5Ba57AfsQKZ6wPhiP3W47hiKCRVDpPIJC4bThTz+rN73jY9CVIuqzkhjggOg388zy1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=VDt4bA90pUDmMxJuYFcSQBX4DoLSccdT8bj+WCZHuKg=; b=GxOuJc5l/SUfu6eXcz/leLSzktU/tlX4r2rv5OvntpcniwkRhMrH6KLNHmNVNcUxpYA4EINaG2y9y2gsURNlT6rgmVJBjgEs/dsKhsQYlvmgRbunKXEbeK5865Ube5wMOe9CFkGAwgFHadIUd8XVTMyJ68HYGR2omf+UYbd0GNacMoR8U548GLAi8SS0qhKD3XY/6Y13FwpoTZcVa7fMWJjUSpCDsy9xKlzaW/8RCAEhoEliUM8OIXJO4nP6s312MpM24mWgAUuMXWefDcXurLM8U46AqJ7bBD1e8COV+TUBNDA+G5jeIKk7w7LL0j6d1yLug+Ri7imq8GAAGmu61g== Received: from AS9PR04CA0137.eurprd04.prod.outlook.com (2603:10a6:20b:48a::12) by VI1PR10MB2607.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.23; Sun, 10 Jul 2022 20:51:26 +0000 Received: from VE1EUR01FT100.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:48a:cafe::2f) by AS9PR04CA0137.outlook.office365.com (2603:10a6:20b:48a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Sun, 10 Jul 2022 20:51:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT100.mail.protection.outlook.com (10.152.3.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16 via Frontend Transport; Sun, 10 Jul 2022 20:51:25 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Sun, 10 Jul 2022 22:51:25 +0200 Received: from [139.21.18.178] (139.21.18.178) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Sun, 10 Jul 2022 22:51:24 +0200 Message-ID: <6b8a5055-437c-f706-d871-a9b564631cd8@siemens.com> Date: Sun, 10 Jul 2022 22:51:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 From: Jan Kiszka Subject: [PATCH] linux-custom: Fix error handling of kernel build Content-Language: en-US To: isar-users CC: Cedric Hombourger Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.21.18.178] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--8.420500-8.000000 X-TMASE-MatchedRID: uyA4gwy6vJVrqbvt9TjNrEIW0rLc/uieYs0hZxbwCg3sPEQGgAy2JAEP JrYlsf/6CwWRLqiC/UoJpYvTYc/nRXe0/oZSDBt7ijW7tCcpBupiWV0DQ85LUoA7SSmAp7NE9l9 p8mNlkgnmWHHSYEnI8Wi76Fx62Ti24Hx3pfgfRuSEKHaUALt3wSIOuxx4sxXhcxMkBeI9K3crtU 4v33TxwVbDmwy31ULEuIgrkO+iARGlbLCkIEC1qi37YeucnmY/XHEPHmpuRH05f9Xw/xqKXXJnz Nw42kCxxEHRux+uk8h+ICquNi0WJDtLLbwsRFMlNtydpFaRwNZs44/ZyPyacSbLZCR9IsQ1ftwZ 3X11IV0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.420500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 820FE279DDB7DFB4E62AAC2F4900071D8920BDB5D4D2404373BEED71E073A01E2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57eb06ae-adcf-4a47-b57c-08da62b5f48b X-MS-TrafficTypeDiagnostic: VI1PR10MB2607:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JtYzNikscT5FfQXI8f8vVca/oAQBGaySG89Lmkn+xEBy4mGvAGk4iPDcoXvS/i6T9iz4us223J4lNE0ggL+s/1WKnpBZX6I7yPoqMvQ3pf5OD4WuC3IBdJALEJoU58I8A6bpDdwQ7zZASylf3qg+wFDrYJSlhMLPaWMOaURPwMLWA9EnvRwDFbUsE/c8EOyXyXP8rCo81tUKvl6n+Xh27G6+h96J0PMOw0SgEv3nAzLwWl+dvVGz3xDg8c6KZBEUIrCVsXomWDGpOpq4NWeqOVHITzcMxTTURvjNzgWYtNtwr+BHga1AqroOuiVf/wGJovAkrRGMJQaiFaqPtDQXi4KD610+gNb07gJojbp5Pk15mjY4Bdbb2XC9ABSAkbhj3SIOQpq/L2Sh5mBksv5kFScYM1RRY1bNSU6tFzyMqjt2XYSYKrPAmj7LjRAoBZK8w7csvIa0tBRtSDTQZqdLq6pIdWbk3dg1hQlLADmVmnPXzkWdzMWfc0UMKcAmPBFx5g4potkYrd4oAI/Ksp72zMmr7Nbc7sO4FGhgArtwI6UhHriB/ihuBS6rUKq5vsuk7EoiTJXsjOx2Z3joagQYOyhwCbYHOyB6pUFqZ/DxrCoBWAJl5MQwbvyMOyqt0BTZiw9LlrVRiFZUDH1By+NaXOpBgBPppSarN3RcMidzkMpvVqN25Uj4cBmk2x3KKnN7p9m6nJruNRCQSnQH3wK4XMNOhYKX1him8FvEyXEnHXN5WYMzIa1eO7CYT9d1sED648vfNBT7OJUbHlPFUDEeu0bdr4fuT6T5aEadpBPl/WYnzE0biI/X/I2KVd/+1YBr0wWaUkuFWQQOqMfI8CHVkibIgWCO+JWcp2MzUyjyWR4tnlPY3KxUfLOoTN3+YAzjjVNF0x/sLwuYmxRbTBRG/2DydAPVL5qDTezdv2h1BuE= X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(346002)(396003)(39860400002)(376002)(136003)(36840700001)(46966006)(40470700004)(26005)(356005)(82960400001)(82740400003)(956004)(2616005)(5660300002)(478600001)(86362001)(41300700001)(8936002)(2906002)(44832011)(82310400005)(81166007)(336012)(36860700001)(47076005)(31696002)(16526019)(186003)(83380400001)(40460700003)(6916009)(70586007)(316002)(70206006)(16576012)(4326008)(8676002)(6706004)(31686004)(36756003)(40480700001)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2022 20:51:25.7221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57eb06ae-adcf-4a47-b57c-08da62b5f48b X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT100.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2607 X-TUID: WdC57iCbrzrc From: Jan Kiszka Error was widely broken because set -e was not consistently set and, where it was, it had no effect on functions as the do_${target} invocation put them in a pipe which causes -e to be ignored. This sets -e in the common script already and avoids the now unneeded "|| exit ${?}". Signed-off-by: Jan Kiszka --- Found while fighting with a horrible vemdor kernel that had dtbs_install broken - but was built "successfully". meta/recipes-kernel/linux/files/debian/isar/build.tmpl | 6 +++--- meta/recipes-kernel/linux/files/debian/isar/clean.tmpl | 2 +- meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 4 +++- meta/recipes-kernel/linux/files/debian/isar/configure.tmpl | 6 +++--- meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 5 +---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl index b7749cec..550bdc67 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT # Load common stuff -. ${S}/debian/isar/common || exit ${?} +. ${S}/debian/isar/common do_build() { @@ -12,7 +12,7 @@ do_build() { # Process existing kernel configuration to make sure it is complete # (use defaults for options that were not specified) - ${MAKE} O=${KERNEL_BUILD_DIR} olddefconfig prepare || exit ${?} + ${MAKE} O=${KERNEL_BUILD_DIR} olddefconfig prepare # Transfer effective kernel version into control file and scripts KR=$(${MAKE} O=${KERNEL_BUILD_DIR} -s --no-print-directory kernelrelease) @@ -22,7 +22,7 @@ do_build() { set -x # Build the Linux kernel - ${MAKE} O=${KERNEL_BUILD_DIR} ${PARALLEL_MAKE} || exit ${?} + ${MAKE} O=${KERNEL_BUILD_DIR} ${PARALLEL_MAKE} # Stop tracing set +x diff --git a/meta/recipes-kernel/linux/files/debian/isar/clean.tmpl b/meta/recipes-kernel/linux/files/debian/isar/clean.tmpl index f9039877..bc67595b 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/clean.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/clean.tmpl @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT # Load common stuff -. ${S}/debian/isar/common || exit ${?} +. ${S}/debian/isar/common do_clean() { diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index b7752fb6..52ebebb0 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -2,6 +2,8 @@ # Copyright (c) Mentor Graphics, a Siemens business, 2019 # SPDX-License-Identifier: MIT +set -e + # Isar settings ARCH=${KERNEL_ARCH} KERNEL_PKG_IMAGE=linux-image-${KERNEL_NAME_PROVIDED} @@ -45,5 +47,5 @@ main() { fi # call the actual target script - do_${target} || return ${?} + do_${target} } diff --git a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl index 83871baa..58f10326 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl @@ -3,14 +3,14 @@ # SPDX-License-Identifier: MIT # Load common stuff -. ${S}/debian/isar/common || exit ${?} +. ${S}/debian/isar/common do_configure() { # Process kernel config target and fragments - ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET} || exit ${?} + ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET} ./scripts/kconfig/merge_config.sh -O ${KERNEL_BUILD_DIR}/ \ - ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS} + ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS} # Stop tracing set +x diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 4c8c889f..c6b5059d 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -3,10 +3,7 @@ # SPDX-License-Identifier: MIT # Load common stuff -. ${S}/debian/isar/common || exit ${?} - -# Stop on error -set -e +. ${S}/debian/isar/common do_install() { -- 2.35.3