From patchwork Wed May 15 11:08:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3555 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:30 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44FB8Uq7004214 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:30 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-51fa975896esf5858850e87.3 for ; Wed, 15 May 2024 04:08:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771305; cv=pass; d=google.com; s=arc-20160816; b=ocRbevvt0lgmn0vs901hIGvNcGrlFTKb9yqo5A89E1m1qy3DZjVjsqtifmT7+PQetT +hRHingLjidVisakGNhKM3LVNB1GNemjDeDP/6PadqqtK0AYcvlQxIM7MC60QP5tX3iI 36jirr9rQAbCvJQQ3YstuvhhKtojEZGkDzb8xRFRgdmjDtvO6OtJl7g8k/xafW0vDnLu lw/PIEy0CkQNaBrMLXWtwqRfqOn9eaZ7XZgnXEDhPy+6UDjT92drf3nFClB8nkV+xT0s Zu4rHP+9jS87y28z1/LYR7PU4Xh2uNijeoHykpFqzli+v3cSm96KOz5XOZsuKrpQI+dP RRvg== 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=0ROZdF0WAi+QYJ/q8L7goWNUAdG0LTKryPdadA713vg=; fh=Ns2m1FbJaoO6KZ28s8FQCE/Gv6qXSQxyvgtTWwbrunM=; b=GNrFl990OjTEQ1fHIfLYGtGYxnCyhl5i8a8l5ht/a7LR0gbSGcy9XDZLQ4Sfx5oaaE PzzqeXr5A/LCLNAPK13qLbAjLK3t+b9EcHyu42lLxpBZA35uXUNh97zalyf/OGKswGE2 vx7i6S88ob8kdAaMj5/4IsIvgWadqYsQwfVP+78NAknoQZTT4GZrGOf9tC1vGBMM/CkB m1QPDo16tbqL1f5a6gSvYOqYlInSFgrtMpkZ0Gmia4uMDKG6nMHoTScUYd9aDKWY2RPf +6l9V1hKUfKxhdEsRNvFyl8A60zT9uP9Bh4gPIEAmVUw3uj31FchpJyqYcbyv1rgSxPE pyHg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KLeTYXoQ; spf=pass (google.com: domain of fm-294854-20240515110821fe3569ecb02d21e726-k70gb3@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821fe3569ecb02d21e726-K70gB3@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=1715771305; x=1716376105; 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=0ROZdF0WAi+QYJ/q8L7goWNUAdG0LTKryPdadA713vg=; b=FfOI1kTYoe0yi+YTq7k7/q0qixZvLV5A7Sqs3E+ILC3Ity9AD5B+mA1QhkWkMp8Tq/ KuY/7QGyqduZeF46HHYLd1Dm/95f8/tKtSgUGjvxekwlU9dcV1psgf/BQMB8TpcaCtmH L3S3M/xqDCkuIDTg2gpX9rHrWPk/m/2a1HBzcwWdTC6u/nJcO3ObSPKIEacH//7DXdBT /TxW5JPc1NpGxZhRvufuuoxC0ZM+WgmugPEi+HxOamneLD9j0IYkL/1M0y8KTw2KC2kY oIdYGEbU0dYRmCsnHd8UTdCkM1mT+Cyh9Lq/tayPbGmGsB/LH1Hl30lYP+/kxIIrD0T4 dLGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771305; x=1716376105; 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=0ROZdF0WAi+QYJ/q8L7goWNUAdG0LTKryPdadA713vg=; b=hfJZf98BT6OpChDE7IsPJMaAjBbp9BlazUyCCsapLfBR4gOIn8l8ti8ubd9DXc0XAR udYnbMiVEI5cIoIXPiahx6RwIlUVfDRm7jEI//VHjBWp52227+g12+Z5B+21HG6/oFUp T5y8JUCvXzpOJsbsK5oOIIF80em0BqZL/5SohjVbGfN/t0CElzBMz91F5GFPtmXSbj+n yRZw0cYF5t8mJC7M4NA951zCKEEDC6Vw6NiCykdRxW3flxUQWxd8hgyIqvxhC78LUy7k 6n3kc7LbtFnPm/Ynpr8u9actTcerezLJeOp/eWLllNUDxMl4u1oNpMeQ9lVz8GFS8HaH fQJQ== X-Forwarded-Encrypted: i=2; AJvYcCX7moXcFEVFO4SuJ7J4lIe9UHJErSZ373wrvsX/BOSeNgoOgA5gydmFR4MmpJ4G3KJ76XTtiNsBdO4ORzrM3pXuDOu2JkU= X-Gm-Message-State: AOJu0YxR5kJoA3ueqS0MySKXzBtwfJRyXW3eio9ZfTzYzztlAGFuxZvP ZPQyT3K+gJ4sG6zZaZyFjNfWw2xJgAgFc/qCb9NIhqm16KI5UpJ1 X-Google-Smtp-Source: AGHT+IEGP1EvOpG2vG8nx5LNfgrjoECtjJcU6bHCXZi70du2aGKXMOdj/PiEWbn+01X9TR1OpMjlIQ== X-Received: by 2002:a05:6512:3a83:b0:51e:7fa6:d59f with SMTP id 2adb3069b0e04-52210074380mr12841649e87.53.1715771304385; Wed, 15 May 2024 04:08:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:12cc:b0:515:d5dd:7505 with SMTP id 2adb3069b0e04-521e4433cb8ls84335e87.1.-pod-prod-03-eu; Wed, 15 May 2024 04:08:22 -0700 (PDT) X-Received: by 2002:a05:6512:3d19:b0:51a:b110:3214 with SMTP id 2adb3069b0e04-5221007029cmr11972307e87.49.1715771301937; Wed, 15 May 2024 04:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771301; cv=none; d=google.com; s=arc-20160816; b=fNDEpM56hn9FwUBIfuVvmrRSTsfHtWvVD2zq57zPCkvnpII7JEkM5nETBzsZ0Kft6O LZ5o8vJoMNXQSKp1lJ4lkgLLFvAbGDYj9hvmsv/pr73K2Ebiv9osiDoqNAy1+O/8bqPs MI7rhuxT70UvSLPcnNEBimfDHFf8f4HTUIcfwW35TbFEM9EL7khnye0eMSVl1DtycCPb EKg+brxCNUFl/iQFRAK9S4mmM/xjF9UgbVnWlbeXJGk43pFsEE51pQ5j7u7La3Sj+naD wae5s6USvYZZd15jtKNpKYYY/T67zvlRlBgQMzzlyvGXGc4XE7ANVthWkLZAOQYE5kvO jULg== 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=wcg1GO6LCKr4tw3eMLkP/uoCapaQo2/keSSB28mWEbBSpzowbVs8h97Z2uVeLdhGgO BaRe7qrwHTmfHebdwucX29NS0CrcVHe9NNMmuwZwZ8CET94odUq4LDQnfkh0JCc9LSle hpSSU0FdTD5bdZ8LImpadCbx5ymCtGlfQEgcL1Z9+arns+FS0/rl3Yrmg6rzF319qFLQ sslR69ueNeVceXDNsVbFg4u90jVpIFCvthOt/OqSqWareRjDkdDFW0H49CGMgrPYPK8o VrVveyGxtTJPAkg/Do4McRev148/n8TUr+JPNImZ1R6mSwaoz/BY91x8X8XwPSO7j5gt SihA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KLeTYXoQ; spf=pass (google.com: domain of fm-294854-20240515110821fe3569ecb02d21e726-k70gb3@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821fe3569ecb02d21e726-K70gB3@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 2adb3069b0e04-521f35ae079si429741e87.2.2024.05.15.04.08.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:21 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240515110821fe3569ecb02d21e726-k70gb3@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 20240515110821fe3569ecb02d21e726 for ; Wed, 15 May 2024 13:08:21 +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 v2 1/5] dpkg-base: Fix enabling of cross build profile Date: Wed, 15 May 2024 13:08:15 +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=KLeTYXoQ; spf=pass (google.com: domain of fm-294854-20240515110821fe3569ecb02d21e726-k70gb3@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821fe3569ecb02d21e726-K70gB3@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 Wed May 15 11:08:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3556 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:32 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44FB8V3l004230 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:31 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2e30840a08bsf38602781fa.2 for ; Wed, 15 May 2024 04:08:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771305; cv=pass; d=google.com; s=arc-20160816; b=ofsDCEyFKI19lIYrsKk7/OjhTdEJT4ncAtPYRL2J8gSRcYDHy2TFckZfiTtaftGbOi icQ3TmGBvCOIzi0b/T6Ge0Q3hg87FlweU5fe6e5LpFNRMFdBGvBoUQdxgQB12BEXgPXd u/vRMtMNsj+AncvYbe/QFTGyy4ZcJgiHpD75DEbebFDG856UZNeNGD9tT5X0QN0+ZlPX TpsbxNVqwLRHkQsSU4yvvmC6WMrrgfEM5ndj4AdQzZZs/pUuXqvlPOfhvvCbqFYor0E6 pT7QCLkUjHGMBLtSiuXO2GARTCnQrxzn33jsfbZiainG5iYGLsJ5N0cSTz2nZCt4w3x5 8LLw== 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; fh=40/UMRQ3b+RphBELVQf99wEuSBxiGTi0ID6ZLZCnAYQ=; b=cYmsg1pzS15ZClh+vL/2uOZbeZRko5co1A22FSRBSgnvPHTSPot4vm24IdzA4rXg43 zwHJbwEevzR4sKTTi/F2+tuO7K9ub+M0lkwCtqROGOy1LgIsDY/YL5bV69ZiXB7hFbc5 lqPga6cQGkXZv012Tk5Na2w0EQTkYef7xT+FYqQLkiIBuyX7q5ArBiHw27Wqc9cgsKT+ KuMTr8prydHDW14lF9PxpqCTGsOJlWA6OKqG7MD0/zPyCQK34hR3FOyqaM1aZuVIKuBU u3Ht6ukS/aQM0NuGHk7DGrTfNhtIAsOeuUL/0b3aRWW+rbauZ2ZJO0ZO4o0nz8e/MX2B sE+w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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=1715771305; x=1716376105; 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; b=XpoHAxUcCSUfGCM5GjITj3Mzw6kSXJyw5g9jEXnLVOrLTr9FO1zzskOUzyDFWHlsll zy0dXWOhneeUyxilf0s2iGbQmF/jVlTB2H/iFJtGgraPufXovXWZzCcKaiA+o3GmHJZv ryPT6zeq1cyjBMptTwfp6tHvcG7RjbGFK0Cme6RwErCkOnkkg+/o6Jtz80CfTFIad59S kFwWR7/KsLXlSFD3tEzp9TKAoyX5jbCq5u8hGasp+vdi46+IJUrm9/59iiC1AIBvpzpa giIYRuYiHRiWDOH8k4BC8tMbtIl+keW43BO9XjQAEEtpiLCJCByou6U4RaOY9uDjMBWb hyJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771305; x=1716376105; 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; b=HWplT7KaZJeULvJ7z7izR+8FoG/KoZhUMLoch22sBNvKh8zoJuFkrqJFB5OMb42Dbx k+FMjRP+MFzST9+DG+iGVKuBlcLP3KKn4PnCfKsreGyu8UdMwXcuuaJAtuVR+Re8Jm+Y jo15RJtJikhsFAwoUNBO8oVwmTBAzFosduwrSHsPp5hnbsSsF3iKR75z220sYS8YJpNs +Z81DtYiOAxUaT2pmAJYlYraPGnPMGPNaALIg0U0J/smCfTlTmigHam8kvrIGfjBtVzG 44XZwSnud5iU0pYAIWLFOHr1Oqnb1T5pnzq+iFj1RwyFl7yy1T4wgYnZm+vYAaZohRt6 psaQ== X-Forwarded-Encrypted: i=2; AJvYcCV39qQgZGD24OIRYfN5yYdYLm3kP/IiI56EhAtG/XPt25Usa3NDpqtgnRIBOQl2AxLqJuv9VIn6NVMfeoh/NeQVVEMoq5c= X-Gm-Message-State: AOJu0YyFHoxMfwTnCwmeBAE9cJMtu0yBCOnA8e3mer7pWIBdo/xR6J/o jBfzvq8tBJBKBKzmq0hRWhO6DgX0Xtsq6OXkCZtxw1H20f/BEk4F X-Google-Smtp-Source: AGHT+IGnH80LOn1lnsj3qnqdMIvsIGZ7wMwzHXwXWTCppJXhHiIvpG569dC1c7uQvtllY78apa6l4w== X-Received: by 2002:a2e:2c06:0:b0:2de:48ef:c3ce with SMTP id 38308e7fff4ca-2e5204cda22mr91424361fa.49.1715771305050; Wed, 15 May 2024 04:08:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3008:0:b0:2e1:e370:18d4 with SMTP id 38308e7fff4ca-2e4b6e5f873ls3951591fa.2.-pod-prod-01-eu; Wed, 15 May 2024 04:08:23 -0700 (PDT) X-Received: by 2002:a2e:3a07:0:b0:2e1:aa75:6504 with SMTP id 38308e7fff4ca-2e5204cc972mr106722311fa.43.1715771302617; Wed, 15 May 2024 04:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771302; cv=none; d=google.com; s=arc-20160816; b=qqdfOV6dp65v+VRzEgFKGiaTjhHuw0y3mp2Wx9pEXJMbOVkcjQrbgYNreEQM0cbol3 CjpsUnNh1e8DO2UKSkNVnsqadDEw9mMZmat+5rNEWt+Bx2uljKYAUYqlQZ96XS1FMnSI 759gUi1xHVj3q0sfmVKlhueY1P6g0+jIf0gDnSSiCU2fvmcELBQxPPtW6LX1mPl1IYko jI4s52umwn/Fj4n1LnnDrkJZNEl83W9Sig2QUcDfbtnHzBMHD3WA+gRxLJscI+CUPScP ylgRxEQc4wjflhCHZ8VmiBdHtRTe5mgVgYB3zPTZULmmE5M8rSq+6ZmuPb6uibY0FOmp yMvQ== 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=IWEUB0Rm5asBCFWuA13uiWGs23hNYrQZixIQrmpJ0CWp+pnmkMDfDUKkRs1jixZsOD gEWJzbr1LEeSGSb/vBuLt3wVrTbgyvT/Rkwo/v2puKb4aMuB4kEhleS6WSTGgI7eWICi Zm0v2xS9hBFUaYEyPcsGEEz/lE6lutf9t+9qM/aUskooo4k5EiiLavu/zJCvfpRyDd7e GV1/EFCqCxsYd40P6gKV8SzWAhvWEQvu/XnZQ+rB05kbJl/0Ox+gCUK4H0KFkacviTR/ HsedXRx11LNy5NOubBQ59OEoJoO7knJ4AzzzSKmfselgo9xQdsbEgEXEwWPwRBMJJCwO ZkgQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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 38308e7fff4ca-2e4d0bbe1bfsi3771831fa.2.2024.05.15.04.08.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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 20240515110821abf0adb821c6ba3f4b for ; Wed, 15 May 2024 13:08:22 +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 v2 2/5] linux-custom: Model cross-built kbuild package separately Date: Wed, 15 May 2024 13:08:16 +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=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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 Wed May 15 11:08:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3559 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:34 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44FB8XQD004271 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:34 +0200 Received: by mail-lj1-f188.google.com with SMTP id 38308e7fff4ca-2e2288e5aebsf12570961fa.3 for ; Wed, 15 May 2024 04:08:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771308; cv=pass; d=google.com; s=arc-20160816; b=edntaGTFqPTWPIvefdFDf8wyhJxHKTBCa8sGBarhefmKFAMNFH6XxI5r48vk8bm8cz kHf75KHnpo+vd7w1XlAk5wbV1X/yGV15Mf53pkI5659S2mHXebueIksBBBzwLrUiRpvl OFrdMpWbzaSS3KQEOJYe8X3XncbcqpVvXgrsa9M3WH75XRtI1zHeGx8DWcNGQijVXGLw MEBS65lFcZyl9NkiFO91g53UnvPyX6cn2eB8zTnd6a1epjj8vX3hgmuyiUZrbJT9OZT3 iNuK4Gj75TAyI9kcsIkWL18zdkctaa6oXkZM9RCQLyemT7hJk2QGu+g36O8/5WrKH7Pl R0/A== 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=amr+3hK2S2ZpgwcwnHcAC5SkKDoyAE8BLZUJwaI10yw=; fh=O9GiYJ7rXiJs259+XrjAsQgPMslQF8Tvgu9xQ4m/28c=; b=sOrEGMT7v/RMmUKXLTZDTnJGFXuPYVVSp2xFs/YR9nBwx+fKNCjO/OcE6ksu6DuK4g wds1kueghq6ugH64nkcdb3wPaher93uF757EXhZZNaX1m1qllWyHshVMj/pSlk/UIMuu 2Rk3JPwftCZDxAz+sQEXqbi2drmqGrRO9ptqHDlWjKW/k75quAkCdPIYksZdbUI5zq5q KuhzpMH/G1TqndQ2WUB957OZi98XRerlOXf/lDqtwNwbT+jkEZlkA9yD80WQlEEt3rr4 fA428Dyh7IbA0ccfBl5dNvIWoOibS/BhDK7fEIr32i75wLoCsWAE639i02DrZn6PkYN6 ujkw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SWa7B+NV; spf=pass (google.com: domain of fm-294854-202405151108226c919e3e13bd206d7f-b8hz70@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108226c919e3e13bd206d7f-b8Hz70@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=1715771308; x=1716376108; 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=amr+3hK2S2ZpgwcwnHcAC5SkKDoyAE8BLZUJwaI10yw=; b=FBPQSDy40zqEE0ITyLQdn+9XaTnLpIrqfmiVAEHu3PPxABSCnXNNzFyv/Gyl6ygtY+ M9UCMyIj5AtMbq9MMS23Vjl9gz2mUz2KmT6FvhF4tXyWAsgHMyi7AWnDE38FGohTMhmz vZoRw6/ZClqoqF0ZjXQmRN2w2K6P/jsSloxUEnhZTJacM5TJdCB8c1sT7OKq+k9vtIg8 rUCKmPlqEZN2wQ8/gAQoUSak8mIPzSE5bE9eIsPlaBtZMlYWVJ/OBx7b1GI9CzhvYolN JLe7PSPyjmxuxcbXfRblcZ7ymUuhi87q5LCp8UGkAF2ffgLQSb5EJS1B3pYXfHIp+I99 BO1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771308; x=1716376108; 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=amr+3hK2S2ZpgwcwnHcAC5SkKDoyAE8BLZUJwaI10yw=; b=DLvCLizxeFA+97t7vM8rkesEwLOA107m2XZ6ryHApMB+DK+DwzMkAAEwD494WrLNVM 3KZ2vPtvBB7ueeO/BZUneTHRAI7EAtgPzYdeHuiphHK4x63Qh/InFdMQkq34+PXi4Nq/ j8wEGVE8FDb/OtLp9S5oo5iCRtefFvcMi/26JZOV7PhuRRO0EK/64wNRaWNu4yjXRpzF oCfPWchXalSuJ1CE/aWhuury4rcYyHefNAejgm4FEY+iYIOH2qz3jRACfJYxpBigdaq8 ti77hg9JQLmX+Gg59Q3WZxjCq/3hrCaO4hBRkxOraAdiw+g6Yw0xBP69lEal/3QAeAFr p4gQ== X-Forwarded-Encrypted: i=2; AJvYcCW2/ZyIkDqCbEVX4YmTp3oehi70i8c8dn2jTg6BJzXglvXBEguW3shUpF4x3vTQ03NjpI2PmSqLw3+0QOw3ngGliVsjKeo= X-Gm-Message-State: AOJu0Yw+Y7Ed6NE4Cx0rXb8gJx9NMa61bAcwHJ6od7PVzeNUWUhNMhlt HEKfmoLDn9e5eMJEOy57wA7MoVUnN6PH2hPvWHex4Np/7i8+jIwI X-Google-Smtp-Source: AGHT+IGlTno9a/UJi+yqsCeoqu4ZWgDfOt4uaHI0FHcgYlFzFsP7rU+dXGWzj0BvGPhM43A0iChbaw== X-Received: by 2002:a05:6512:3d19:b0:51f:3e42:1065 with SMTP id 2adb3069b0e04-5220fc73e1dmr10269654e87.1.1715771308420; Wed, 15 May 2024 04:08:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2355:b0:519:6fe8:c02e with SMTP id 2adb3069b0e04-521e3033af8ls118213e87.0.-pod-prod-03-eu; Wed, 15 May 2024 04:08:25 -0700 (PDT) X-Received: by 2002:a05:651c:686:b0:2e6:b00f:da92 with SMTP id 38308e7fff4ca-2e6b00fdc46mr46862611fa.24.1715771302835; Wed, 15 May 2024 04:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771302; cv=none; d=google.com; s=arc-20160816; b=VaR7q7VEPmbZmpgGkdek8pLB1Rja5skN95Y2Prvd1xlmv6OSRYHMoTM4+ODmS7j5Bd nGTFbuAZTljzH9dB2Qgo7DLieUaqY9K1cd69N886T71J6mTSubDg+0OI44g1zu+IdE3I T9/N6h47C/dX6HlWUtQm/JuQk2I0E0s0yZn0+tlmsNd6YSOokb7kyyVXr+7SpV16UAeN aIZVjHM0vyvU5uGb0+GaLg8YTjZIceZ0+ppyVywE1zT0SGIgy7z8zIlO6wHZ0DLEDDsJ uRF3zI3UrGDXPx9fMqjOTWjUVr5wq3tVLjmo4Hruanzre7XNNr9EZFiF6wHsVmUQ/R/U L/IQ== 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=KmPRCwBPZ40hAOgKUqh3EqkvconK8Mho+5XwEQNDI69abWd0nYFoHtepTgRFH4s0cu eozen76KgaPnsgwks7Fwq0FQAxcyalNEdmbNoe6qUYgcV3p5D7RA+6GnoxnauChzXNMu 6/pWHViN3b3TGl+jmxMzHRB4vCRTCsKGRkThkDu3oNNvRrmXX0orBJyeWk2FxaLDpMro mBBkS4tDaSBmnp8moWpe4dlnxlf0atQKfHxHn3YYj1VgKNp4c9Cun4yYhhD5wWMEl+zB IHcmsmgO6grwry6bMBtCypHZMdEhzcpgC2PO+5MICHQfb0nuEa6jRR3wJwWq9bRcEVCk jZRA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SWa7B+NV; spf=pass (google.com: domain of fm-294854-202405151108226c919e3e13bd206d7f-b8hz70@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108226c919e3e13bd206d7f-b8Hz70@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 38308e7fff4ca-2e4d0bbe1bfsi3771831fa.2.2024.05.15.04.08.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202405151108226c919e3e13bd206d7f-b8hz70@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 202405151108226c919e3e13bd206d7f for ; Wed, 15 May 2024 13:08:22 +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 v2 3/5] linux-custom: Resolve native source package differences Date: Wed, 15 May 2024 13:08:17 +0200 Message-Id: <22ec60b9f5131e139ca53ea4c3a9615e013963bd.1715771298.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=SWa7B+NV; spf=pass (google.com: domain of fm-294854-202405151108226c919e3e13bd206d7f-b8hz70@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108226c919e3e13bd206d7f-b8Hz70@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 Wed May 15 11:08:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3558 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:33 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44FB8XFW004257 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:33 +0200 Received: by mail-lf1-f60.google.com with SMTP id 2adb3069b0e04-52389b09bb6sf905268e87.1 for ; Wed, 15 May 2024 04:08:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771307; cv=pass; d=google.com; s=arc-20160816; b=WwFJjYLvdVsii4dHDnevofAZUovPuoi57WkXc8auMI6BL91PzUpvHBGkG1DadV0mDZ MMeYZBikhiU8ft7lG9HTuyVophQJBiAtfPb8zAYiPNhuVas6Yi0ZaU9UE8BjcXveT4Ey CqZaBwup01ovc18uq2HG/TNMOdFGchNvu+1MlBkBsi4fGJ4HILFqmiR4L1hm9uik53rK NkFK8bzlkPK1frUAIkqGbhkxuBeTIvnCqldi+uxjFo/Vwqg29/5Tdy6EixKJq38/uogK XzbMkv2rKb3DDFCOPBXUCfnwaHxgzRvBdQK3b9lSEPilCq8s+ve46HYcWQnfgto0GjGE wIcg== 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=riE/oTyj5Iffqc3/Rbcp/3jb/UijdviL42wiyzy6Occ=; fh=rU6pBtzxGUAQnieqJzdfDV1PqNa85bPWf/Ph0b40SFU=; b=v/fiTSdaj/hXmSE5U+wPcPMcfL9X6AAIY6AGU42mQAuToC7KMPdthBmKGs+oCb4TXR 0C+1KbBOhDPE4dDuk4oPYc+9PhxvqTZYzYw2qss9XfZLlXjNH1aSwfvvxMx7McxZh5uv Wm7c95qmqHr1DkqqzPxqQMv31YbcnUeOAf52SMZ7lIIXSxHyfJJDutNljh8v396kqTFX UDsuvPpos4UUpP08TBU7BQ/LmhEXKkkdUuLMPzTr3tSutkggzRQD+RW7nH/vpgXE0kpJ Ow0F0rTQXHFwV8t2lwSy5sryfltEkPgnjHImJgThdstRl3vaV1l0APgDy7VQVS1sqiZC iOnQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QOOZte08; spf=pass (google.com: domain of fm-294854-202405151108228268b75ae86c73c986-cuvxfw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108228268b75ae86c73c986-cUvXfw@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=1715771307; x=1716376107; 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=riE/oTyj5Iffqc3/Rbcp/3jb/UijdviL42wiyzy6Occ=; b=lXFaIyTe8i/cMOgEBagNCM1G0ejMYfztI05v7OweKywthjxVJX2ML+CidpDt/0TlLX 9ZYbaNkb9I6CIa1TBWIzLPU4nEqzVNTWRdcEwWFocNONR7eFW8AYCyBLdvFcUok+tFJH aF1M2p18GHYF9lPi3tqCYYfJ2HKV04EYSu3QqrQ7kl4jqO7RUaQsOPQ48FN3S6FrIPZg LGXDQj8hAOZhun6RtmA0z7GgD3zbAZOqmf39CU/6AZ5kOcQ2l75tYlsNCnaMn5LXd+rE pe9HiJoflwXMtDNR4ocLYEbLICuv/WNiE1awJ+0MQX4tHhd3zFo1eAO+3kPvkM02u6Sr 70QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771307; x=1716376107; 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=riE/oTyj5Iffqc3/Rbcp/3jb/UijdviL42wiyzy6Occ=; b=Kecm+Oo4rBWf+rp3UMRjf899pizJMwp0LJdflW3+ZiYUFnHDfCaL/Zw8ob1ozwswsp GAC3QHYS4lQH4y+hDgj0dkotTqFkao7EO07CSPjQ2SvxJf2L1K/lx8sv7HWN7ND9Qroe 6kIs+03K1aTynLGp1UuBAVD7plosEnnxZktTZNjzX15NqdHJt5cd0EeQslIphSTkm+Jg W0IvdWihlrQk6Jiv6lCVagLij0v3GbCnXtSqpU9IEaePQYy6ajJ7soB/ULzCnvwSmET1 ZR67pptFtDG16lm9voZJx8ZCeTBMPouq098doBxWIFh93yR0uaVg8dGCRQemPys+BnrB BLEA== X-Forwarded-Encrypted: i=2; AJvYcCVeL3Ql1yinMj4xiCtnM6vh9KKgfE6Sv3iZjH5o7SWn8iMru9AOlLy3fyYngvJDxJ9bMXc4IOr8H2yCVnJlmtX9CZnk/Ew= X-Gm-Message-State: AOJu0YxvP1jm0EgSwTqTKfkbdY5c+7oqxE4D3UBka62L2/0wxfWA+hgw 8gzwaSfFybE/w0yd1hR0kBQ1yhsKdakhEw8ZuV8qvw07atrXW+Cd X-Google-Smtp-Source: AGHT+IHJSVYhZdYdzGujQLGvvG5wbSOSDZwW304zmZGdB3pphpzyZGwwB+Bb9UFKcvd9tU8RQ2czPw== X-Received: by 2002:ac2:544f:0:b0:51f:52d9:d552 with SMTP id 2adb3069b0e04-5221016e842mr8151185e87.45.1715771307489; Wed, 15 May 2024 04:08:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d02:b0:522:32d1:1bd5 with SMTP id 2adb3069b0e04-52232d11d90ls2291798e87.0.-pod-prod-02-eu; Wed, 15 May 2024 04:08:25 -0700 (PDT) X-Received: by 2002:ac2:4c8c:0:b0:51d:a87e:27ec with SMTP id 2adb3069b0e04-5220fc735f1mr10039502e87.9.1715771303101; Wed, 15 May 2024 04:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771303; cv=none; d=google.com; s=arc-20160816; b=rnrTkOOLDAvFs0bxRY4uCLB20USCcLj1gW5cileVkqyPOHl8P3fszjurRgh0iJw7/f n1Rvu3pxZCELT4GqJcH9bo8Do+eUKkJA4ELbNIOwWzIewyzjywmGTPZlUO8Au9BsiXtq 0qWNjQpHAiCz7InvVhVNkMtxv7w/FFQn+THRAU3IXS0bkjUx1J2dhUqV7Jdal1kicx4B 0/jz9+AvN3lqmLyJvuuJNshYRl8MwX90Y2wC3sE9mFn1jOmYhD7nDeDEZkm2jFaWYyFj jzk46Ue10lpt6gt/qXLUNCKZiRNUu1kTZ3iB9LPQFecoodBKql2MAujYCTywRX3iTPAP UkBQ== 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=0LEbymZWeGkxDPAhBbxErUoY1dgJizLdYijlZns4Ozg=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=EqSobfdupZTy7VRfuVYU1HRIR1SXq3HgaVeQkb46c80WFByaMDEsQjALcnNff2cBIz orP6pcbuPsFey5JIdC6mLnervvlbPnVdqql6/Y9OLZqtoCpCoNtY4XTQsqlrffBBgNHd bvoLI9SaO0DvERXBv+DRw2ikn+S3Qti4wOOOuhvbO3g1kHc6UVGNwUnnzyWPx6vNEbUj 36dnswFM3LeTrL196Pb+B/chrsIccB8FAUqG6kgW0lPmq1ajnqxDXq2sz60TnlE4t51r 39Av8x/I3+QXQeJ16gcP+SlpgVCgGQF6sZko1IgtA8rnkk42Hy+VYjqXzCLkoTogdIdT 2TFg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QOOZte08; spf=pass (google.com: domain of fm-294854-202405151108228268b75ae86c73c986-cuvxfw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108228268b75ae86c73c986-cUvXfw@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 2adb3069b0e04-521f35ae079si429741e87.2.2024.05.15.04.08.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:23 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202405151108228268b75ae86c73c986-cuvxfw@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 202405151108228268b75ae86c73c986 for ; Wed, 15 May 2024 13:08:22 +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 v2 4/5] dpkg: Retrieve Debian source name from variable Date: Wed, 15 May 2024 13:08:18 +0200 Message-Id: <8a333eddee9cddcbd158865f2656f6377567fef2.1715771298.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=QOOZte08; spf=pass (google.com: domain of fm-294854-202405151108228268b75ae86c73c986-cuvxfw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202405151108228268b75ae86c73c986-cUvXfw@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 3fa9f604..3cc36c12 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -108,8 +108,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 Wed May 15 11:08:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3557 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:32 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f183.google.com (mail-lj1-f183.google.com [209.85.208.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44FB8VTV004239 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:32 +0200 Received: by mail-lj1-f183.google.com with SMTP id 38308e7fff4ca-2e23b3fae6csf59539431fa.0 for ; Wed, 15 May 2024 04:08:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771306; cv=pass; d=google.com; s=arc-20160816; b=V3iK2pwO4uqeJ/eiwCmAUKe9Y5Br7yzdKu0WuDcg/6Y2yA+sv7CIORtd5pNSQzt4wA 4WS97YOGai3JgVR7g9pSdbGIXKzGyMMny/j0Zr73rZQg6+0878lWIEbM5GCh6jVO7Wnd LBrSlNP8Ut6IHMp43ZaTwYHIMvbuGyqV0pn7bMmKVg1MSMAJuTqwUs92LPEzEmD/+Mu0 nbxvYhqmYjiKS6Rc6BbuFnWKy/+XCYwC+fUdxghuKA2QY6B1HKAHoAOjDfT2wTgAtPLW 0iMh42skjxpTUuEEIIp6y8Ok4sdUdnPC4e+dkS9gdcTW/or7wNibz8lBCWwT4rBAMR1S +9Vw== 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=lrNcWrOwWe1zfWxFS5WCvwj7hDxesocbT9Cc5+viWaI=; fh=j3PEZ7zGEl3iSsH20YpjrhMKLZ3mFkQxO5JnsRx/9lE=; b=eG6S+xDLOa10JDVoQnkFDhSORNkaQyhldj0PG5z/UPBnpa2QliNKVJLTURB0F7Ymiw uR95GYNeeFCAT2H0+NnIdynyqfrf95MWUqbXXHF8Og1u5KCHYWRR++jTbUiQKVSE+phN 6VVmmkmq/asjY9HMRwiMFEbPLv19wcIMxC3ho7/mIsMYxRDLPmQQTBrnZ3PptRVmUEyy O0xTtFI6SWpnG8Yl60Zwlv6gq8Ti3eZ53KNTtkjcFTSQuAo8+fHkte/y7XXIkUBo7uh7 YClhmGtRpoB0MjDK73MPOAtCkniIRHs9fxyAL3zYa/zN9/nwFr1YgpFuWSE2q5B8ZUIl 43cQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eHMsdq7q; spf=pass (google.com: domain of fm-294854-2024051511082384977c09814e561c24-ltro0y@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024051511082384977c09814e561c24-ltrO0y@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=1715771306; x=1716376106; 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=lrNcWrOwWe1zfWxFS5WCvwj7hDxesocbT9Cc5+viWaI=; b=s4UsIFxBL7BUCYUht2JCKx+3a/TL7nguTBSREAZrFmpa3gJW2XyMirfjboW9DrZ96p SQV4jF7k12ARw8LPKI6a45XtOXEpI5NUgnnv/A4axkk7AIzggzMNch5Gq2IQlT4nmZ3Z KFlZtFzzvWU6rv4B++x7W0+FIj1IYaqz3ceVed/o+l3EhYLmI2OElft9OCrQOCwd/82S nKejNHKiWDhdNfv39sAAlxQHgv/+0hGYJABrSTBzIFn47NGbzOomXP0oRj3wlZWyknAp hk4yIjT+8HCbZ8lmUqEXi5khpEAdb6U2+kR8iB1txN7bieRpXpFnqmCRhT9UDDQnd4YW VjVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771306; x=1716376106; 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=lrNcWrOwWe1zfWxFS5WCvwj7hDxesocbT9Cc5+viWaI=; b=Z9l+n6kH2gK6gnE/2Mt8iD5RDLYxNGXcRIkJ0DPhUJGqM9zozWwesS6kqeVwArKqQ6 3pbIRGfP8ElsRQt2s130aVelBxulmMqTjYZyh5tyfOwMGAaimRCzS/+iKq/8RR5RVZhu 0ZMdJDl3PBNXqgnHdURoAteYv7R4bIYbwkTFqa4U13iL68OgdBCf48SSfon0LyNBq0r2 rpRuUzatznGvNHJ/W1POYxy+adLzle8oqJNaqzKa5jhhv6rZ3CEzOkXsIj/gA+H2oRt7 McEzIRJ89bmtELPjkhbgI8BEP8HIhNUX21RKneQSdm3HaLg8p/FMCOZDbtTpwzJW5gFq f5TA== X-Forwarded-Encrypted: i=2; AJvYcCUWYTpGu3tvwgiSLp1YwouA8E7Sf9NpJ7vI9eai+C1LTpHCldMNnXcpJoeTLEzOzwb0AssJb1UyY+UpeQCNLhCxFce+dwA= X-Gm-Message-State: AOJu0YxIpNyghZtDl7Sd3/RevtL785WnN6hkK+VxGjiCBC++XqqzEip2 umdQNyq1geKqNjwHPbW3RgkZmx95gRXTCh9dejYd2ruytUfsfo4R X-Google-Smtp-Source: AGHT+IEr6nCjs8HQiOaIm/keEqzGdqNHHK4Nj1TuSuiBdC3/fWhzEuVRXA6uvWVU1j8/XiNMyWeBVg== X-Received: by 2002:a2e:b6c2:0:b0:2e1:ba1c:efea with SMTP id 38308e7fff4ca-2e51ff4d69fmr100885341fa.19.1715771306184; Wed, 15 May 2024 04:08:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1392:b0:418:4830:9fc0 with SMTP id 5b1f17b1804b1-41fc13ea4fcls26985365e9.0.-pod-prod-06-eu; Wed, 15 May 2024 04:08:24 -0700 (PDT) X-Received: by 2002:a05:600c:499a:b0:41a:fa9a:d86b with SMTP id 5b1f17b1804b1-41feaa39369mr104196025e9.11.1715771303891; Wed, 15 May 2024 04:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771303; cv=none; d=google.com; s=arc-20160816; b=UWDV1hHdDLojdfZTk34mAnWoCmQULh0LL+W6oxGSb/HtOx3HD+ZvDCdmu6XRk2lUAd eCQMdNKkzqJU4knG4YHmfPsciF5kuwVLBKAlfHquA2+SHAf1MDPebXLP8BG5df4iiJtU 4LI2h0UGG19wx6825/dZNfIPaGRxFRDBUkI/ttW2tgA6Y9JVJMbiCT+bhSYZqjLOo5vj GmGvoahpeWNfLCQDKl56YLwZe+56MfAhLMgUCv5RIqHyRofcEFcYbiqLQw3fceswZTHS wW2BrXs5N79EuMLq6LiNA1KnQipmLjfkjVzxMYTaVXB3euTgr01Ni60IodAobn7n0p00 WePw== 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=7yHb6B8W/gMMNYldYm10lxhROx2N3umnvFwmF+LnwRI=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=jQgRYpjjPV3nhgPTYNp0xJ5Bo9waQVlrj22KUancnFCpli8wZ7DUPahkFMXNOzvV0w n2vn781K9ZJNY5aRkXsnhVVlL0ehNFexUfLeJOMOzkUwkSlMkCpmQPdDvy5DSNH30fxh VUMan/sFrmHq6AQ1zZik8BKxtGP636H1M8e2gZnDqthbLWF47h8MUARZr4ScCwX2Wq/F SgETd2W7jFiOnCIWeM0LnKmRpDIri5FMUUJ14jrcxSDYp4RRHd0NDXfGrun3fn+WQMvB AHDu1/cX3kkwzL1R6XQUs786wvuANAAzaj65Ln/CaHDyJ9gxs/omxCrCe2Y2g6kLd2uV JyPw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eHMsdq7q; spf=pass (google.com: domain of fm-294854-2024051511082384977c09814e561c24-ltro0y@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024051511082384977c09814e561c24-ltrO0y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-41fdbc779fcsi9511465e9.0.2024.05.15.04.08.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:23 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2024051511082384977c09814e561c24-ltro0y@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024051511082384977c09814e561c24 for ; Wed, 15 May 2024 13:08:23 +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 v2 5/5] dpkg-source: Build source package only once Date: Wed, 15 May 2024 13:08:19 +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=eHMsdq7q; spf=pass (google.com: domain of fm-294854-2024051511082384977c09814e561c24-ltro0y@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024051511082384977c09814e561c24-ltrO0y@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. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-source.bbclass | 44 ++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass index 560f536b..6a36081b 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,44 @@ 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 after do_unpack + +def is_native_or_compat(d): + overrides = d.getVar('OVERRIDES').split(':') + return 'class-native' in overrides or 'class-compat' in overrides + +do_dpkg_build[depends] += "${@'${PN}:do_fetch_common_source' if is_native_or_compat(d) else ''}"