From patchwork Fri May 17 16:35:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3568 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f64.google.com (mail-ej1-f64.google.com [209.85.218.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZpbZ017294 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:51 +0200 Received: by mail-ej1-f64.google.com with SMTP id a640c23a62f3a-a59cfaba975sf289542566b.2 for ; Fri, 17 May 2024 09:35:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963746; cv=pass; d=google.com; s=arc-20160816; b=bko+FrNorKV9Spe8zGsataohOhLA8BGYdyZZV3z0A/CkkoMv9MHQesINeDGJ1vpi+J G1oognFiiI74iXTZNGCoSq/Ww7tu1i877elDw0FZEfhEgS6Cs7MZRuVhUTi+FnsoMM5P 1f3n7lblOv+2wby3ERLA6MqEjnWZ8hH5Gg3bPeCN/n9L8S4iMLP2xrOoYjptONq3U5GE GTLlS5tyJdwjTzHFa+9bBlDPtFEGd+ab88i2lM+xgjOQDZPXoMj+Bd6d6PIcVmG6PDq8 e8fK4hh9rIdIp4zUFuI2hqaahprZBuPhO6bZVAr2p/1EoEEPwn8vcXBLTDRM9ooG7WEB PJzg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bl+TXcW5C5zTi2HfOhYEIaMyNoehsZMJON8Lyi+feiE=; fh=cyWkWgh2v/9sYxMssXMbJj5FT0cn+onvspceRO1ai6E=; b=ReeHJngjyR1xCgdMPXHMcFUEOtxh+WV6BRwaY+1N4bcV52nO7InWv+YnFJJRaCCNeB 56BE+/afefwnkChCLCUHNQy9zb5CyniW3ssps1iw2KhUpo3UcjDiyURTrptCTJ5msf3I 5ypcXGxxOFM/4HKu1/VzVTrGqAvbDVrOx3PKVdoIvNAmR++ST/gJ95sU9o9VU606TWJH jTFSc6ktMTQ2PlTycFFTw7sfuCfXBO29qAB3OtWlQ6mKLcLN3pekHFKHQiSHdpPw1C6b EG3MFLhv+ctSjw+oQ4CBnpauvxKQkd3SrNUD4263O5B2FapC2RWf8CKiut+tBlsLUJoL LG6w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RqATBFA+; spf=pass (google.com: domain of fm-294854-20240517163543b42fbb73b5012195b9-iqzxpi@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163543b42fbb73b5012195b9-iQZxPI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963746; x=1716568546; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=bl+TXcW5C5zTi2HfOhYEIaMyNoehsZMJON8Lyi+feiE=; b=KcW/1o4z79aaTnhDzU8xeSNwLKBFo8ewl3qQZOgj5qS+W7zPBqBWgs/lbdb7YVnz85 To03PPBcPqDQSIwicjyQfrS2/xVgt7HTmF2TiKCnkZAnxOJWytnCYNeTxBeQ2osQZ2JH jN65tXohg+LdcxwBJN65XknsZn400L8ED+3ebw7IE7VqMOJEnZGdmIPgFAtQhdnEHuBl TGbSOqy2TEC6hVqvNmIGnPHPnqCCBMRdzi8UmpzNoX8R/oOWzKJymqQdJKhwaRTgANHJ 4mCRMxP4tvZrLsM+0RyJiO+/Tw6nsOztc/JB2CfxF4g0v5bmfGaXnxRB6vy1AKvGM4hD fdiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963746; x=1716568546; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bl+TXcW5C5zTi2HfOhYEIaMyNoehsZMJON8Lyi+feiE=; b=UIj4xl2r+wIcJ+07POcNCpNl6yUuNyrJ+1JmlzCgZBAAEG2PnIWNR3b9pBly0oXA03 xTRMJMg4vzZgJ7O1Y+DuxKQ4xFyLLU5c3CZiEcS3MLo3/6IDIz8pXKkBiHE0UkH9F/FJ 8x/aAsVHfCr+WodIqNqMH0MwqaERutWz/OGUjUMFJ1N0LZVMWw3Y+wvOK+AICFMP5Fx1 Bs9/wtWICcImccfolCxDmcrvVfbafSxiWzmNwA6lQRXf/Qch+JTUsWg/1AVwzpOkkNMT 4Snc7zXWm/ePZi40vpTXywm0ymK4z6PfFJSKkud7d8PP3umJmqMDGBCz4V9j8Azm6Wsb wUgA== X-Forwarded-Encrypted: i=2; AJvYcCXSbekXwsctyX4TbuGhnrBw+ppDLABIbcQ031/iuvA0clYzJHuhZ7rF66txMMk9Jle93Xoh5a3oQFv1wjjVWHvNyOAld1E= X-Gm-Message-State: AOJu0YwYpz4dD9Gm0E0fzyWsIPvIP5RwTq50jOM467CmtH1JOR9Dpy/c tzausoRPewTPOi9McLfxeXKkIGf6+roVlUxaCKSd8xU911Q6xx0O X-Google-Smtp-Source: AGHT+IF4MeyGmz8Ob2jdaIAzAMqfh8GxQMpnWGbj534PwhQLKjRVTmJLjHxdglEsRrRoTbTbhftKRQ== X-Received: by 2002:a50:bb4b:0:b0:571:bb79:51aa with SMTP id 4fb4d7f45d1cf-5734d6e0021mr19511943a12.39.1715963745783; Fri, 17 May 2024 09:35:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5414:b0:574:fd59:dcb4 with SMTP id 4fb4d7f45d1cf-574fd59ddc2ls514176a12.0.-pod-prod-05-eu; Fri, 17 May 2024 09:35:44 -0700 (PDT) X-Received: by 2002:a50:9506:0:b0:572:5630:d8d6 with SMTP id 4fb4d7f45d1cf-5734d5ceb38mr19667850a12.22.1715963743679; Fri, 17 May 2024 09:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963743; cv=none; d=google.com; s=arc-20160816; b=ocsFxulgrj4joRmxKbtYvUjw2lTD+NaXjyAfwif8t91qzZc+2WrX5ldA/HaewtSpTz K4kmj+1bpFTafKnpHWTLOUQyhgv5SOAPQsQ0rEUQNY0VpcePJAoQZ5PrJO+78Vnl5Euu 9rGPZfQgwZs/ilb3mT4Q/x1+x6mxRSkQCFRW69UWR0WlD+/vZbOYlOTSyrIwuDCH1zQY PUpvBRMzCMJFoGsHhsv4qAG8/vi9iM3I3f9ydkeADwXqQZKHBUDYZlWa4XXuOw9u/K1d DULyb13qrOLhjPGBQMGJ/JQPoJFGq21LrkeheYczaSxmnwsB15xXm7oxC6onG887dKv8 3bQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=/g789903qgWQlI0hIS7NBsrms5FJ0zmNvWbHUXIqFT4=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=DAozY2LXl6m+NKptDxHEsg87sOUavCcoGGRGbCgYM15shGp3OvuizRFbrXu5r+E4bu X+cRTgkAU77dEX3cUebjDyeg8lQ26CJ+JKRMWNTGh2fXuk2EwnGohbisfHh508BZTDut 08MroVpg83ufoyF9ofiLV2RbsjPZZGGJerSZk/QoqeGnH44lUvduqvA3TwAuM/eNEyhf 3UDj7nQ6hnlsLy3xZPz+2no9ooGZuqM9ABz2evhdUoLZQSMlfCQXTMYP8UJY0EeoBZiO zTSD15EyUuJHDg94BNUhgjYWNgMuBSn3f7ANesCHcDHBUgntvCBGUvAOaDcHIl4wZLtW Ue1g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RqATBFA+; spf=pass (google.com: domain of fm-294854-20240517163543b42fbb73b5012195b9-iqzxpi@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163543b42fbb73b5012195b9-iQZxPI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-574be5729e1si305430a12.0.2024.05.17.09.35.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:43 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240517163543b42fbb73b5012195b9-iqzxpi@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240517163543b42fbb73b5012195b9 for ; Fri, 17 May 2024 18:35:43 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 1/5] dpkg-base: Fix enabling of cross build profile Date: Fri, 17 May 2024 18:35:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RqATBFA+; spf=pass (google.com: domain of fm-294854-20240517163543b42fbb73b5012195b9-iqzxpi@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163543b42fbb73b5012195b9-iQZxPI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka ISAR_CROSS_COMPILE might be set even if we are not cross-building a package. Use an output of crossbuild.bbclass, BUILD_ARCH, to find out if we are actually cross-building a package. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 30caedf9..93321976 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -215,7 +215,7 @@ dpkg_runbuild() { def isar_deb_build_profiles(d): deb_build_profiles = d.getVar('DEB_BUILD_PROFILES') - if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')): + if d.getVar('BUILD_ARCH') != d.getVar('DISTRO_ARCH'): deb_build_profiles += ' cross' return deb_build_profiles.strip() From patchwork Fri May 17 16:35:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3569 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZq8K017324 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:53 +0200 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-51f98fc5a80sf8455548e87.1 for ; Fri, 17 May 2024 09:35:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963746; cv=pass; d=google.com; s=arc-20160816; b=Nw89t69LYRrJ6ADkMzSOFBxMHD+ZKKFR4fVetgcRjFZC+7ayQMo1AYitdVvqFlxyn1 hx+jyWFD8nMFht0Mqj3pRI6yvlJEdPurvtz0kES2Oq6MC8WPDEW1S9l2a0+z9xfq8P0H wV2z175t0JtHLZDMs0S4SXYqVU7YI/yAUnDZ1m8PLEZVv5XZYfpAmkReXM8Mgdystwf3 zikcViZ+TpLtW6Yk2Kg9H3+BmRgYfeNzc1xtPJZFRfNr8Dq+KnaAw0qMgD7eCfvYkEvI G92XJqxRW+ykOnJyR/tXsThIlAsPSo08NIBggZQd+kvuvsYEAdUMFy+rrwB7qsXtQhdj W4gw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kJwuke175jmvTfq3LCz33/7m1lmog+VQpT3koODe73M=; fh=aU9lgjNDnRGOI93ONV4VpZ/9vUDTU20wqmM2w/p9eO0=; b=lumm9yLASeBMVEy0ZCElF6KIoVNNKp2rzLAbVLQRaZvihytiFLBWSUH2LYpWjGHWP9 3fe1ZeEXhbB4FrflOAOhSebWXGgY7mLgg0y3RlsdFCzfg/zFlO5GGe173f9rSmiJAAp9 mLQgXiVODkzlEAUSBU6n4YVOxYofp8afgTAq0kd1lqXkJ8BxgSZYF4CVwM0M907yhiTm aNtZv6Wf3/e1uwm3u3HPq9wbpJPfwurX84LLya2/6crBQaE4zxJANw4aIcJeS8WMXa4t UryTwFT4/8I8UzljWartYUlZoFg5f5mLvZUvyc4NsutzDXCNFdh+WaYwF+AbhTd+mE2s eYPw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZURseEGm; spf=pass (google.com: domain of fm-294854-202405171635432b767118505ffcbd31-07wzal@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635432b767118505ffcbd31-07WZal@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963746; x=1716568546; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kJwuke175jmvTfq3LCz33/7m1lmog+VQpT3koODe73M=; b=KakpzHi3tfQ/fDfnsX/hzQQHyf4JbMIsa7TVttTa3kjq5CSL+sWIKMMPgAzjNxYfxZ 0RDLDTkDpypF1toXhGjUdfXfy5rvKRcpv4VaE/Oe2P+yUR5qR0Ow10xTasnRE1fEVQ6o /YBxElb1YwRhKVltWaruGy2c5jsX6VAIrPyI5r3FSMauTK8I0U8IYVwcJEaivpPDKc67 WHIUTVF0h+ysOo36lqbQ+Cc/i45keavya4KVvk2UTMX5wT4basXtlk7QtqQnS364De2L pkjd81jtcQa/VE+uzkik46Nri/pCmX2GRWZI20WOi6G9Iddl0h74Oe5l4ymlmA/cWQPx b2cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963746; x=1716568546; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kJwuke175jmvTfq3LCz33/7m1lmog+VQpT3koODe73M=; b=ryLLmG+utz9XTwzxpteU0VyWVFQINc2A6nV0FMnScWx+SmuHhdjojvwCRPiIkSXHP/ z/SKWYjp1XXLHz+wZ6xrDkRRd0NtOJtABbZD6q9wOK5q++tlB//Z1F5Udh8bXnczcGMR 0R1wNI5D/BIlhs9+QbLF0L3kpqKAccPju2q91l5I+n9C9LtPhiPUeIVl4bu9pRUEPDGf UwTjEFdy1YztQA/VWHAQZTc5ivr/LXhs2dFL8Yi423BfCBKM7jc+hxspxt0a9F2dC+27 b57OQ5dEQlQNFI6K5WY9NTiNy7VONo6qYS/pNymwiPspswUYh0gWZTJ4U8nfpZqfLFMY b6KQ== X-Forwarded-Encrypted: i=2; AJvYcCXCW+vkmn9xYi5Q1Izug2aumsdklt2kHB//tumRBL+wRjtt1NMKfz1eQ4FS6PT5SyCdms+xeQ21q2rh820jiszrm+zkRHU= X-Gm-Message-State: AOJu0Yy/yj4sk0EwEtDupfULLfchTjd8JGPFDZBT5gxTZS75vjJ7gKLl 66hmDVdupWuszNjMMKQZ7ZaCQ13EHF+8DLlGXlYP6neKk5aMRfnm X-Google-Smtp-Source: AGHT+IGynik7lQA9oo3GkRPFCE8GOXxdIXSHCew3PStMKmdbXRdz1rV5xXWBcwL1Yc4uGBihxCNebA== X-Received: by 2002:ac2:5dc1:0:b0:522:33cd:64bd with SMTP id 2adb3069b0e04-52233cd6563mr14053410e87.27.1715963745977; Fri, 17 May 2024 09:35:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:f10:b0:572:5087:dac1 with SMTP id 4fb4d7f45d1cf-5733331e4d9ls853383a12.1.-pod-prod-07-eu; Fri, 17 May 2024 09:35:44 -0700 (PDT) X-Received: by 2002:a50:955c:0:b0:572:a16f:294 with SMTP id 4fb4d7f45d1cf-5734d67f7edmr15447463a12.30.1715963743812; Fri, 17 May 2024 09:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963743; cv=none; d=google.com; s=arc-20160816; b=mZmVhAUdOUZE9EA4protUHYl8ZcDuM0trDiiL4pIbzCzWbrJFpSyb6RxszAk5GLRgj pw1EAtsV+FnOTWQ8D4E+bZ8nUGyomXMjJ0Q5AAXgFRqq/9symm/2bxpZyEvyuFT0ZhkM acHPwYGA5xz0QgY3mbGNkwd58OsAL2dzO/bSDVpYyCQB+1cREvCc0BDvH8527u7213TW 3sWOL+nRNmwH0TDr7I7mIQ6N37tpSgltg8T2srY61S/uo1dAQSKBYlawoCpteeaWDaH+ JV0SnLht+79OQyJWqE1VhxnG8lRE9/fHLsOtSIcItwOZXaUp8P1aUNGg/X9ZN4zaibLD HpXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=DSVmfzOM6TszmHt6WM9uoGsrLM5RpwJqj2tR2PnVEzI=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=eDxwbMH5+AumXpwzkEAv3Ecjj46DOwMmVBoqnTrKdmmywJ+9OMitvXPHc3s4oTmyUY M/Cx5PVxi15tTJBmVunpMo1xkZmi+mTHpPkY3Z3PMJuzQqD09PSKHkfe4rSwOCc+zU0d 9BWfQnH7fy4CdtmflpILgSoK96B/6q8vSoSDHqXSgGLeZ/1NC6LNtkW/yr0uOaslRNO4 5KRyDBk9u0ingR/MwJff84C86L8Dp6TVTr2HEEdCvD22X34M9cNt+0KqZZAzqaznaZva AwX/9Guda8EsTclSqXvrJ5jGyeqVkwZbYUgFofxjUDEAEqM7dJaklNwAZPzNXkxCx1Hj 0UVQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZURseEGm; spf=pass (google.com: domain of fm-294854-202405171635432b767118505ffcbd31-07wzal@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635432b767118505ffcbd31-07WZal@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-574be5729e1si305430a12.0.2024.05.17.09.35.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:43 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202405171635432b767118505ffcbd31-07wzal@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202405171635432b767118505ffcbd31 for ; Fri, 17 May 2024 18:35:43 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 2/5] linux-custom: Model cross-built kbuild package separately Date: Fri, 17 May 2024 18:35:39 +0200 Message-Id: <54c70edb8d5334a5aa5983d6559b75e0d552515a.1715963742.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZURseEGm; spf=pass (google.com: domain of fm-294854-202405171635432b767118505ffcbd31-07wzal@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635432b767118505ffcbd31-07WZal@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Rename to kbuild package containing tools to cross-build modules linux-kbuild---cross. The headers package now depends on either the native kbuild or a cross variant, unconditionally. This allows to have unstable source packages between native and cross and is generally cleaner to describe the cross version. Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/files/debian/control.tmpl | 12 +++++++++++- .../linux/files/debian/isar/common.tmpl | 2 ++ .../linux/files/debian/isar/install.tmpl | 6 +++++- meta/recipes-kernel/linux/linux-custom.inc | 5 +---- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index 6f8f8afe..e0e932a0 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -51,9 +51,19 @@ Description: Linux kernel debugging symbols for @KR@ all the necessary debug symbols for the kernel and its modules. Package: linux-kbuild-${KERNEL_NAME_PROVIDED} -Build-Profiles: +Build-Profiles: Architecture: any Depends: ${perl:Depends}, ${shlib:Depends} Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@ This package provides kernel kbuild scripts and tools for @KR@ This is useful for people who need to build external modules + +Package: linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross +Build-Profiles: +Architecture: any +Multi-Arch: foreign +Depends: ${perl:Depends}, ${shlib:Depends} +Conflicts: linux-kbuild-${KERNEL_NAME_PROVIDED} +Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@ + This package provides kernel kbuild scripts and tools for @KR@ + This is useful for people who need to build external modules diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index e3a1d8a0..86af70c5 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -11,6 +11,7 @@ KERNEL_PKG_KERN_HEADERS=linux-headers-${KERNEL_NAME_PROVIDED} KERNEL_PKG_LIBC_HEADERS=linux-libc-dev KERNEL_PKG_LIBC_HEADERS_CROSS=linux-libc-dev-${DISTRO_ARCH}-cross KERNEL_PKG_KERN_KBUILD=linux-kbuild-${KERNEL_NAME_PROVIDED} +KERNEL_PKG_KERN_KBUILD_CROSS=${KERNEL_PKG_KERN_KBUILD}-${DISTRO_ARCH}-cross # Force creating debian package with valid host arch for -native build # Use a cross build to comply with arch specific kernel defconfigs @@ -32,6 +33,7 @@ deb_kern_hdr_dir=${deb_top_dir}/${KERNEL_PKG_KERN_HEADERS} deb_libc_hdr_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS} deb_libc_hdr_cross_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS_CROSS} deb_kern_kbuild_dir=${deb_top_dir}/${KERNEL_PKG_KERN_KBUILD} +deb_kern_kbuild_cross_dir=${deb_top_dir}/${KERNEL_PKG_KERN_KBUILD_CROSS} # Array of packages to be generated declare -A kern_pkgs diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 77856aee..00011517 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -35,7 +35,11 @@ do_install() { if echo "${DEB_BUILD_PROFILES}" | grep -q "kbuild"; then # Install kernel scripts and tools - install_kbuild ${deb_kern_kbuild_dir} + if echo "${DEB_BUILD_PROFILES}" | grep -q "cross"; then + install_kbuild ${deb_kern_kbuild_cross_dir} + else + install_kbuild ${deb_kern_kbuild_dir} + fi fi if echo "${DEB_BUILD_PROFILES}" | grep -q "kernel"; then diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 3fd0c6c2..c54c287f 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -111,9 +111,6 @@ BBCLASSEXTEND:append:cross-profile = " kbuildtarget" # build only kernel with the default variant of the recipe BUILD_PROFILES:cross-profile = "kernel" -# Select correct kbuild package for isar cross-build -HEADERS_DEPENDS:cross-profile = ", linux-kbuild-${KERNEL_NAME_PROVIDED}:${HOST_ARCH} | linux-kbuild-${KERNEL_NAME_PROVIDED}" - # -native: kbuild package for host BUILD_PROFILES:class-native = "kbuild" RECIPE_PROVIDES:class-native = " \ @@ -151,7 +148,7 @@ RECIPE_PROVIDES:remove:cross-profile = " \ linux-kbuild-${KERNEL_NAME_PROVIDED}" # Append headers depends -HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED}" +HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED} | linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross" KERNEL_HEADERS_DEBIAN_DEPENDS:append = "${HEADERS_DEPENDS}" # Append provides From patchwork Fri May 17 16:35:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3570 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZqTv017326 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:53 +0200 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-522362e82e5sf6307761e87.2 for ; Fri, 17 May 2024 09:35:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963746; cv=pass; d=google.com; s=arc-20160816; b=P6Xmj35d1JHO6FPS54RXmRRnRRQjFwHq16M29sN16rLzGb/TMD4mYzbl9aZ3TrB2oh gjdKovd8PuuDKQJqZbYH+9d4qIGP2iG/0kdDqi8WaCAViEKQE96Blj6NE48peh2DhWQ3 k/0SiCAvKPpozdj12OrOpDPHQFdSj4yhgoWZrP7VMN05viPhi03jNWaUnqUqswJ1bTCR uf0IBwHiVWRgjyaofmInsHraNWr1xDlJ4r2yZmC8ClINFMF/fxpG5tCqD467baEuqVvu JDIDzBn3Ud2U3bnrjDDssWPWBMbNX7BJyQwji02pT3luXOYssxaXeVsNTaCHJ62MBGk6 N6Dg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gq0sUE6WVPevIjAqCdY3c1GM/mIHsDxf+Rx1iIVQImM=; fh=dtuIbh1TW4PdVzftuwCa/upRte/85t0BUrQrk7gcvI0=; b=hWVttudHZxYBy5oVzk17b4wHhLlz4LVxpFUc/FIeG1hTuDq0aQIws3wRnA4E35Vr+8 CpASUJaQPG5c2J6Y8C80iQYC4+QBsQVQolMH7o2qbnmZOa5s2RWZ8PZEtGTi1/c9qkQl p7Nohzl9HNdnyzBDaEQaV5dasgjHzVanhImy0WE2T/w9wYCeJNZ2JTIcJuYIJM5SrfUQ 6lzbuxFVeOIm599E69s2u4xgw1A4uZzCQbDYkWKEFVS+feucfsI5pZpTTm8GJi6CIoyR EI3ZIo+y3osr4oquHF2K2Tq0axq+v9RLukvZJfpgNuzJrVQRnHgM9lI7aPJ5U1NG7SA7 P+7Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=B4K+wGlz; spf=pass (google.com: domain of fm-294854-2024051716354321a71646d07a808898-r8nili@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024051716354321a71646d07a808898-r8nILI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963746; x=1716568546; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Gq0sUE6WVPevIjAqCdY3c1GM/mIHsDxf+Rx1iIVQImM=; b=vDkXSbu+tUJxNvqyORcuj9KsFofPUdhN8nSU7cTI8QiN2qeamTwN94TGYypHoWH2Dq fzh4HC2WaCiCajXVUC7B5N+IWPLvy+mVhMX8mDGv3Mb/iFS/cVgJDMREdOJnj3vMLTkl 9edrAQn/TrtgQRm2V+6kt5X56G6Lo2Q658RYh90IOLMksnC1z6tsxpOu2gF+Wy4yy9Fu 6bPZh8tzraC18JRI9m94ySset5UXmmA+fV6x78ScKF4NUgJeoFnW5ynzjGahIm1Hfwwa BX7UOc1eEjD9LrpbaxD3xBJMtMRbUF8uYHLAGO4YNRbmv5JPO6r8XsJwADrrk2g17FXi Zp6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963746; x=1716568546; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Gq0sUE6WVPevIjAqCdY3c1GM/mIHsDxf+Rx1iIVQImM=; b=VeN7A+F+NZrHgSyzXQsPg8USzz/moVV3bJhiAs6PV8lsMMVCAQ9Lcq/AXvrTxEhO1K oapHovxq2pqhJbSLDZOFVc8ek/uika6zDgSLyMzwp6KROijW9IP8N8vfh9BUWvR4rzTw T3mEhBoGNxRM78iE9qtlbEEwXJD7Lgp67bYpennDAtK+pTV+zFJ057ea08BHODJP7e3D 5SrWBKpc29vgUAQ0X/aGeTc79bdpAyX4ORT8Oq0GBztFbKgCCKJI29n9scber1EDvmwj rEIyUUK7+jzRESU0G/2II2j/SI0q71E3hf0vsvkmw56Yy0T2wV9ViXYs7eRPgeGA9iAp XAWg== X-Forwarded-Encrypted: i=2; AJvYcCWrdk0Me2rXbgO/xqnvPLfoyKrw23KjyFHfS0J17FbTgfIGS3YOrLDByY505OPmAwZujEGVVcrCvnKueuxJj7lo2C5HmWc= X-Gm-Message-State: AOJu0YyvcPk/JlzkDW2tOcd6zO9TQQVVBfOOq4Y0Zmz5N+Wwttn/Ewkm +J1yAWATX+Q1EDA6XFwqJGMduVVlZeaOmEZOzvfFSuBrisKRM+Yr X-Google-Smtp-Source: AGHT+IHd+hOHRZ9q+QFdxKT3W9ivAOgwckMn2y+W7UURbUKx47bqKwdRUe8pgvZS7/CfdKZIfdwAVw== X-Received: by 2002:a05:6512:1310:b0:516:cc06:fa03 with SMTP id 2adb3069b0e04-5221006ccdemr17474101e87.56.1715963746194; Fri, 17 May 2024 09:35:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:43c4:b0:572:3b0d:1694 with SMTP id 4fb4d7f45d1cf-573332e9c48ls2206567a12.2.-pod-prod-01-eu; Fri, 17 May 2024 09:35:44 -0700 (PDT) X-Received: by 2002:a50:a40c:0:b0:56d:c928:ad76 with SMTP id 4fb4d7f45d1cf-5734d67e8d0mr15188212a12.26.1715963744079; Fri, 17 May 2024 09:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963744; cv=none; d=google.com; s=arc-20160816; b=fjCsaC1xakhTG7+jvwA4myPsw4J0tDyVYp6poF+p4jy4GPxrGxdzW1MuhzI/ODNWtT RTC10SEGTSRwUymLh+NrVcVLMi4220xgOV1LAFdoqWP1ZDNijK2IQv7dxrAyKDQzFiiv nqcjlgiiTYX48A9X00U0KTU7wL17QCYMNNcGDZWnOiGgaBV4AonoYrCJ3fHQm5ZiV3fq yuzabulFfISVs2PLPSqxP9Khx2I7TcrXKQS6piuQPiF4rw5ByP6g7+bdhInm9WWyglUg wjT23Fd6fG75S7jGk5HNsqsxtVCKJiSiC7J59Mrw81gkSSw/xGz8E4fsXBJ4bD5QJb8k fQgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=VeZKB82Qfy/aDB+eLCq5K8Q4Xp0W6NZoCkR748pAnIM=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=oLYUuPHLxAE6oOx9fGgbgprYVEe7FBahHKT3GB2vW95Cc5oPGvFbwrErE8TFeXsGev N1AMgSkcdnpbfgSwTEB5jfGSAGgTYp0T8AZ6yqZSRUq74aPfOSV8Qsy45ALNhGM2NM44 3e3raHLQKfX7Q6tNAYI+ksc1DjsfypBeZRjYtEbdrjjF2tV5JStjnwiQ+l1YBfTotvqe yawUAPGumHgN3jbZeGAuBeP6/FnZt6Tp92THwK8IlKhNrP3Gpmtk4NmOj/vB4H3AlVB6 MT9JXsT0rpvyQm83lbDnsizdgNXmEXvKibcZND0bnTZJNMId0oSk4P7KQ4vCc5r0LHXR mpCg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=B4K+wGlz; spf=pass (google.com: domain of fm-294854-2024051716354321a71646d07a808898-r8nili@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024051716354321a71646d07a808898-r8nILI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-574be5729e1si305430a12.0.2024.05.17.09.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2024051716354321a71646d07a808898-r8nili@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 2024051716354321a71646d07a808898 for ; Fri, 17 May 2024 18:35:43 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 3/5] linux-custom: Resolve native source package differences Date: Fri, 17 May 2024 18:35:40 +0200 Message-Id: <99b4e97b01b683fa3bf6490475e3c8a125ab824b.1715963742.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=B4K+wGlz; spf=pass (google.com: domain of fm-294854-2024051716354321a71646d07a808898-r8nili@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024051716354321a71646d07a808898-r8nILI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka When building the native package, KERNEL_FILE as defined in bitbake.conf is wrong as it uses the package arch. Avoid that by redefining KERNEL_FILE in the kernel recipe using KERNEL_ARCH. Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/linux-custom.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index c54c287f..b53d136c 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -175,6 +175,9 @@ def get_kernel_arch(d): KERNEL_ARCH ??= "${@get_kernel_arch(d)}" +# set KERNEL_FILE without depending on package arch used in bitbake.conf +KERNEL_FILE:forcevariable = "${@ 'vmlinux' if d.getVar('KERNEL_ARCH') in ['mipsel', 'riscv', 'arm64'] else 'vmlinuz'}" + def config_fragments(d): fragments = [] sources = d.getVar("SRC_URI").split() From patchwork Fri May 17 16:35:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3571 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZr2a017334 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:54 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-51f22618c20sf8538377e87.0 for ; Fri, 17 May 2024 09:35:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963746; cv=pass; d=google.com; s=arc-20160816; b=HydPh3BHYdcOjOonLKlwIFK34pMVANEBGV8YK7BwpxDBAXqUkGfldsTRX2LHDUl9aI AsGuaNL1xBiAkD70iz98uMqKQl17t97N8kEjJhBaBDUWHTvWeA/DTdN7pNzKqdYcxCU1 54nq6Xqp7XLdWXh31ZW0ZBP5FPUhXtRGPpDvXFYN9XQD0m2ymrgCmL/IEispBe/9cd9h /AtY7NcDkfVTTnna6ON6tmd0Hp94HONzMSct+i0j+CHzT21uA3OeaQ1mYAgZ28ukMYxX jcFVhSZWxzb8zOh2B+xF6JBVhi82uyFhPZNup9IAbnQ5MMrRURRhRnL+0LohZ/W7kL18 k8LA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; fh=yiyiR8snfY/ohie4LjADrICj20AScwjsiqC5/3LC5Vk=; b=wnyHZoB0L2HGJdoU8mbx+ooslR1bKigTiEMFvUmRtTdH0WvZC34GPiBn5nfwbPTyJv xDAfdsMQTJQyD3jNIsMtkSYfSwQO+Qf8Vm+9GLda0hwl/SEGyOdx2ktHmjcA0r6jK7a7 wDLfPXjdCxmUF+uKKUwQOCsNEoEUEETvKEXufK+7XqLEq9qCwge4pF3femxPEWK/+WrV BdMf7FdaXfnIglHP1kiR0jCJuf1+NLLT7YDgtYlAGZouijekpWEMAEHznidKNrkbOv9q LGPSr6n3HAHlA4qxaW3k95FyjlboViHjFuhcqQ+ZBF9q27B8tsjAP3ctvgO/D5iabvvD yIUg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963746; x=1716568546; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; b=f/3ZnBbAXqd3W1MNWqgy8TR2vTGP9NFCaC1YMEIian/gyYRYEzJRDEL4VxK96BhTel caO3nXwv/ZLDLLAbM42oKnS2oX735+hzjxSaZhXBFqMnBSjwcJLnhblrVP4JY8fHmLSd rQDARSwWvouVh8QGQc3SYl1cAaaraFY/erMBMeMZTQqkjmts7OXvtr6fE637krh82f0r wF4IdIJJbYpgoaJCE4kFPzxAq/YjXoPslbFg29alpGh/LHFmLkzjdYcIpmPNiG9JYcwv Zywg9AQIa111oMXUemIiTZOQ5Bhp23Wg4xFSxlqosGGObpqm1HqZOlXbdg88ML9yCNms cLZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963746; x=1716568546; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; b=kHNwa99hq+ThT8WKloy5W3n7wH6C6pZlPyNXIdJxU0YqXJ1My7ubhK0Y8WhZKji/49 oU5PW59mCTghpbQq4e5VbTSdQioqnjvR+ERoUSR3qAt71x8RqWC+QC+BsCudDig7kW1j tWPriqUPgbJq1BHfcIEbc3IanrW4IxOAeCQ8Hd0nqXjLzssDNgFUFrzYGAJn9EkgaKrP SI6suJfprF4vgxtSFTusv1AL8xflXAg9QwPGLSJ5iPGY3AerW//smSgnYKCjVFexbuRP WTlqxLEVnqkCXhMb8sNwpgg9hWM/HIh9nLBt3T1VoE5ixfoniX8FVfwaI4xMXVIu13UV +0Dg== X-Forwarded-Encrypted: i=2; AJvYcCUlN232Accad3KtwaX07H4kTz5+qqxkhWK139JOXUxyXG1FzRHF7DyrNrqLKTW32+UFz6SOJZjweZFX1tbeJHee5ek5E7o= X-Gm-Message-State: AOJu0YwsZ7WZiXPpXJCPBqe+vSAbtbjdocdkjByfw7HZbu1zVHnkozno 9s+m9AhuJaX55LjwsRm5eFBA8rIXuXf1MOxeIfx5tgm3UYisyHPi X-Google-Smtp-Source: AGHT+IFI5D7Om1trb3PfCZ50mmcgQgGAKHpJ852zc/C0ag1sp5dmZ+O7OSZFDpnKzquda5Vi8thVXQ== X-Received: by 2002:a05:6512:3d1a:b0:51e:f0e8:d70d with SMTP id 2adb3069b0e04-5220fc7d1camr28953517e87.21.1715963746662; Fri, 17 May 2024 09:35:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15aa:b0:51f:2788:12da with SMTP id 2adb3069b0e04-521e462827dls1502486e87.2.-pod-prod-08-eu; Fri, 17 May 2024 09:35:44 -0700 (PDT) X-Received: by 2002:ac2:4d1c:0:b0:51e:f70c:88ec with SMTP id 2adb3069b0e04-5220fc7beebmr20418920e87.16.1715963744229; Fri, 17 May 2024 09:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963744; cv=none; d=google.com; s=arc-20160816; b=xemRjkKOdDoXkCDxdujYDxkmm8+XGKXlDh1Abm2V7guavV0C22iU3xK1vO/mAlt8TI ZK27apmankF5M83OhLV7xhB7TT+DOEXFYw2HfXJcZcdSIyLXmuDJG1iBd9brWmj6y/4k 48FH0ysU+miF/wjsyJK2o8WiRCaP7g6c4Ey79av2Mn7EX56Z9IDl/Es1FWQRlOI/UAOs h8sTSXPvhG6FFidJTK/aN4t092XQoZZvz4qHCKLZ7b+qWW1he7HFsdzfsC/x81E/qzga I45pPlonnIGD77/r3GGreyhuhp+FEya/vdyN5PAfCV/ECTofer8PO69a2NHHymEfdjT0 +Qpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=M8TkqMYHSLLC5n5NqtVB/rsRK3iSYJT4yqG40/DLOck=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=esv2bMojh51XGShcirfkZH0PJOwVw6JGh5NetATLPhFeqSw2tsxyRzRoJCdbxH9KAl HLYRuZ2OkP4qPCCZ1uUYvD4/wtDgZILdtcrpLTODO3hIHZwqepgHssOQJsZxDbkTCqLV eYc5jfLUjzbW+2JmRf9wAci1Elxw8rhKWnEv+5IGyIiycp0/d0smdLazInUUCWM3AeSH yhKN/dVlISyrnR6FTteuZ2WldU2ISGc9ZN0DM2xdtSF53gqUYTelNn48MDYTeVcm8ZSY USQ4t1F9GktBRbB8KPPnCCKO0AyFIlyFL5ncB/QhJzS3Dffc1XxtEl6qlsZWmJLizlqz OOtg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42024ca927esi1958325e9.2.2024.05.17.09.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20240517163544002ddc76223fce487a for ; Fri, 17 May 2024 18:35:44 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 4/5] dpkg: Retrieve Debian source name from variable Date: Fri, 17 May 2024 18:35:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Rather than reading this multiple times back from the changelog, define DEBIAN_SOURCE, by default BPN, and use that consistently. This will allow to fetch sources built by the base recipe in native and compat recipes later on without generating the changelog first. It also permits to clean up related code. Specifically do_deploy_source was expecting more than one source file (which was incorrect) and looked in the wrong folder. The equivalence between DEBIAN_SOURCE and the actual source field is checked in do_dpkg_source and enforced by failing the build otherwise. At this chance, also move global -maxdepth before -name in find statements. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-source.bbclass | 16 +++++++++++----- meta/classes/dpkg.bbclass | 3 +-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass index 7fd5d2ed..560f536b 100644 --- a/meta/classes/dpkg-source.bbclass +++ b/meta/classes/dpkg-source.bbclass @@ -7,10 +7,15 @@ inherit dpkg-base DPKG_SOURCE_EXTRA_ARGS ?= "-I" +DEBIAN_SOURCE ?= "${BPN}" + do_dpkg_source() { # Create a .dsc file from source directory to use it with sbuild DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) - find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete + if [ "${DEB_SOURCE_NAME}" != "${DEBIAN_SOURCE}" ]; then + bbfatal "DEBIAN_SOURCE (${DEBIAN_SOURCE}) not aligned with source name used in control files (${DEB_SOURCE_NAME})" + fi + find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -delete sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXTRA_ARGS} -b ${PPS}" } addtask dpkg_source after do_prepare_build before do_dpkg_build @@ -20,12 +25,13 @@ do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_source[dirs] = "${S}" do_deploy_source() { repo_del_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ - "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${BPN}" - find "${S}/../" -name '*\.dsc' -maxdepth 1 | while read package; do + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${DEBIAN_SOURCE}" + DSC_FILE=$(find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc") + if [ -n "${DSC_FILE}" ]; then repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ "${DEBDISTRONAME}" \ - "${package}" - done + "${DSC_FILE}" + fi } addtask deploy_source after do_dpkg_source before do_dpkg_build diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 0e25eb76..804fe5a6 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -109,8 +109,7 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} echo '$stalled_pkg_timeout = ${DPKG_BUILD_TIMEOUT};' >> ${SBUILD_CONFIG} - DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) - DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) + DSC_FILE=$(find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -print) sbuild -A -n -c ${SBUILD_CHROOT} \ --host=${PACKAGE_ARCH} --build=${BUILD_ARCH} ${profiles} \ From patchwork Fri May 17 16:35:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3572 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZrwF017339 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:54 +0200 Received: by mail-lj1-f185.google.com with SMTP id 38308e7fff4ca-2e3003fae2dsf64144011fa.3 for ; Fri, 17 May 2024 09:35:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963747; cv=pass; d=google.com; s=arc-20160816; b=y/3/L+30fZ9ZZTNZC/ZyE7aM/oNfcH3Y6xjqiBeT5XOsmA+Flc83pZumkIHIzInUu6 Y9bYxacSgQ5VhgMyDzauEh7DvsFijVJNttg2ymCdZGEklDK99Sa6NoXmOtz9dny9C453 QFWBE4HxjC+8LEpz9H9qRIgVU/9Ek8/nnCULMmxL9a+naWI23DYYXLODnfAHNttR2KK+ Gss/BJ8BK8wCWpJw6gDC80S+3C2K9a9po/Bl2GkZQMd/YVC4IujXdqiD+EZjhPfu4tP/ kYoWlluHZ3Z3lv0gfZPYViu5cGyewNNDVtPPolGZqVB1M/SLotjHPvDxjzf8uwLnwISg pXDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=r7Q0v4cN3EfjqKChe6jRGNGsCZYlGQt+Ly6dsBP571c=; fh=CJ5J1sWGaxu8NBbUk/a7DKNGG9nXqkcgHYsze3QWCls=; b=T2iJRP4vp3gFt1YXTiSpKlEj5xZS5uR8wEoG7FYGRolJ4BW/46AoJNyDR0k4NCp8La q8gBjF/YYeV3z9FAsJFd0UOF6oKE+Nl9RDCl25HsDllw8QLXJ5StiEi3J2qEhHnpi3Ft UZj/RCb4ea1rCsrM/o5E77HU0wqu7xfvb3SD2sHQ2TXeyEkJOb3nZLDtBqvmiyE3tGgd pqYc7mZ01ouxdWfrmV5fIl78jNCH+mZz7mGBMTyUOMUFJ7i17F/0KFVA152bdzx+WPYk KiP5qrzSz9ASGG6B6rsEmvb7NGyA7Ne5qvNMFDLapr5GyFCTBCLGHx8r7hsWFqHn23pP vyOg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KrNti+lX; spf=pass (google.com: domain of fm-294854-202405171635442d42bcf972af35d00d-pxl2sg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635442d42bcf972af35d00d-Pxl2SG@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963747; x=1716568547; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=r7Q0v4cN3EfjqKChe6jRGNGsCZYlGQt+Ly6dsBP571c=; b=le+Jjc5T+2V6Z6oYHuc60a/66aep1lMyskpWJKbRTR2g1pAz6V1Bf3fq0w//FySdwf AhsqXZFum9Bl95p3rtb82qNmbkL+Hvif8h7aDt/ts2fxcXAssVM19B5AjzRwGPG0Ytpg JLOYtw3vXYYYXnSW5szvpQUFZAQbe+Jdo1/AEzlTBr0h9h74Tq4cRT55WBWzI2pk+DYl S8viFXeOmEA/m3K+uRoY/lBalG/7D++naFp5jkXrKSJhM8McFXK60yNVqZlU43pPUPuO Xq6IGs1z3KADfbpARw4RA1YcycRXD8TqLyUIBRY4dLWZgPTHCuPnpknRci8mE7WqG1X5 3M+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963747; x=1716568547; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=r7Q0v4cN3EfjqKChe6jRGNGsCZYlGQt+Ly6dsBP571c=; b=wxOBW3xeqixn25GwxZRA898GLkAgpSoAOlpww+QbgSSUfBcfb5hzO3kULxbYPkC0nw YbWy2yHMAVMb+8frBlhKhzKEtu3XIe8l0SNN8xIBjWAqS0xIV9kQ5WJlnMAhsGJzq1PS 4cCdaSEQcbZfttpbUQ2RXUlBCqCgIu9zUAA/9Cn+mYnKXrxmokWIebTb68bQrMS9tDlF yS8aKlMCF6PuEGPh7nmW7//96XBHsJV/xouqo46YYlN/6tRqegtJOOi+p1b21xp0+J9W MucQXgMJpMw/Rs/lyWDakTaRzxQp8lk/9brYQ61NODDB6jKuuYTEhx4uJUCPpqyZh+mr uj9A== X-Forwarded-Encrypted: i=2; AJvYcCVmFbTbXlqdWfx2uhT/MRBVSnxM9GWvf+AAL8R99pBpxb5g+Ns9x+R47gJCMGlTvyo3SINRZD4qMjHd96lChXBq7dFHf4U= X-Gm-Message-State: AOJu0YzwF+UagZyyNqBwOL/8Sv8CDThxEfdy4bA/qX+bUQ5iYpTNPD4e 68tgCgjGoZIoUj5YlqE+/RAWEuxQXboNvun0jSDEfUBfvjzU37kN X-Google-Smtp-Source: AGHT+IEIgV91EIaN8XjuZNzd3SyPMdH3RyQQ5QQ4W5h147hiV52q3Hqt8iI5qFVbMkwCna39Vsoqag== X-Received: by 2002:a2e:98cf:0:b0:2e4:d09a:36a7 with SMTP id 38308e7fff4ca-2e51fd4b1b4mr180789871fa.17.1715963747157; Fri, 17 May 2024 09:35:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b16a:0:b0:2e6:fc88:7866 with SMTP id 38308e7fff4ca-2e6fc887c43ls10566061fa.0.-pod-prod-07-eu; Fri, 17 May 2024 09:35:45 -0700 (PDT) X-Received: by 2002:a05:651c:a10:b0:2e1:bd06:51b0 with SMTP id 38308e7fff4ca-2e52039c4d7mr172212901fa.35.1715963744664; Fri, 17 May 2024 09:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963744; cv=none; d=google.com; s=arc-20160816; b=uRJW4KUvyNkC9bOmz4hY9oh3HCz4eRY89hYHlfkmJnjHkrSZlV2xjN8q0PpQTrV8Lx k+3kruPK5UiT2K1N1QoKDS7viD3NPR9th2590PaTpkU/MjuEfsg0+SdaYtZGcg5/3UOq tvo7BBZSJRnIxvPMS9HCutq4ebjG+BbrcP9XN/ppQR7oRfjQNWoJXGnfZFcr6NhEDKcB rrCRBgTmUEXMkc/QyjOFJ6vE99O0INouBZPZQZPo1VXZr4lqvz008ObhVCk8hOUehgAp W9jQnrbMxtfpIKqTuO70c54UzUuuBFEXGMN2S8KhSGAtsrEp5ymnyv47LFtJ5Jk52ECI y9cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=vOznNKWJ5HmxWvX04CxN2jUm0z0WeZduMKdb5ihYpU4=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=IcSIet4hN8+7Ctn8hd5PxfEVdMEVvXDqlywU6Ueh7Qghn86BaGi+8QvzcF+znU3k3k wO6P62uNqWKYNBUrCg0y18nuAfpErRlItDNr9NlDSfADUtOOnqCEISG9sHVgkR/y8q/+ GFXt35FPazUJn0jWictUX2I5vTfVikekzXTjXXlsTIYRUHyJrIEer82yeY0KiSn9c02d 1TNejBnxSbrjqY43FKPXp9Ra4uvxXe6yMUsCZxMgzYtZkPZS8LAl5MDqisfNFbrjN0Fn bAAje5QEui9TrWubdOIiBT3CTDxq50r6Y3QLuw0hzc7jnX7sAyoVpugKx2w7F4/Re9v0 9aCA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KrNti+lX; spf=pass (google.com: domain of fm-294854-202405171635442d42bcf972af35d00d-pxl2sg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635442d42bcf972af35d00d-Pxl2SG@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42024ca927esi1958325e9.2.2024.05.17.09.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202405171635442d42bcf972af35d00d-pxl2sg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202405171635442d42bcf972af35d00d for ; Fri, 17 May 2024 18:35:44 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 5/5] dpkg-source: Build source package only once Date: Fri, 17 May 2024 18:35:42 +0200 Message-Id: <1f7d8469de5afbad8d9172bdc5022b46c52f846e.1715963742.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KrNti+lX; spf=pass (google.com: domain of fm-294854-202405171635442d42bcf972af35d00d-pxl2sg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405171635442d42bcf972af35d00d-Pxl2SG@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Avoid building the source package multiple times, possibly even inconsistently. This is achieved by delegating this task to to the base package and installing the source package from isar-apt in the native and compat package variants. Those derived packages will also no longer trigger fetching, unpacking or prepare_build as everything is supposed to be in the source package. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 4 +-- meta/classes/dpkg-prebuilt.bbclass | 7 ++---- meta/classes/dpkg-source.bbclass | 40 ++++++++++++++++++++++++++++-- meta/classes/dpkg.bbclass | 3 ++- 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 93321976..789d6c74 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -78,7 +78,7 @@ addtask adjust_git after do_unpack before do_patch do_adjust_git[lockfiles] += "${DL_DIR}/git/isar.lock" inherit patch -addtask patch after do_adjust_git before do_dpkg_build +addtask patch after do_adjust_git SRC_APT ?= "" @@ -191,7 +191,7 @@ do_prepare_build() { true } -addtask prepare_build after do_patch do_transform_template before do_dpkg_build +addtask prepare_build after do_patch do_transform_template # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt do_local_isarapt[depends] += "isar-apt:do_cache_config" diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg-prebuilt.bbclass index 8135fc81..7092670b 100644 --- a/meta/classes/dpkg-prebuilt.bbclass +++ b/meta/classes/dpkg-prebuilt.bbclass @@ -16,11 +16,8 @@ python do_unpack:prepend() { d.setVar('SRC_URI', ' '.join(src_uri)) } -# break dependencies on do_patch, etc... but still support sstate caching -deltask dpkg_build -addtask dpkg_build after do_unpack before do_deploy_deb -# break inherited (from dpkg-base) dependency on sbuild_chroot -do_dpkg_build[depends] = "" +# also breaks inherited (from dpkg-base) dependency on sbuild_chroot +do_dpkg_build[depends] = "${PN}:do_unpack" do_dpkg_build() { true } diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass index 560f536b..d6ab5aad 100644 --- a/meta/classes/dpkg-source.bbclass +++ b/meta/classes/dpkg-source.bbclass @@ -18,7 +18,7 @@ do_dpkg_source() { find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -delete sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXTRA_ARGS} -b ${PPS}" } -addtask dpkg_source after do_prepare_build before do_dpkg_build +addtask dpkg_source after do_prepare_build do_deploy_source[depends] += "isar-apt:do_cache_config" do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" @@ -34,4 +34,40 @@ do_deploy_source() { "${DSC_FILE}" fi } -addtask deploy_source after do_dpkg_source before do_dpkg_build +addtask deploy_source after do_dpkg_source + +do_dpkg_build[depends] += "${BPN}:do_deploy_source" + +SCHROOT_MOUNTS = "${WORKDIR}:/work ${REPO_ISAR_DIR}/${DISTRO}:/isar-apt" + +do_fetch_common_source[depends] += "${SCHROOT_DEP} ${BPN}:do_deploy_source" +do_fetch_common_source[network] = "${TASK_USE_SUDO}" +do_fetch_common_source() { + schroot_create_configs + insert_mounts + + session_id=$(schroot -q -b -c ${SBUILD_CHROOT}) + echo "Started session: ${session_id}" + + schroot_cleanup() { + schroot -q -f -e -c ${session_id} > /dev/null 2>&1 + remove_mounts > /dev/null 2>&1 + schroot_delete_configs + } + trap 'exit 1' INT HUP QUIT TERM ALRM USR1 + trap 'schroot_cleanup' EXIT + + schroot -r -c ${session_id} -d / -u root -- \ + apt-get update -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" -o Dir::Etc::SourceParts="-" -o APT::Get::List-Cleanup="0" + schroot -r -c ${session_id} -d / -- \ + sh -c ' + cd /work + apt-get -y --download-only --only-source -o Acquire::Source-Symlinks="false" source ${DEBIAN_SOURCE}' + + schroot -e -c ${session_id} + remove_mounts + schroot_delete_configs +} +addtask fetch_common_source + +do_dpkg_build[depends] += "${@'${PN}:do_dpkg_source' if '${PN}' == '${BPN}' else '${PN}:do_fetch_common_source'}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 804fe5a6..d92ff68c 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -24,9 +24,10 @@ def expand_sbuild_pt_additions(d): cmds += 'sbuild_export ' + var + ' "' + varval + '"\n' return cmds -do_prepare_build:append() { +do_get_reference_env() { env > ${DPKG_PREBUILD_ENV_FILE} } +addtask get_reference_env before do_dpkg_build # cp -n results in nonzero exit code starting from coreutils 9.2 # and starting from 9.3 we can use --update=none for the same behaviour From patchwork Fri May 17 16:57:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3573 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:58:00 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f63.google.com (mail-qv1-f63.google.com [209.85.219.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGvxRZ017740 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:57:59 +0200 Received: by mail-qv1-f63.google.com with SMTP id 6a1803df08f44-6a352847538sf31528756d6.1 for ; Fri, 17 May 2024 09:57:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1715965073; cv=pass; d=google.com; s=arc-20160816; b=fxlnhGpXtxUMXt6YrHptpTxMBxsvVdxa1FGDbpZatLjqOvWun6y8NZKA71SSDjUDLm nmklcKcrnHpfcJakdK3Hks0NNKt7VZ5LkMeGBQAscWOkMZjPSXmI04IYVH8wmlN80MtH fRiIB0siP90IXrBDkY2SWa3wUHKpLHDMS+nmBakEhH8TS+9qH075rf2AReiAIc8OlHFy ZTm6LAWA84vRTildz3qOEOivOdjAvmKqbGZ34bwLs11Ea22ia8bLtvSYEU6V9UMOU3RO q3BT2TZ7oBK7AtB1xj9HCBqS1f+PpV7qXteDE+JgJJXr4fBn7Mrx9ST/PuoR61QMD21F U7Cg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:in-reply-to :content-language:from:references:cc:to:subject:user-agent:date :message-id:dkim-signature; bh=sH69YqFWVnQZEpfFVbi1omezpa8+dEFeD26MEQpCIEM=; fh=j6TPg+gR2z4MQtvjgdbil1MtW/Z0Y1D7bQBvurGvsSU=; b=ssTJTx/ZRRTLfcre5pceq4TQK1AO/u62qgsXJrbeFRjTOhXcWxcg7Km7+72tWmWm36 AoL1cDVAiPE+DksutbKTKpzwRYo/LdRoodJHRAXrN3JwCUMBx6iQazdCYnPUzh2zRG3q MQ5PtPl0HDc4viVk56leqbEel82MbY1s+pLCzbmDWArYQTS2k6wgh4JJyGnE2BW2RoXC 30Licv1oUGdKgMDDVhJIPlakOU2EFvUr+nt2WE6snhfvadM9il4NtIbeowbovITScDGx xosW8R0XPTftXR/GAX0PVTBysa+7GFHo5JA/hMvnQdsQLvLEKKyY4xelm7V2Jv0OtN+j qvFg==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yFHNA14S; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715965073; x=1716569873; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :in-reply-to:content-language:from:references:cc:to:subject :user-agent:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=sH69YqFWVnQZEpfFVbi1omezpa8+dEFeD26MEQpCIEM=; b=pJehqQxWutX2YIYQ6QfSk8hK/HG8sGotpj8M3EZnvuB/OLSl69HIE+k0K4E+82luAF tjhZ4n0JMS7CrqY7arUoLbvVOhQK6XUCZAmSCKvBjQLN1bUNWSL0KI8RPiIDtrPSwiMH p31iGuv4nlqVV8+Pm0NI5gsan0DoRJ0VRfirkWiNNOdxMNRUzm4+pN01iZr81BB8KVfD 6oa8cGP49Sp6iDE+Jt01GTUeWFxsskQZFvneGIY59sL5xF6LyiNO+ar/pTJycoJihSY3 UrRilRMU1Jy3Ti0lkte/JxloA5IxY19KigRTdtGlOc0JAZog5O2/0M9otU6FDo6X10uq MMrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715965073; x=1716569873; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :in-reply-to:content-language:from:references:cc:to:subject :user-agent:date:message-id:x-beenthere:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=sH69YqFWVnQZEpfFVbi1omezpa8+dEFeD26MEQpCIEM=; b=eocQiOQ5UvZv32Jeih6o95RiEaVjj6ecammfESjOgiiKjAg49Onm4IYC31tPH0fmDQ odj+kZj+Ny1LCMY/zIzxmuNtm8IyAihgKIJWk4hJWiI+jndFv5WC7K2NOUB8aU3no+fM 5yIEhHQhUP8JNIQ8a1HkX38m6Djq7pTifKB6ofOXVrNL7BX6xs5z/lddahreyrjl5Q7A ORup6BNse0xCWREHaB3X+UHvqNmtJL37EtvFN8yx0pqBiiMgjSsXRg865l3KBnG+khOO 1Ayf/PDC6pSiKqxwGFjTMME64oNp7rPgUFgNmKYNMg9aLtxAQTQGMyPMER+E7K6BUjOn WF9w== X-Forwarded-Encrypted: i=3; AJvYcCVmcDxaWP61MFXXXhjBFG0FUx7jpWdyNTinvI8zKDZA3EfUz48p6RGlcy8kEDFZxq741M1JQcR4s7of39NauxBeQbnI5vE= X-Gm-Message-State: AOJu0YxZr2Auw3o2QwTnTVOCIJowR2k2iAVKESMJ72VTwm34Zl7U0j9Z fC65oWC88+MZ3iW+Sd438Eq+D0utfxXwx1fQskfwAmLcQYp1jAQg X-Google-Smtp-Source: AGHT+IEmZx/wO/VinX/xxIDlg4XXHTPk8+m4/u5q4L5K8/xE5hnT0CdhAElxYRCpDyFiNG04d2oCpg== X-Received: by 2002:a05:6214:570b:b0:6a0:94fe:939a with SMTP id 6a1803df08f44-6a16816372dmr271052786d6.28.1715965073472; Fri, 17 May 2024 09:57:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:2587:b0:6a0:c024:81e with SMTP id 6a1803df08f44-6a15d450370ls6547866d6.2.-pod-prod-07-us; Fri, 17 May 2024 09:57:52 -0700 (PDT) X-Received: by 2002:a05:6122:459d:b0:4d3:3a8c:13ad with SMTP id 71dfb90a1353d-4df882ea51bmr21423189e0c.8.1715965072515; Fri, 17 May 2024 09:57:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715965072; cv=pass; d=google.com; s=arc-20160816; b=hdyur7menBbiqswEO7BkHEMmOOZsmlLoJzEq1MRHZFxIwt1hSBGphfftb3rKRS5pqT KmKDS51J6jqkrmnwaFgeSdW9360eXv2CYHcGT6KwQ3sL3lu2pe7/wViAnThXQFsj4f31 xaUrYU2tZxd/uhgQ0JjALNf0mzRiF2Dz9tsbfwjzsCVDptddbxNzCAxT7gj5tla+rIcf nSI1gEU3Z/mmqq35lKZRrE0FupJAYxCDCKY4jnnV1oFxwwYrF1cUobPfx18Yo7RVJnV6 p7vGrHdooziXmyhwVdGNgDVBqTzB2Sn1XaNigzXLFes0hV/eVb0E8NF/2F7dLdp568Vk jC+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:content-language :from:references:cc:to:subject:user-agent:date:message-id :dkim-signature; bh=PyvqUqWnWqoc7ECN/LDWkULndf82dZeFDkIj2P+BPlM=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=PCOpJVasjc/aD4Vn7b5hpsqRF15xe3LbOIMrxIgava4ZCotQ7hQiYUBghvEqgW736z 0niAeSmipp0nc0MwumP6WG/rJXIZksHWR7WPycf7mXKwo1pwxoQ4jUAHYSYvCZYrnYA2 LddgY+US3HSLYcyl5Rtq4yqF+nG1MIp7KxF40dsHVFd0TBgU9o5RQ/d+udiRSHgjVgQ+ uH3WpS+suNPzacITY8bbEXektBHmv0X3URnk9Dk8dRjXP6qlSDR2SNVxJfkcSjhd5PLt N6voXesaYR525tkez97H/u2Kh/0X9sZWZ9eKEqiCM2duY6FQ/1DdwZAKeRX054eIUD/y wsnA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yFHNA14S; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com. [2a01:111:f403:2613::600]) by gmr-mx.google.com with ESMTPS id 71dfb90a1353d-4df9b5da89bsi1364893e0c.3.2024.05.17.09.57.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:57:52 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) client-ip=2a01:111:f403:2613::600; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KAexMGKAH8RiSmZYU5wkpD8CwWYsRvY6Z2E6F4uRL6fQdDbC3ZhN/Wr32F7i054eMFzObK1NCt+LQMvIjTGGtCWSoLMoaAjD3tgDOcTLU3FqnC6STK6OVDS6uZGhLq2R5mP/z73kdms69A+BLA3uG9lCgtWbsPZQiii8/cjdNlOf/V0T1hciADXUERC5BxpjhiYX5sNBmdH80mqxBLs2a9/LDBXWTN3VsDY0RArKkyhRVK5unUWjT3/xkII9z36/pJPoj6ynWut/Y8jZGJQ3Yg6jqGMB6LEEx8UNv7zG55DdOG9yZQtPuMtJOdGvnLGGKq7acnlOQw87Du3+6Nmgyw== 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=PyvqUqWnWqoc7ECN/LDWkULndf82dZeFDkIj2P+BPlM=; b=fMwHarxwROu/3fF7G2wXx1l5cveiy7XhglvL+sdelArpgaXMrxzRY0xKzN5e2jrOBCYkm/wJEzZaSmduTlwwP6ICHO9y3/6tWl83KTzXjUS/bBnFNyRBEG3ffb1y4uBBLANpDYMCCGOGEEQc+QmobpTOzum6+euBtSXTH8HaIqDIoYbC/eYxJO3cFpFO2I7kwr73ZWVDzgk/OKmt4ZRnlOFpPvEkN4PCBmit8IB/g6R41KXVpg4/SQGBD/7pYqofRSttU2y/MVFMDdbGronocJsiRX/w6S604eQ27S/yfVYj7cPCEtkjs2zrn8IZ6CCldHygDacnJjmru2pB6nF4vA== 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 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by DU0PR10MB5852.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3bc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 17 May 2024 16:57:49 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%7]) with mapi id 15.20.7587.026; Fri, 17 May 2024 16:57:49 +0000 Message-ID: Date: Fri, 17 May 2024 18:57:44 +0200 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 6/5] testsuite: Build linux-headers for the hikey target To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich References: X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka Content-Language: en-US In-Reply-To: X-ClientProxiedBy: CH2PR16CA0029.namprd16.prod.outlook.com (2603:10b6:610:50::39) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DU0PR10MB5852:EE_ X-MS-Office365-Filtering-Correlation-Id: bec71c35-3e14-4315-b755-08dc76927bee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|1800799015|366007; X-Microsoft-Antispam-Message-Info: =?utf-8?q?0LezwxD7HRoXxE6jL0ovmYgBtyhz8SK?= =?utf-8?q?Uj3DAhCNfoy0PCka91ECnHKKDa1f+PL83AijQiDXbudl4zTQIvlzgnnCln1EDmZn8?= =?utf-8?q?lDwdIcnjYTpCNKs8ZtwLRfV213CwUfI50R58w7Uuj1A8i6KZn0tgwjU2NKJ52HWip?= =?utf-8?q?G86Te0R7M7TZaWvEZwuQwscA2Tx+gexpEHLxX3BImQ9lbyJb4AEMIHk3AR0u54mcC?= =?utf-8?q?dkCwvB7ZSQyfxyOJqTpzcmP+dzu02PZYHpwGs4FP7Q5N8hfkPxh4RQhEvTjUKLfFs?= =?utf-8?q?MJVY8IQEa1B0k2QoMvyQBVOvuYQM9WVwVKlKk4MPivcBoBcAUk1ZAZGcBOc+nKKZf?= =?utf-8?q?dfF/m4hdW8UwGJ6z3n0187RUxKvWy8lcwqu3UKD5FSShgIUSeNtE6Jdb5IT76E6cB?= =?utf-8?q?uVA3fkStX/qHF+O9qNOX9ACXq9pC5FgJyNsUUbRCUV//ITids+D8gIz7KmHCum73A?= =?utf-8?q?04PrwLkM1F46if647M9Lolqn+mMmyF1JJoXN8jsp0H25NzD9Fl/EzTLAw+x16V3vO?= =?utf-8?q?othKY135nvnemZtvkEZ9qtx0ELiv2+qMDw/Rxe/b/Eld/lq05mPtbBiXzo0po+hoG?= =?utf-8?q?EwlTdoC6lIH1km/irEpHj7v390Vxa3zhi2fNt7ifmFny0Kvc0RGWdnGJGBp+t7wB8?= =?utf-8?q?1KX/yTepWhpR8UU7cSUPAXMjWFhLPBA8KnXgaCAed7cLchqOYd2GKqd5iiRQ8jV5E?= =?utf-8?q?C+OmTDtEhIWseCuj3BLb/YQHVUCYbv12SogMxKknSajXcp6fTkUhftmJ2Vi6mlxh3?= =?utf-8?q?zX2G4n30TXz0/7o+mGaKcA19aqhM/Qf3dvwV0em4qhkx5uLSi01EkORyXuDL/7V/p?= =?utf-8?q?KK+yjgUowvY0vvE2FaEyboRQWxWG0WzkU3KsITG33kCk6w2GXciqIPFR+l+akctdA?= =?utf-8?q?WxwTjJPykqa8S1ZUdzfpxzgrcX1V7k0UCAnQTaO8RXOIFRbtNBipkL63r+y73JDbp?= =?utf-8?q?Ql9h1JJrC/wvCMq1dHZ2jEVTwjJHC0ekyxv6KFMjSDgqQH302/W/tcdLJAxZckers?= =?utf-8?q?07ebr1LZ/RZk1mBgnifOG0zau8ocw15MuOmuHpczNaTudYJ/cdO+qsjxi0Pb9XI5I?= =?utf-8?q?NwVZsL6MtVEVeJpIAK91f02GaAcKFRx1/kr8Qfb6iddZhh37Je1GOwQX4jYSCep+E?= =?utf-8?q?xloXMBo23Qg3BDPsvSKaydqr7O0ysZ6AwDIN9naRBWhXJYaztnNFvozuINDLX1QfT?= =?utf-8?q?b8XYHF6NGv4ze2xCuQBPgDyAUEbsPvzWJUZw=3D=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:(13230031)(376005)(1800799015)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?N0FNp1t1I6cWTqxmj6nxwRN9M2CW?= =?utf-8?q?eQpETz8QTNO25iNcY/7xkC1XHq8wJdth4C+R8Hn5Qi/8MDN+qVsNeh8P3vFyOD7by?= =?utf-8?q?mRMfqjfa0MqMK5+QKtTr8EWsSgXDm1tT72R+Dfug68+jjakjW1n2SCRuDZE24jbv3?= =?utf-8?q?LRBcKb1pBVk7uIDErJN1H5kz42IKg75zwDr7FOvQmtdmSZZ7gZF2ELL3sNYeXiz/r?= =?utf-8?q?xUMmonbuh1Z/ymkNuBKAS3jwAaO7PpLEEzxdH5wBZDgII1EmWhXd6u0PbiAY93PwB?= =?utf-8?q?TLkotMJ5R6fgWuSWw/MuvtTPOzRBGBdwBHeMTLLoSaZm2DFymL1Z7LEkk8dJ3I+pI?= =?utf-8?q?kdL9eZCWgVqc3IRyFGXEvYm6KEFwipOumC7O+tPmWO7nPvAxqtDzVdFGX+ikbc8CM?= =?utf-8?q?RjZ+E335D5a21hsdKr5k36S7+jKZkRwKlx9xfyBfLArxyVOVif87+1wO58b1TLrgX?= =?utf-8?q?EJ4taqPEMiM3VLE119jF3JIYK4a796QCJlSg8pS6Fr1exBZQFzEir7E7BcDGc8+DC?= =?utf-8?q?BlyW1WVXaiy5JWob+6vZvvVTzDaWH3WqOeSNpPnXk7JkgP6s1IhapyCs4laajvWo1?= =?utf-8?q?XrPlXW4jtqDAt8V7LOPooqEYkbWMAMNcLRTMhrPqNkeubkf2JndqlbJLZz+50ec+U?= =?utf-8?q?dYu37RkrB3tPnzSTZ6VQb25JEiD5ooHrU+97xsPhvMCaCEDzFyZkkC+jiVehLmJkV?= =?utf-8?q?UHcGwHTffjFHMhN+n1IWdwmZmLwrZ029OvROirhq5CbnCOUaGEWpJ9S4QYOkPTgmh?= =?utf-8?q?/OYmGnhVHAHDvKpSKEff6AL9RIMbeSeRpiKfIlp0oIzpcdBIssf+/yqDHktW25Gf+?= =?utf-8?q?qVTYmNPOO7STLw51ZpuqokgwzhGXvTCHAfC6cDy7lN6Owm/uKzCHptF5r+66FehDQ?= =?utf-8?q?yBB7XabPEet1BGM1kyONHwlc0uX3Jp+/uo4lm6TYZTEU5LgFj7ktJaMwudhUWm+Aw?= =?utf-8?q?3RIZTKCoKVNu5PmKlE5n2QFPuQ+C354z0o6l/N90MYtTkSgvSxwkrggiQ9zKuYRUu?= =?utf-8?q?2CQodmlWhB9EvXa88cDa2zwpHjlbaX40O2HKntqSd/iJSDJvmPhIb2Wbb4ThiQDFD?= =?utf-8?q?HRzhKcKyNWPFaa22rkYgGLLaU7VMl0lEd2VB4/DBtqcpiatgUWI5oT3xwYqdf4tTZ?= =?utf-8?q?9W8aBekeoJfOnSqIK1z0ZJO4H2fu8Lqlz7awH/bQdLLy3aEerO9/mOAnbBjw9YJVy?= =?utf-8?q?jMfMfsN/6Ot7oTnnf13NF/vNEMAGs/K7pUjHjXZdKMZZ6bpMPiXq/kO+OjQ5tkLqq?= =?utf-8?q?wsE8Hweyp5bT1Y3vGcMgEprTwoc53yrjVoJGzXOLIO3c4eLncWUBAGTmuQWb4Mw4F?= =?utf-8?q?bwx+vbW8VNOd1jixgbhFvtqVL6HS8ndBCNEFXQMBI7sdHDBOcRQzzHSOOrRnhfKGn?= =?utf-8?q?qLv12RHbcYkBYuJIyL4ZzeXVD9IrQ89tCQgGC9vejTVpPzvyUdErYY6XqGD44aV2M?= =?utf-8?q?dAPZ44eC4KhB4PtVTYDfQHmg2510rOYMqveEmkq04xC4QfVdj3c7hPmUB9k3w0Rqo?= =?utf-8?q?lMsF7372AOOG1QKHmAtkWiQxlrl0cVF1hw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: bec71c35-3e14-4315-b755-08dc76927bee X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 16:57:49.8184 (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: lHnMAVx1nbeikj5q5Y5M6C/Mdw0MMz2S24hSapSHzz/0V00Ywc1AYRhfA3RTM7s78tNVibWgsFgoE9Ijm5Kmjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5852 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yFHNA14S; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka This ensures that kbuildtarget case is checked. Signed-off-by: Jan Kiszka --- I must admit that this test code is, well, untested. testsuite/cibuilder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 3e151566..ebe79468 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -143,6 +143,7 @@ class CIBuilder(Test): f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n') + f.write('IMAGE_INSTALL:append:hikey = " linux-headers-${KERNEL_NAME}"\n') if debsrc_cache: f.write('BASE_REPO_FEATURES = "cache-deb-src"\n') if offline: