From patchwork Wed Oct 7 05:01:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 118 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441867ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:ac2:4a9a:: with SMTP id l26mr928120lfp.64.1602079295506; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=u0CLmdnlD10A3lUkizuhUANeNUTkUxcQm7o11T1E5pqK1NK6eFszsH//SBCHGJk5eR 3/3apqSCz43O+BlmAviX5CqgsPd06QV+l/pZME+qEJ03C/ahhllkdVTpN3aLOgo+S1cu VFiia3QKKOU872F0ax8v6qaGqjYKtI42SOFYzUmvD7yLyrUuaLP9d+8YlA3YvTzOUbb3 bU3bnN059JRKWNhdlJAHtDo522yPjdU4gDXjAsa13E53tX9NyE1pyd/7+wCcwCnrShk7 P1CfCHlItPoautHdU8YbrNCp9dK1M0ojfLsyzb6MFC+MlkqgFYklbfDPHihBleUXYmOR QIEg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=wkL0hl/BGiYsb2GeS/1fcrQLLtQfLApKDitLeN2zp/M=; b=MaCmvwtEmNbv95q3O2eh9VA+nNk1tZ6KRrjPZ8WpQr9j0EoH6O8AwEyDAMpF2104TY hmx9r2UiplmxshQ2UrBaITPkK3vMUummYyyRZlR4j8ipn/XGoJrcsqOF4dOpzWcHzf16 MXyRi0n8gzAwrS2ynPgECkey3Al7jfKyN6atckloCe2BYFRqZEsqjYEv3CYf1MApvqES qDBabmBg2zKnMpJsWf4ESNZoCrqNoiNYe6eJoMpI2zGE7W3YKctWKbLoNOQQ2eZsNlyd dm1go6/GvyLrow/HE/f7phugQfAkMe9RkxuzkEC/i2lXMs6TTzTo+A8PHrj3NyNbcO7o LeaQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E3kbmd5d; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id p10sor978401ljg.45.2020.10.07.07.01.33 (Google Transport Security); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E3kbmd5d; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079293; cv=pass; d=google.com; s=arc-20160816; b=ZMqWElpCP0Gkxvv9XC4ea3JxvnbRoDEaEgu4niNdEz7QXCGnZ+IjFjBnL80YBEmoJk tXIMfCWsf8URcpKXNyKXaEBSEI+XCtSd0HoQkmIT32nYzLKvWx5ymbQOmEHu/V74rgH0 LyCR38medKljg9XjaXPkZuFZX9ncVsm+Gt+i8rWYnvvVUlYeusZ5VfLmQgsL4H0nmElz YGyKk95SHwOQ8OIF1biDywjhQrEOa8S85p3IKVcZAPElWz0d9s4nmEamb9SYV29ybnQK S4KVlI2bqi7wnMcN8gmgT7LPenKJuicD4AXyOrsZVjT7DO17uVH+ZBerduXZqskuMizC 8WYA== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=wkL0hl/BGiYsb2GeS/1fcrQLLtQfLApKDitLeN2zp/M=; b=dqVU+MMLg9D5/zbeuapjGF6GKJINB3a5M9OZTRVvUAif6RBrKaaZL6Q8glM8z29TzK 1/m7v6ErAK0NO/RJGCCf86/IEA1irjujRpMoaetgMTJFMJu1/fePOW8Fu8BF9kL8EsIc ajRFxKwqmsYofeu+E6qYmKJMuomQ5pCxLrl5PxA76Ogf2WfIBTtbK7h1cOyQcUrBDZAm EZc99uUi5hug/iLB0NvPDekkHIEiWXe/cAC2xTWw07CICahUodZ071ZbHeGbPy3nea7w ER2zTrmbcoe8Y4qWV2PJfQJTkerpPWzfAM/8IR2IAk1/Eq/+ftyiWLDYwI/jdpEuu+9p CC4g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=wkL0hl/BGiYsb2GeS/1fcrQLLtQfLApKDitLeN2zp/M=; b=E3kbmd5dtnLm/ykBV6cZpu+TixJzboXvXFDS7f8O+z/kImoMA1p9K9IhsapibJQfPk bNlkqvMt2Q3p6NsGMLwY2MZNV3e/KgdBy/7ZTD6/4VIMxbKsgkFQGls2Lv5vLp/A/72d rwo3F9XMUE2CemkloB2hzVEDTNemFQqD9v0/lYST/rOLWibP9Mp9YGIC9BgBh4cYAGmu bXHIxuDqrWuz9gRekMEUg9G6MFq6lBHOC6kE+NoWVXsVvVpOGVjvZsPkHxEWMG+47IIq toIjv6QIstXTrmzX7g1XVgZn593MTS6r1EHPw5Esh09OqHRGAyFHCHh89+oalGICZ/wZ N8rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=wkL0hl/BGiYsb2GeS/1fcrQLLtQfLApKDitLeN2zp/M=; b=X2VSWsE6mBPu2Ij+8neREAEiZm41U67CW2XqVcwt1YjC58LS2FI4CqmJuQhGRFZ6BI FPjxtSVYf3wKwW2hR0bS6ICCdu/eMlSk47jQ9FrcjxQ75qK7a53st86bZPLNQtKBKfbv mUEQBKYV1W9m5IV6dSC7PPE+cW8T6rlQTXIRe5tgEMJl/Q13TdMHj6G2vuZiDs4qxf+4 MlStCJ/s1ei6lfpb/RDm8+OUkY1NJy3UM37cyVkxv8EG5bsrZqiwkMFGIrHwh3BQ/g3Q ItKEk/VeefMSm6BDzkTioSltkwqNyyxOEgvq1ajjcunH95JIla40yHu/Ymg+85i2VoED TLYg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533HyEO0daGVKyQ9fk0+okLrg5mqXlg9+qY0nc3/qO2fKwGynAvn tQqVCUtGDTuuuUo/IX3/f20= X-Google-Smtp-Source: ABdhPJx2U9oja5w7qv+a4VOejTk1m6hcuBRH83XEMHV5fJ3vdzbUMMYjQb8NkueyqqYjJKhaX/88gA== X-Received: by 2002:a2e:3a0e:: with SMTP id h14mr1412566lja.444.1602079293720; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:804f:: with SMTP id p15ls374181ljg.2.gmail; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) X-Received: by 2002:a2e:b04b:: with SMTP id d11mr573856ljl.75.1602079292270; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079292; cv=none; d=google.com; s=arc-20160816; b=q9ulD4pP2fvvqvs2T22g2OhoHo5/+XGM+Z41a9kRc1WAPOclPTK6PRAahWFrfCgKLT rAJJX6MsWkG9BtJ8gTGAk764o3Enmj/d37l2uhZ59L5uhlziOJAVB8r1AFx8AXw7f01F ikV82AlX2o40Py4s2YQZkXbZ6u/+ZqnKp0YGBHBUNGG56bDrXkDJYKb8eeoeiO10mKf7 2+oLOPgLi7XLZsh9QeZ1I4tvLMhJWmGhbBQl9WK7LOKWDxhgV9v/wt6fJrtWuLig7FH9 7EY5OpJ1gOakz7lcCy5Rio8G1A1frrpNGauefukJScVM64tE528EedH80N8NG7jQ1OiW wg3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=sjgQHuaH6C9V+M/zaHb/greu8HuwM1F1AOw6xvb1DyM=; b=Z7eh/3sa+T6Deb3aMBNnrcshqj0VGxAWw/HxF6WF7Z8lWZhG+y56C46KFkQcmvmx6J 1pDjjFUDbUByRn2xXbfH7ZjacUgDFgHf241Ca4GjM5pgTExtcbpEFjwaZkzYJyR2qqco uOz11YoWn6muTEd6Ypoe+BzTiITCfcK6Il7j8YQgm6WU4cA5sxubIiucaS/6gfk96Nn5 /tbj77VpNp5IPY3RHhWFhUjufq6C7ZyPO9Z5kFS4wuOGTf8JVWocevWq50qVcMx6EQgA MDaVRVTa/cgTzd+GsNUbNsSgLVTKU6POQuj7vKOVycGC20qnXB0bTCDad6qMcwQ5ErFc CuAg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id e15si54323lfq.1.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1V77010410 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:31 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk4019880 for ; Wed, 7 Oct 2020 16:01:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 01/13] sdk: Add support for adding self-defined sdk packages Date: Wed, 7 Oct 2020 16:01:18 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901898656369232?= X-GMAIL-MSGID: =?utf-8?q?1679901898656369232?= From: Jan Kiszka We do not yet have a good algorithm for automatically adding build dependencies to the sdk beyond the basic set, let's allow users to append what they need by appending SDK_PREINSTALL. Analogously to other images, also allow to install self-built packages, consequently using SDK_INSTALL. Based on original patch by Le Jin. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 1 + meta/recipes-devtools/sdkchroot/sdkchroot.bb | 25 ++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 8d04cd25..dd6fc344 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -761,6 +761,7 @@ target binary artifacts. Developer chroots to sdk rootfs and develops applicatio User manually triggers creation of SDK root filesystem for his target platform by launching the task `do_populate_sdk` for target image, f.e. `bitbake -c do_populate_sdk mc:${MACHINE}-${DISTRO}:isar-image-base`. +Packages that should be additionally installed into the SDK can be appended to `SDK_PREINSTALL` (external repositories) and `SDK_INSTALL` (self-built). The resulting SDK rootfs is archived into `tmp/deploy/images/${MACHINE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz`. It is additionally available for direct use under `tmp/deploy/images/${MACHINE}/sdk-${DISTRO}-${DISTRO_ARCH}/`. diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 58420d05..05320a03 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -13,6 +13,10 @@ SRC_URI = " \ file://README.sdk" PV = "0.1" +SDK_INSTALL ?= "" + +DEPENDS += "${SDK_INSTALL}" + TOOLCHAIN = "crossbuild-essential-${DISTRO_ARCH}" TOOLCHAIN_${HOST_ARCH} = "build-essential" TOOLCHAIN_i386 = "build-essential" @@ -22,7 +26,7 @@ inherit rootfs ROOTFS_ARCH = "${HOST_ARCH}" ROOTFS_DISTRO = "${HOST_DISTRO}" ROOTFSDIR = "${S}" -ROOTFS_PACKAGES = "${SDKCHROOT_PREINSTALL} ${TOOLCHAIN}" +ROOTFS_PACKAGES = "${SDK_PREINSTALL} ${SDK_INSTALL} ${TOOLCHAIN}" ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_SDKCHROOT}" @@ -32,15 +36,16 @@ python() { d.getVar("ROOTFS_ARCH"))) } -SDKCHROOT_PREINSTALL := "debhelper \ - autotools-dev \ - dpkg \ - locales \ - docbook-to-man \ - apt \ - automake \ - devscripts \ - equivs" +SDK_PREINSTALL += " \ + debhelper \ + autotools-dev \ + dpkg \ + locales \ + docbook-to-man \ + apt \ + automake \ + devscripts \ + equivs" S = "${WORKDIR}/rootfs" From patchwork Wed Oct 7 05:01:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 125 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441925ooj; Wed, 7 Oct 2020 07:01:40 -0700 (PDT) X-Received: by 2002:a19:68a:: with SMTP id 132mr968197lfg.429.1602079299455; Wed, 07 Oct 2020 07:01:39 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079299; cv=pass; d=google.com; s=arc-20160816; b=QSs/og+C8gT3pp03BST3m/mMfuvHJLGS93DJV/VHfHogbj9F7ZhwxGWDbyJ4ElbKUs qmH6yfOoXWvbYG0XeMLsRRLFQWEc+70DqCb0/tVpG56DcJ3w5biY6+/sDzsSWx2qiENi zr1oaeyuplWmyeN4PSBEw750tsjxfS1QeNwU+1HbOz1upv/zDT6noAU7jWJcvgOZ0oMN 1JalHXFBMTUDf5BRqLeHKRzozA0OH2HQFijwEZVvhyqvlPikZ+FScowVADm8K4bGDxpS GNNeNhKdvEeFmaaVn9NqOF2B3g+ZbaYHrYhr7Ryd5rSvv3fqjKiJiihFXhvzOlRAo1Aw UOUQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=0y+BQrE5qVP4H2kzdRezye3aW7eg90OI0paIi+JDMEc=; b=LDgPJNMoKHSElLM9R3toL0KEqWfN9+pqg9n/TSdhThKKuuSn3YzYYJAii0+pF427ud zTpK2fhkBD2kbtsdiA7axrzUZ+n5qeLeqlREn1UsKr3oi8aXI+fD87IzOMgA8hL5tUv1 DeTiJmjoN4OCAUOk4IK6NxwOgTdg0/IaNruuf3gfLu5DnOJ1RgQIGjDQeJRyZt4yi/Ww Dbmx6aRITBgSEdhLDu/Kcv5fBuBFl1ihhlCQRgi2hz263bE5I6tcwzLgbJ07QiSt62FE ip7mjX3HRFds8c1k+R4UifI4Ik/+B71FUN2Mk244KeS1vtqMHNV0VGoJt1CU1r8YjJCU H3ag== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ncNcokNz; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbquu675qkgqewzhxtjy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQUU675QKGQEWZHXTJY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id y191sor429329lff.152.2020.10.07.07.01.39 (Google Transport Security); Wed, 07 Oct 2020 07:01:39 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbquu675qkgqewzhxtjy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ncNcokNz; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbquu675qkgqewzhxtjy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQUU675QKGQEWZHXTJY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079299; cv=pass; d=google.com; s=arc-20160816; b=QzShIP1rI9jB+hyv6Z+UGK2ahzNjMaw84lMCy+g6xXbEFMdB3GSzoX2Jm2ZXR6WL1F /ldDzRhsJ4vwxCXn03rT5EOlY6RNB77lOF/VihXEgguCIvTOxIL5As0KBHrsF7XYlnYm MCGNwL4zAhlr3bfuA3Jrbqox9q6qoWQRTlEFv33UQxZVa4Bubw1V3dxp28/l+SpQ8M9u YG8QjZ04W37HVpd5PgUZn/DpTR4ezIhZR1W/Zj8ZWxp5YqgSl2HIzsu41KjRSnn+9+Tx PEVWdT1XQfBzbMmWoUP2pWfx9EphcMDRdc2CnrMy6fkKdezhlmlOsOSYuhd/72evx0ph 5Iow== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=0y+BQrE5qVP4H2kzdRezye3aW7eg90OI0paIi+JDMEc=; b=TbRmreU92GCYC9gLFHkY4g4e4M3xXhdLiRCrNeBDEk2XVyWkk/pJqrVnZprC3B4TFA sgDLc7U5v1b/09pv7XVQc0L5BZ3VlixsUMWuQcjBr48et8B0tS7jFxhuE1ZznnonvvY7 RCXOezvHsh5g5Y2tmjbxXJCjvCIH6Q2boXCAQPz/ng/lPO/WfaXuCKaAXn9EIeOYrHZD /ft3hr/8DW+sO5Dh4y8DB5DJ9d+GfD3jAB3EUz1YPSayK1LayeZGAAj4EsAjDMADe6yu S3lIINhCg4olWGNma/ia7kcz1lXNVcqif7aUIinDD0Qw0d417akB7c41rNoiFDZozxJy Su5A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0y+BQrE5qVP4H2kzdRezye3aW7eg90OI0paIi+JDMEc=; b=ncNcokNz9jJqICpVDx4TWdnEUfVGFXcJPg9LgNxWVd2frfVjvk/HZP+2bM8xuYFdTK x0s0MC+U9QOm8G6eJGqdctL2RXLv7kk3gim8VXp5ppwp7FDH20IrF64z1qoZJwylS1MR zwcY/5uOLnKhtJz+BtExZbT0Y/thXITYGFTC+CzwGEc/GT2D+kvFNTTJAaJEWyf3k7Nr 4ebwhzsfmEZ10IWnFegN+0BjEjgCywDPe0KKDefiCxRNaPc0FS9SpnMHBquSf8JRyUc/ jvG8rKQYolLhCvFU5D4AftlpZKwsF/dwwfVAhi1xJ3y7nsWMazC3WpkpNtaOot3wFi18 75Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0y+BQrE5qVP4H2kzdRezye3aW7eg90OI0paIi+JDMEc=; b=MfLe9u67dj1HHPr9U0bZDjviKb4gmvXpELK0grytbly1Ql5Yz5krbLLtGpnmyos7ln gIpI8BNxLRxP99iif59tSxIaWVISZDfmVn5prN3uQiSlu+clW7uaHG9368RHmkRi6yxU F1BoBlPrKH983jSknWxSWbMIoZPD7pkNajMv/b/Sb2WmVdGaMrSTRJAXrBS+HnBgGZl/ MYZb10KTXxrEB4/x2pCoVWBhnNQlpUprZ7clJkPzE4ZUXsz76fGdlOLOLJUnuv2VH9Qd eOfUZU4XuYlOBIWzOkZeWrV4rQHRZ4MQ4kDyhOId/k99rPE7sspeBHJwfpkZeZCxzjPM R9bg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533Mxm1p0amzZ1rDv5NOfqhZRCfU1FeP6fjx3lnwoftZMES1upyH BcSC1ljtMRMpE32w5FPMcNU= X-Google-Smtp-Source: ABdhPJw2/rFx7t8tdL3Hdnn7a5Ox5P4ksCP/C6rKlzthXD7ImQJ/6RUl+bDg/3+QlpiebpmMszECEg== X-Received: by 2002:a19:7c6:: with SMTP id 189mr1101958lfh.93.1602079299064; Wed, 07 Oct 2020 07:01:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:554:: with SMTP id 81ls1335268lff.1.gmail; Wed, 07 Oct 2020 07:01:38 -0700 (PDT) X-Received: by 2002:a19:8087:: with SMTP id b129mr1118461lfd.471.1602079292528; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079292; cv=none; d=google.com; s=arc-20160816; b=vLYXqLUmk5O6JuwCjVCbMFUGKZR2lYA3s5gQmCoF+ahR6YooPRIcghdkq7aIxGPpwT 8fUEmIrL9C3WiujVkyag7o6pCQeexLnacS160zLGaiZGCxQeiiWrIN3uMInVNbrw2GrP GcTrfnm/s5X4fOdDJYoWMT8CRfFVk6ZrGiIb88MY/xYffh1w7WexYcmLQOb8ofSo9QEH XH47w683Ckoh17Sec1Q3uLFKiyJKfNQyFOtP/SEkggunsQP8DisCJRicZCmEAyJdKcKK FYe900faHL+vaEA2Mgce3NsHtJDvfZt4IUZHJAf4lQKyFan/tgHgre0LgPgBK1Z5Iy17 jPvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=WnAqHmxQfoaC0EGQpjziRFhDIGS25ogz4WgLXLBgxE4=; b=ci+Zebz7VKmGmvnId6z1jGlwSrQsCwtkoly5lYaJsiOOnIcJZOaSYDFbtmebUw3rvS /xT6KiixziUWKZKLd+luXrlxBK2ucvfk0JcVC1Vl8TWNSdZsFxlGSr6Eo/EHAhC3w2cG H5xXV4rrRzk4v17rWoGB88xdl5V0Z5Oar07HQvCvbOoWqUoNns2Loqm74dJzKjnKbd72 OjVAwhsT0RRf7i2cWF9uEKajUcSohxwU2IAsZEGwXHde9q794uV7PwEyHmKXEygQZYzi geXgyY8RmZBTUzklFLh1VePVhO1gLGpeUg8y7KWmNC3qDyBnwURIbXSL4ByRymwlJuxc rEBg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id w14si47008ljm.4.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1VCh023088 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:31 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk5019880 for ; Wed, 7 Oct 2020 16:01:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 02/13] sdk: Make all links in the SDK chroot relative Date: Wed, 7 Oct 2020 16:01:19 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901903283523428?= X-GMAIL-MSGID: =?utf-8?q?1679901903283523428?= From: Jan Kiszka This, in combination with interp and rpatch rewriting, will allow to use the SDK outside of its chroot. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index b91fdd64..b6e9ab09 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -18,6 +18,20 @@ do_populate_sdk() { # Remove setup scripts sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${SDKCHROOT_DIR}/configscript.sh + # Make all links relative + for link in $(find ${SDKCHROOT_DIR}/ -type l); do + target=$(readlink $link) + + if [ "${target#/}" != "${target}" ]; then + basedir=$(dirname $link) + new_target=$(realpath --no-symlinks -m --relative-to=$basedir ${SDKCHROOT_DIR}/${target}) + + # remove first to allow rewriting directory links + sudo rm $link + sudo ln -s $new_target $link + fi + done + # Copy mount_chroot.sh for convenience sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} From patchwork Wed Oct 7 05:01:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 127 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp442096ooj; Wed, 7 Oct 2020 07:01:50 -0700 (PDT) X-Received: by 2002:ac2:4e92:: with SMTP id o18mr1092544lfr.527.1602079306666; Wed, 07 Oct 2020 07:01:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079306; cv=pass; d=google.com; s=arc-20160816; b=c8rk0q1PVVsTculTWMuXVvio4VREO3e/UMXmZsNV3yGk7/mhSn34Q0Lri9KZGmLx/Y 5tS1OuNnFcO8VQik2TI+UWx4ORMsHDnBivnowXETgy/Qlx0NG+09BHypDHLuO2GcghFr leqSTOnVijgj71elmvxu9BUIaQ6x4Xnruxp83K7hq07KI23Ol80INhmcJ3pLQNmzDEvF njYa1ssZvCVB3k0HPMMDX4GlxP5SQqs7ojvTdk/gLgsDT3yAy65hWciUYuopCrmQjGVA jzHEAIfTzTHZgJE3N5UNfdbryryKR69mWPt2zef30wdqQv1IjRWwHMoF/YhAFmbsgFNF 93kA== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=Qsmf7cdigOV6fwiqfsBE6ycYS2XfuJjlnyNo0HB+Ex7TjbRdONwRD0rKVv4vkCMjMK cqxcOeo1W5smDUQzVaPEnqJ92iGAo4OTdk9U3F0dtpex9ovyuqddXAHHmzXv/7U2Jr91 eWgeyb3e5TgmWnowqylVuUg4TeIsZyEOTauzWy+4HDjFCD1TnBJ3I/pTKKPRD7ZCVS+K 3jgKPaLUeZb4dAab1MfHrw48m9/hZOfrLaazT+YuOJODKRXkIkE5Kd4qZsQ3PPXzYhxX u7q/wrVJedYOX9z76Cq/hXggSP2/efkkR7nxX2r5FuZXSH7pS55AeXTjaJO3Zdgrdokt kP5Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=BZSB5drI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBSMU675QKGQE7FP64CY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id h1sor1009842ljl.38.2020.10.07.07.01.46 (Google Transport Security); Wed, 07 Oct 2020 07:01:46 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=BZSB5drI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBSMU675QKGQE7FP64CY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079306; cv=pass; d=google.com; s=arc-20160816; b=bjI8LEOGqH1umifSADrnGk3f7SEm+MWUswtvRPgQ/12wWYD4Dai+oRZcEUV/EPtbBG QvgAz43xa8ESg6yLLxfB+vRK3SYWKiH+ddJFcbT5AfC3vymoO61gIjFpjjsvfMvBXYrB ErfT0fauxaX8imWEUTRAybFDlk76uw8ay+/ArZ3fkWVjfRkHJZtnpqx7Trwp1QtikCib uYGMXDOv7lpdKnsRI3EvmA22gKVA4J3YaEDsSr9as8axd4NgJquAbmXPGfg3glRxlPln hN24szgwN4gQVBDKx3Zu0aED8axgqhPR6vRGWfqWI5HxsK68siQSr8Og3Yp541TpZexx /qlg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=HFjeJDYmky5+wrQjjLiHrBI99y3TFHyup8MeqJ/1NOfchd6FhZhXMIP5Vd4v1tpozt LDvo4rbc9iHncaEv7oIyhYoJDNSMG375g5qCnq/7yqVvNjQENnQyDLUfNBlUZ/pkNer0 bu9XE1g2dQIWipgXCrxg/jWleuxuo6JB16DvL5Ik+YAp/ykxvkjC6Of0MgieUgQZ/WV7 qzn637uU9fetwmKjcrc3FwIIFHumHZWlebqIwhDh9g2QNBvaOmzPYfN0GBafGrY57r8u mxmnroDNDkq1OiDkvQtK+xyyNixEf9kBzpzDjalMIvu1C94NJEbeuWP8IHK9KZI0LC2H 8teA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=BZSB5drITt7jMaSG6ES6+ZVP1PufitrK9Iu0f1Mkh+Eu6+06gN2SWfOYY8lmm+RnrQ /1o9/kp/q19krXWbNeg579WiV77w/JkMysX7vD/G3VlJmBaOcNTKcrs9jAPljXpKQuGa af5enrlBpwMFLiNEzgFuR5RLX+pZsdHlLzfodsvdf9NWyL199e1mRUhujhjglwxN4hRA LXm3nLTwI8Plm1jlyYGOj/F+XAHVDClSo2LXKGsFZ7sF1Mf9fQpT1WRqYpIMJWz47REv y0XSWg5b+pWDQiTuhsGIIopA04zA5VXPW/Br5/Wrsz0q3x2/75vQbw2My8itHaLmIG2O /CTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=GBvi0/pax9ujHf3OPeVIFlGhMUkHRLm1bG+fbRWbEHjNUydV+rlnWWVrnxd5Fl794Q lcXNLkAzxujpNAxeB0byYJ/6CUs2t0ESQchdJwXxGNY6HFvzDDiqEatk2sVF4mD2aJEB IrANpAQkvW1bFQkZgemq9O6Zw4oO4gTrXCc0mdFA0hZ9dXEUo10yOxS2TxajMjgPMeeX 1peVNLVo8lOOmjxRH43xPJHtspek8OSC7MHTk3iy/LGUtLuT11L0Qjy3F+9JR6nn29SH aj5pJNTykjLiaSpBItlcO6pWd7/31r+e5yhg/RN4twcnMcCQUq3kEWDmb0CNrTu7OGUM Cc+g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531S9i79MNAocKuKLqNfm/fCWaBp3Y0UjsKzRJ1XnFCfJ4ozYu6g 6P+tQWqpHcL5k3GvcU8aNdM= X-Google-Smtp-Source: ABdhPJzscULGOjs8Tommrp3/cCSV9al/SYD5LAUf4LHVERFKYoSfJnt2ULKVjY6/wGfDwesky9MIjA== X-Received: by 2002:a2e:3c08:: with SMTP id j8mr1179160lja.358.1602079305886; Wed, 07 Oct 2020 07:01:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a556:: with SMTP id e22ls366220ljn.9.gmail; Wed, 07 Oct 2020 07:01:44 -0700 (PDT) X-Received: by 2002:a2e:b711:: with SMTP id j17mr1331582ljo.20.1602079293019; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079293; cv=none; d=google.com; s=arc-20160816; b=KrhqwqMvHjLpzcmPRYpsrxTjATSYaY76UCjxGOAVI4itmh1iPTV+UppN7Yd4ckFDfs U7J9ZBTnEQxg5hbjlFlQda0OQtf0ufJB2JblplpZ13MCb3WvDQWI7RiV/URikHwEkFuS y28h8ntk6a+WVrua/l9CC8NdInjJfoPQElw+naoENE1FY6XeC64yNOWfT+HS0Hj8MN9u ac3/jmEH78UPTVkZImm3moZ8NJUo9iysVb10zjloQS3FPDT6lUgNWq/8F/A/5lej5uQk ifsLZr9G6yHZsPV6GB20HPwbukdUBYYDYovnPHoR7g+oy8wkRhzMqYiYRuEh6xZbw+QS dh/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=oqSUBvzoWu1iv2L2wwZ1x/ztcE4H57P7DkFv/I2BY1o=; b=CX5Ua3P0Voc7bcTTb/7r0XEsxkOmbT7P5yktTWBEYPDxh5EB7SRiQ9Sifx/n02Zauo hReJ4anHScVLgv8cldBvfL0L9VVu3SU+UgFZ5IXdOHZr0mptFfI04oHWtGXklsc9ywnq v0GK1r0WS08ricMS6MxhkMQtnNbAcqNsM9h++Hv0q3dHlyshikhGJqxwLJKK61TIoWLB 0iTPQU1YnXO/xvR3BuabDTzijyz9wIV8OIAuv7q/jow2jkmyLtH+6qJ3+msTE2aUS3d0 epPdWyjvWHhd0Na6txIAMpG2eQO1siHJJewsGurOGDyrx6ho3XTrXy31q1hSjvuQLN71 I7Vw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id o142si51684lff.6.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1We6023096 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk6019880 for ; Wed, 7 Oct 2020 16:01:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 03/13] sdk: Add script to relocate SDK Date: Wed, 7 Oct 2020 16:01:20 +0200 Message-Id: <5926e0b8f0d2a70c6dd01d3ad217a92468950a7b.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901910874870082?= X-GMAIL-MSGID: =?utf-8?q?1679901910874870082?= From: Jan Kiszka When run inside the unpacked SDK, this script tunes interp and rpath entry in relevant binaries so that the cross conpilation tool can be called outside of the chroot, irrespective of the host distribution. Then only "--sysroot /path/to/sdkroot" needs to be passed to the compiler. The script also supports restoring the original chroot-mode when invoked with the --restore-chroot option. Signed-off-by: Jan Kiszka --- .../sdkchroot/files/relocate-sdk.sh | 41 +++++++++++++++++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 2 + 2 files changed, 43 insertions(+) create mode 100755 meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh diff --git a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh new file mode 100755 index 00000000..1c9b02fa --- /dev/null +++ b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +sdkroot=$(realpath $(dirname $0)) +arch=$(uname -m) + +new_sdkroot=$sdkroot + +case "$1" in +--help|-h) + echo "Usage: $0 [--restore-chroot|-r]" + exit 0 + ;; +--restore-chroot|-r) + new_sdkroot=/ + ;; +esac + +if [ -z $(which patchelf 2>/dev/null) ]; then + echo "Please install 'patchelf' package first." + exit 1 +fi + +echo -n "Adjusting path of SDK to '${new_sdkroot}'... " + +for binary in $(find ${sdkroot}/usr/bin ${sdkroot}/usr/sbin ${sdkroot}/usr/lib/gcc* -executable -type f); do + interpreter=$(patchelf --print-interpreter ${binary} 2>/dev/null) + oldpath=${interpreter%/lib*/ld-linux*} + interpreter=${interpreter#${oldpath}} + if [ -n "${interpreter}" ]; then + patchelf --set-interpreter ${new_sdkroot}${interpreter} \ + --set-rpath ${new_sdkroot}/usr/lib:${new_sdkroot}/usr/lib/${arch}-linux-gnu \ + $binary 2>/dev/null + fi +done + +echo "done" diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 05320a03..5fba09c3 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 SRC_URI = " \ file://configscript.sh \ + file://relocate-sdk.sh \ file://README.sdk" PV = "0.1" @@ -59,6 +60,7 @@ ROOTFS_POSTPROCESS_COMMAND =+ "sdkchroot_install_files" sdkchroot_install_files() { # Configure root filesystem sudo install -m 644 ${WORKDIR}/README.sdk ${S} + sudo install -m 755 ${WORKDIR}/relocate-sdk.sh ${S} sudo install -m 755 ${WORKDIR}/configscript.sh ${S} sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} } From patchwork Wed Oct 7 05:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 115 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441850ooj; Wed, 7 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a50:cc0c:: with SMTP id m12mr3604539edi.292.1602079294511; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079294; cv=pass; d=google.com; s=arc-20160816; b=urQtDCxh1UxEKWWLgg1pR4X4uzdFOCPF+S6dVdoy24JTLOK274cBwNrwG0m6QN8ddb R8BNhXYF+U6x6k/C7V6s0kDn5QHHRzsYhPW35Zqv3bFWIZjcnr0D1ciR4CC8Al3B/Q5t 1CIsJ4yAx4NQSJ9sEdkmRqa69gr08mAnegFhFES4HyRtZ+me5Od4BjGNDRjeD5uSa+DI kTz2e1zOutyu7/bMM+VqFvz/XIzUp0CtmYwiJgNeRsESygtM6C7btGyYYpwBMXDQScQL R8ftEAIhPFg3t4FnjqDNq7DoM7gNuNMAGrZGo9JEsHPgUThSC5fyj69qTb0WoKY+eyNT BEcQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=G12yKDtA0hBHiVz1M+mOfl2gLPIjWFnRweZgOTf51dqrMY7ScCfkZrq3mlUwr3Ejj7 IlJBxzTP7f0bsFQZ7cVZIJH1aQx3qLBulyMSJYPVcd6n/SGUDZrvShbotdUKDNf8IyXB pDWX2ZbVDV+Ow9FZMhqreipRYg4XVzp8h2Q2n4seZ5/5KfsqXn5f2qXBCSyZ6ktR6slf 4+pQD5v/MHXhKdoDHakbbe1ikTg1fDC6YFrvNfVFNk+MzihtTUnsF6/OqFk/qhTGZbYO RtCFaF331MXwKyXZGvb8ftqcPSlrunsbCHwGj1MpoBtqbbIZ5J26UENhYTdm6ROUVUA+ lcFA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cBmGG+qq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id d9sor2284466edq.13.2020.10.07.07.01.33 (Google Transport Security); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cBmGG+qq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpmu675qkgqejih223a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPMU675QKGQEJIH223A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079293; cv=pass; d=google.com; s=arc-20160816; b=KsHA1xONCaOxBJjANiA5jcPyoG2cHz1SOx4qXNMfw/pKCBBWJrRGlD+rwppktp/u5y TH6vWIHxVTrjD34+0ul1YQ71e5e05/FGEfItWy6vPnb/0C5NHd/Ja4gboyopLmRAJmJ4 yANfTB0Vcu0x+WJaVD8UC3qsYLNxjZcaq3cSOnNAt62VTozjSfrie3efypi3QS6WOG+U SI8GiNt9gARW4L/vkcZEAi3o+RHpvgC7oGAXvtqXrc1euXi76v+Z53sclvung5vB+1cq uilUwgL1o4b9KwgDzUc+4wSbsqMtLHQt69k1rHxfYjsrhZ026LcdL3a/mZ3S9Efo2Cnm 1C+w== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=y8AQa+pAN3KhcP7M1zPh/pQo8T+WPdJRXSLEOUEK3ICo8bodn6/Iz62CBpftCSc/GP NeR3qZbTlv5vYKdvXzCLDg9uj3ppyrQHAUKGMlGrSZSP080sf6q9cvN/wMwuqc55wqNu hHtodYszLT5u40HrVLdiWTZGmsOEoGOnJqsPOgA2mIqDFbK+DQid9FfPLWPaf3w1GGPL tBLOb+ZKsgKN+5hWkk5+y5lUk6YUxsZGvnh7DdiXSmvNE9goPtMvhbBthQdcaGXWnjtm iQEqWxmxQS8I9V+M4y0ZLAsRWVIZ1gahPyy66xHKqthexmR3jdoQo3dCw3f1k+xUFhkn alnQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=cBmGG+qqg6j1PO+xmdTFvQHeQ8v808RcRcr5rwOss004LNPSYaIYJ/jJAXaXNQdtlZ s6TA2OvG9lvQwDbPwVgDI/I9bM5Ngpn0wyHf+Zn7zmh33swnArt2jc59eECzNIJAFYmL RJndoPrfrKPhQzpyJlkdUEZK5QX6Nck45Oxh0jmKk+4tYQDdRQ6Y/IB2U6R00o670Qk4 LIrC7XTE2WXJiJOYiKz62BC/7zQPhj4h77uB+hIBg4FgY++lN5YJ2MtEOhc/6g8ZYbPi MfD9hqxRNSNN4lCARHh0c7tHrL6Xx8KcRwSNAual4rNqJQKmLG9HIg7z1bXomgKhgkk4 Srmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MwBDC5zSHiGZ8F3pUbPBQi0bb/WSzpHsWUhIhfIBUyw=; b=hvUUM4WdLBpnELfMdquo38sMXYJvxyFVgBu2/+DUclGnEuUzmvEYeOAhnlUvn810rs DKhgx82SpfK81cC6XtqQluEUVbrX/+6TyFRUypFsDcJMhtlFviAsunulPgfTVKOqQMRg 7MywqhmYWXeHG6gIJIav8BbUPwMWA6+y14YU7xzi7bP+RsGTjRKv7xLLYHMAZyui5mfh Rn/hCe1MnS2JU/s8NFVSG5+57HJ/m1XFn4RUFVDNuus7wY3Ht//8hQwMkWvt2Kb9KdFG gh3jviJCRri2vTH4lVH9bqP/iP8BLG5oKI4BVdVdiA15o5rUvLqAaWEKvOeRYAFQ9BzB wtvg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532gXJiacpDxM4KWEPH8y/OQTBqJlP/Vnk8RT123z8/axaszM6Wv 9WY1qXE9VBFBKGChunmUF5I= X-Google-Smtp-Source: ABdhPJy5jYeCl8cMjgkYu2s/HVIeNmQmzbYqJw2Y4JvmR/pdaIFMbfRE1EgAMLUujtRsp3168C7reA== X-Received: by 2002:a05:6402:1388:: with SMTP id b8mr3769497edv.1.1602079293737; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d3c:: with SMTP id dh28ls2645639edb.0.gmail; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) X-Received: by 2002:a50:ce06:: with SMTP id y6mr3779274edi.273.1602079292722; Wed, 07 Oct 2020 07:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079292; cv=none; d=google.com; s=arc-20160816; b=ICw88qU2BaRTjrXvwAVJK65hVsCy46HJfpUDT0zWs8hd+iha4tIueVRo9wpP9UDYGF XbuWNjhj4KkFOd68IE+iyJRfaQEcFuym5F3EE3RGPNW0VXLsRPfEktdemfhkJG/ZyCLc SONkuVI2yXM0meTrDD89RPx8RgEyDvTsOpWmSLqJ00aBJBlcn0Whh+PnR+rWR560OIzy GjX+XeHttzM+1d1eUZVjZEz1AxU+VwiYyqR3d+87I3knTPdjrvnQWG7fajaftdnUyUuG cu7cJf0A1/BCrwd++aWJaU5z69DjVCxaTSHQt8OsUfyuXX5SLMI1J6oqakeUt1Fm56oC VlUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=CFPDpFUkZTHfSNPmedrcRjABPWniaOUri6zmQA3qcCY=; b=yP5hKZsr2/56I8Xj/bhBoYsXArAqjaOuH+DC6EwgRI3tnYXM77wX9fq0hTKem+O7yQ 1A1n9xl7rqfPfRH5C8uNou/IW9YyigwKwnOkJweIkrpZ4thL/pLYZ2zeEG7JZM27nCRn cqQG+gvg+lylwSMtxg6eeSsyHxELlO0Gr5krfpJ7hyW4P4jV34MDusFwRLwZjlhNlQ7Q CQClYr5sEY3zWI6pZ8t/8eAaqegHy6oy35YosI80RsYhfK3qs2bW/42r2YRRTymJGOs/ nBjTGGfDOvjQ1NCQNoDh5Pbi6b/iH0IUh222Dj52qI6mbxG+c2vEPwozlrQXFiREGDtV ZJVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id g25si61706eds.3.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1WmJ017881 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk7019880 for ; Wed, 7 Oct 2020 16:01:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 04/13] sdk: Make shipping the isar-apt repo opt-in Date: Wed, 7 Oct 2020 16:01:21 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901898636117128?= X-GMAIL-MSGID: =?utf-8?q?1679901898636117128?= From: Jan Kiszka Users can add what should be included via SDK_INSTALL now, so this should be the exception. Keep it around until we decide if we can drop it completely. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 12 ++++++++++-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index b6e9ab09..cb4fb55d 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -5,11 +5,19 @@ # # This class extends the image.bbclass to supply the creation of a sdk +SDK_INCLUDE_ISAR_APT ?= "0" + do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" +do_populate_sdk[vardeps] += "SDK_INCLUDE_ISAR_APT" do_populate_sdk() { - # Copy isar-apt with deployed Isar packages - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt + if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then + # Copy isar-apt with deployed Isar packages + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt + else + # Remove isar-apt repo entry + sudo rm -f ${SDKCHROOT_DIR}/etc/apt/sources.list.d/isar-apt.list + fi sudo umount -R ${SDKCHROOT_DIR}/dev || true sudo umount ${SDKCHROOT_DIR}/proc || true diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 5fba09c3..06f8a6e0 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -48,9 +48,11 @@ SDK_PREINSTALL += " \ devscripts \ equivs" +SDK_INCLUDE_ISAR_APT ?= "0" + S = "${WORKDIR}/rootfs" -ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt_dir" +ROOTFS_CONFIGURE_COMMAND += "${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" rootfs_configure_isar_apt_dir() { # Copy isar-apt instead of mounting: sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt From patchwork Wed Oct 7 05:01:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 124 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441933ooj; Wed, 7 Oct 2020 07:01:40 -0700 (PDT) X-Received: by 2002:a05:651c:1031:: with SMTP id w17mr1181816ljm.227.1602079298085; Wed, 07 Oct 2020 07:01:38 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079298; cv=pass; d=google.com; s=arc-20160816; b=rEL6T04bPply27CekpNwfDA4v/whxKstMA1XLmiAKXudDO0ZhqoOCFjoyVfl436kzS WGcH8yz1kza58AABbhxlwzUpPXpi7YWrGxUKCHyEnJxJ/w9lwbEoxrueinAM0QOsvD1Y G+orY5+U9gM2oXX44OlX6vuQpTa7vhlEIvZWFta8mIyprnG9bwsA3syYpqcVsFfyj6nG ZyStOWYC3SAVlJdWACU1kyMiGF+OLxW0LPZyYQvGvKHBnxQn9dYU8MrQjooV6E8ZZOX1 SW/9J1IKCIOM6ivevVooH+U8QOP16YKy0gNlyZ7bZF/ILyMUqIlPcL9W6qSlUivfUMX8 +osg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=3STrsf4AMZ3uyO5Qu9HqdZZNZbvIswlLkGUlBAw5p6k=; b=pUhpxKRGVDg+zDKrkpz4ixTYtH6RMS6Ga3lp4zEjhuAvvbr3qyM8d8VZciW49hDhfL uj4ZE7R6cPkx4Fgfqppza4ts4UPXWABtlENkgYvv5AatLFcCn1QcGtjelxEdHJ5oUAT1 HM97bprGizHoWX9wZAMmdx9YdGiQ+L96qCbZhMKEW8rNcvCLSSzXlShI0MggDOn6y4TF hN77DvcCETcrGj4MWnDkVs2ospsMivj1ms3ldlSUZ2B9aRHJTtnZUN7oF/IvTziCmx+F ilg1/EOjny2WM76lH26DQv+RfhtTyhFASkxgoxzb3PLfsQcQ2Tf+akdDw8JaYXgzhgsd TXjw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=erfyKTtb; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQMU675QKGQE4CLSMAY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id h27sor398421lfg.173.2020.10.07.07.01.37 (Google Transport Security); Wed, 07 Oct 2020 07:01:38 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=erfyKTtb; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQMU675QKGQE4CLSMAY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=CQf3dYFWZBuopRpoFLSOIK+YZ1kPegi59T3Ejwu/iW0Mxv1BxT7WY5U/Q4H1u6dCqB +/LKBfeUst9SF+LbjGNaueK12LhIqFzYAit6tUKzoxZkYIbAcpYpZjw24HEX0ZulM6kg RU35sJ65tL+PYMzxEBgeSlRUJN2y3ZyeLeuBjICcuBRaYlJdPM2wYtyWQMdtdTtmM51N X/qdE/vHarWOAHX5ywRtD70kpqSmgzN5q8TpdwA8vOyY29klPF6Nln+6ktHmcwaZDrFS GCvj7VGprodkpBsheCb28Zu9g9ZPcyIyq77huYGWSVAi5aY3I/lq6l/vC4Q03HmuEYoC V4QA== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=3STrsf4AMZ3uyO5Qu9HqdZZNZbvIswlLkGUlBAw5p6k=; b=qyRBq24ggxIASAQ2x/S5ZlRFwf9Mrrrj4chC5/MR3OEZ09ijFZI8lwiicLlPu3ahbv U9KFRefQxGfOEdcAsCPO8+/x36V7zGZGKP+9Wghy4IM1WRFcGVHTQflQdR1rIVYH7h33 2fZpDKrhmmLXM/p5RqMq1nixcCW3Qtk6kBmkYFPmLUQngF3Tb/NGTD6YIutPU91vLy5V of2uPt5kOT7A96ux4usM3bx1LXiHllqfR8GVu6M8PnDsoASgYPMBqcQioHbqzZeG+ESX ykpGslPxpZsLYzZoFQa+gkDivBNDkZJ5kg88ZrV3Go8C4jQWWPANuTBSDuGie1mBPgqD 2qiQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=3STrsf4AMZ3uyO5Qu9HqdZZNZbvIswlLkGUlBAw5p6k=; b=erfyKTtbzDDqyUrowZR6rNXB8WyRgb2JeiDSjJitcDPwKhI9X2n6lo2J4lbhIriths JWyOLzQyHAQUQwndmV3nJZy+Afzyiw5RyWb4eW4tpYH7624vtkQ8ibgcY70S6TJp6iOt K3E0XhMUS2YLgxv1576GVo7KPLVYFnfLSYYbmW2OoOKocfhNVZ7rrdcvW1lWVdaWLi33 5vPniiHaiQ3mFCO+aApnhEgzHOxiKWkvze0UmzYNDO3dEXdpHxDSCCnNJWYl9jBiULBw hs4LuhO69THO2gjtiWli2gIIojRmAbz5mt+M+z5xIr9iLY2FLL9jKZqVdNqutgP2J54y RlKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=3STrsf4AMZ3uyO5Qu9HqdZZNZbvIswlLkGUlBAw5p6k=; b=qunqbQ0X+Ly+1ms3tV/DfQY6TgY8yGB3JMeh2GJcBbEeeOWPiylDlbMCXdfCy1t5K2 jT7YwHCCabEGIEBAaX4hRT/CFaZWUk2eXndlkjSzHAGJ4835wF6cWwRm9mcuukiU7hrg kA8RHdXXPHbqL8lUZ7SK2ETDOGRBDUpktTQxc+6zxLAWA4HeCIjA0l7FuQvYpicwoVN1 WxXv3EIh9koCE0MyVvJZ2ZDZxPtcnBUMkNkS/3OOCE//M+HbOtwngQBoycfnPPxAoQJj 3djCjL2a/NYi4B6fDZvls/CsIsVHyF4Kg4Z22WdOg6DQJCoV1ewHkenBYTd/biVZLC3T u0PA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531VavqzvNXLLSxbYsRI/ALD354gpRfG40V6TOb22juZ3L1JFP/v BBPO/YeKcTF6R8SW2oQnaIk= X-Google-Smtp-Source: ABdhPJwaBkZZRvQz8BbfKvJadc5xCt8IDgh0MEV99beiqyy2ayqJIUtx+SWLXJrZ5U7RZTHMu3G1TA== X-Received: by 2002:ac2:560e:: with SMTP id v14mr1082987lfd.430.1602079297706; Wed, 07 Oct 2020 07:01:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7c08:: with SMTP id x8ls368701ljc.6.gmail; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:a2e:9242:: with SMTP id v2mr1335645ljg.25.1602079293351; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079293; cv=none; d=google.com; s=arc-20160816; b=DhtUxtpxXmiTT5dGS2KzlscPVVuLUlcCKFUhZBuGkvS/+RYdczXv2Jlufq6rx8r5qb euqmJSO0SPVejo5sbPropm5TjiWxIx3CfG+d39VuMoghMYUc00UJxBiDvYXIF8L7aXW3 cMAME+SH9nrYFPvsGA7NcQgdD398iehnhWADtZXwTpW4AbhuENy2V0cBl500JL8O5NJl Wm7ZW4KdNlJtfLyCYHRzQk/6v4/bTytgMAow2SUoPLrlNWA9D35AmjiRyFDpy49kSUim FzDGiYlE8R7JREJpZ5/7jaTIg04UgEMyT9w+IML2Ke9/vIj0kwxg20lTz58E8MIH0P/A wRQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=KsNa4RGX01RDKZXqJATBvziWWVXya+REzt5KUhrtV3A=; b=nwQOPYWouerGm8H4d1bLnEkQC2ndLS8veY/1PbdCxK66j19N1TzOqMi3pBfLvyfWGk Jwh04Vnshk6/lcgwDpc5shMAzkcdINuq6ZyQYEangII3cZOMNe9MYQ6XOZPw0sL3rWDS Dm2Nx4hIScRdo7eR6Gc0lNLRfoXfugGSbza+cyFESJ8TN3dN+KimcwHFTfWneLkI2EwU L15feIVi/j34/9g1jhBFTq+SjyJpQOjYc98Np9jobYrE7rMPUEinmC617qjG42C7xS0C 2WgwpTklz8CdM015vfC90y7drU8iUW2dkReXrvUnyLLEFQHjjlK1cfE/beDucpl0LLWZ i8MA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id e15si54327lfq.1.2020.10.07.07.01.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 097E1WXR001395 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk8019880 for ; Wed, 7 Oct 2020 16:01:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 05/13] sdk: Inject sysroot path when calling relocated toolchain Date: Wed, 7 Oct 2020 16:01:22 +0200 Message-Id: <11bafacf5b5e406fa6ca026151cf56fe3931f516.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901902180511755?= X-GMAIL-MSGID: =?utf-8?q?1679901902180511755?= From: Jan Kiszka This removes the need to specify --sysroot=/path/to/sdkroot when calling gcc or ld from the SDK. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 8 ++++++++ .../sdkchroot/files/gcc-sysroot-wrapper.sh | 16 ++++++++++++++++ .../sdkchroot/files/relocate-sdk.sh | 3 +++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 2 ++ 4 files changed, 29 insertions(+) create mode 100755 meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index cb4fb55d..a8c708a8 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -40,6 +40,14 @@ do_populate_sdk() { fi done + # Set up sysroot wrapper + for tool_pattern in "gcc-[0-9]*" "g++-[0-9]*" "cpp-[0-9]*" "ld.bfd" "ld.gold"; do + for tool in $(find ${SDKCHROOT_DIR}/usr/bin -type f -name "*-linux-gnu*-${tool_pattern}"); do + sudo mv "${tool}" "${tool}.bin" + sudo ln -sf gcc-sysroot-wrapper.sh ${tool} + done + done + # Copy mount_chroot.sh for convenience sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} diff --git a/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh b/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh new file mode 100755 index 00000000..feead1a1 --- /dev/null +++ b/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +GCC_SYSROOT= + +NEXT_TARGET=$0 +until [ "${NEXT_TARGET##*/}" = "gcc-sysroot-wrapper.sh" ]; do + TARGET=${NEXT_TARGET} + NEXT_TARGET=$(dirname ${TARGET})/$(readlink ${TARGET}) +done + +${TARGET}.bin --sysroot=${GCC_SYSROOT} "$@" diff --git a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh index 1c9b02fa..0d1c6330 100755 --- a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh +++ b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh @@ -38,4 +38,7 @@ for binary in $(find ${sdkroot}/usr/bin ${sdkroot}/usr/sbin ${sdkroot}/usr/lib/g fi done +sed -i 's|^GCC_SYSROOT=.*|GCC_SYSROOT="'"${new_sdkroot}"'"|' \ + ${sdkroot}/usr/bin/gcc-sysroot-wrapper.sh + echo "done" diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 06f8a6e0..c96cc772 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 SRC_URI = " \ file://configscript.sh \ file://relocate-sdk.sh \ + file://gcc-sysroot-wrapper.sh \ file://README.sdk" PV = "0.1" @@ -63,6 +64,7 @@ sdkchroot_install_files() { # Configure root filesystem sudo install -m 644 ${WORKDIR}/README.sdk ${S} sudo install -m 755 ${WORKDIR}/relocate-sdk.sh ${S} + sudo install -m 755 ${WORKDIR}/gcc-sysroot-wrapper.sh ${S}/usr/bin sudo install -m 755 ${WORKDIR}/configscript.sh ${S} sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} } From patchwork Wed Oct 7 05:01:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 128 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp442138ooj; Wed, 7 Oct 2020 07:01:53 -0700 (PDT) X-Received: by 2002:a2e:9910:: with SMTP id v16mr1161384lji.59.1602079297087; Wed, 07 Oct 2020 07:01:37 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=yK1J04I1dRzqfymbdhmrQIi6k4bsWBtrPb8RsMCzI/2FPAxayQLYQBLR+4e4UqGuMw lo3emhsE7Sq20Fmio4XDuq8Vtc45jk4FC9OKadWpswAh39gol83JFoI97aS65z9oGZK0 bX0ZugeXolz0OykZZTpB+6aUFa5Kt9nqxLj1mMbnuJ/nMK87eGb+z4VhAPpR/+PRjVk3 HJDVJBn0Rf+Q26CjryWXUscavESOf4jFLVfn35eZS7B7DuZvT3IMFiFiwriLj7Pin3LG D/NuOvMDmWG5OUUP7YsaCCxhwtEvK1jNm8m39xRTs+rDsBVLPrHgYW8ROjaN7b+85JMY qQZg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=Qlvwlm8b/IWstyBZ75NKs3OOjfgnJClRDmrE/kvlr7o=; b=NYpfYth6pVb2isLI5UQ6+o4v+m5la1vh6lta+IPa8OAsAly7y7oKf2crZOWvc8n48J C305LG5/UuVVBm43Yj5TejZjh0kQJhdg/uam68/VmK3fMvxHap7+r4M+3l/v1q1hgGKE NXP0ThxFXxHKUft/LZs8BzGYvC9YKrfQxggS50db3BSMW7sANl5vQP20DI6ZvIhAWNMr qveBf4xkQ1hM+GAzKojvVq/nu5zYjQS3dZv6UFZULj4NuJeiflMO1chX9t9XAhcz6/2s MJ26f9g65SVkAUgKYrIdEinIHWWNe+dePsEqgLQUNRGuCYtTRMvhgGtbn+LAdXt7tTRd ogsg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=D5+eVJ28; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w26sor289516lfc.101.2020.10.07.07.01.36 (Google Transport Security); Wed, 07 Oct 2020 07:01:37 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=D5+eVJ28; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=FdU+pK/2l96wWuXz+xubX/U2DJEBnTulrbZ7hBAbSG3oZMsnUjDq3Q1YGXUH3U0kmj d0tNJZmhy0rz0TzLI343WGOf1Gokldy/5EFAIdcAmM4yEHEDs+Bs4C4HfMi+Z8wEFi0j gkeJkU2cB+K6GWRhSS6IrE/ewWBoh7TZTUhlh/QLI8bbN99ogmHkbKkHR8tQIEVRB/Df uTposho+W9Mp2inMX0nDlz7dGn1R8oI7bsqm7jkdlVXd5XIxpgZaIGsNyp58huyFujjv MsC6jM6SsvSB1+nDw8vl8xlj2LGwSvwfrEHbdV/A+OOgSqxaeu0EOHY4/J+2kakOKkcs /jSw== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=Qlvwlm8b/IWstyBZ75NKs3OOjfgnJClRDmrE/kvlr7o=; b=iUFuntxYpSsWw6l0WwHr5zSEOVTuUPAawhZ6BcwIo3eUoRqYFJLqcqfDVYOdKTxYj+ 0pbBBSzZwZydXDqbJ7EvZ+FuWdZzt6qIj7fx8GOZ74LRoN0a8szZ4LU+mRChW49KQQsd D8gu+lZUA/cShpzxjl7+hN9hrsUBwwvRyf4S1b/W5ysABdKGPGlOuYFxaWpWypZ8PVD5 on+NdsmcnB+ua2Y3RIQdGmxlR4MSxsyPQ6FDg5ViYchA4WQG80N6Oztv7WLq9xlyZ0bc nphS5FGCBmpIUD3j/mJWhAhIupx++5ohNlLA9MLESn7McZG80Mo7OuzqyY1BuwQFS/R2 0RNA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Qlvwlm8b/IWstyBZ75NKs3OOjfgnJClRDmrE/kvlr7o=; b=D5+eVJ28RlcEDj0ZO2hJMGvfuI6k0WvDac5uKsofvFOyfS8PR7yXRLG3O+VjEaS8b0 1VNNCm6/bBS9ni/U+nU0CFQho6pOdUj0qcKwE/EwO4KZlj6JBPRUgDSCy751C8cwkV6A pWnpkE0g9MB+B0+iSPB7tX1jtHBoai5sOigyC/PT/Spf+11w7Z7qCHXmGoNLdLlhhKPh +EBpn6RhUSAMGNSeE6iGjsrTbG1saRTQf3NwZWsge6T8D4n+358oD3ujoyGp8B+/Um19 4KLbRH193Y/+3szMTP5jiWUzp88aSyl5bf7aCh8qjX6YjVFvNVCNXP26aIFbKtYN3dG3 BX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Qlvwlm8b/IWstyBZ75NKs3OOjfgnJClRDmrE/kvlr7o=; b=rjhn+nyEnlfpROhde3UxD7AkH84e2pcSPnucVvjdD3GQ6us9BGEZqdTREnYLvNsAQO 3mj72cor+FdnWhrgUDPAlg9Yo4YC8WyuiQngOfxAgA/97hKfXdp/StBhqR8Wqz9rOVQs vye1z0HkDheI3Xgys0eDXW/919iB5fdGlochaXUhFYXfEz+J+V7TUqSc1Jj1fych5CFQ AZVYGNJuhtj/SisN8FwEjC8OakSBqYsqblquFiQOA56v59tKwiX4kQnLRvyjdIjZxsIf NY8uqAISbj8bg5jhDMMrEgH4ffLC5032th7yUrYuMYjDIHH4NAJWXxn5NY7MNKgQF97P 0YZQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533txHrk+eVrWsOIxXzWG0XXVyuogxMOaQL83Pa/VxF7V1M3de4i nqFhc+/bOkgC9iPKqKg7Y30= X-Google-Smtp-Source: ABdhPJw9+aZ47inoshtDe10NCsonx/aNa2fowygfbeNnnzCHSR5krS6VG//rmxMzVRha3ruhMD7P/A== X-Received: by 2002:a19:7e92:: with SMTP id z140mr1079202lfc.299.1602079296623; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7c08:: with SMTP id x8ls368632ljc.6.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a2e:b174:: with SMTP id a20mr1203740ljm.407.1602079293885; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079293; cv=none; d=google.com; s=arc-20160816; b=0bzMRWK5SvDqlFQYM9Hv8w406wu8S9QCs5cnkG4BDFkanqMJamNBjK8xoLjCb2Pwl2 f/+xgG2wYwLQFxXGca8X2tHQ9zhKi73CZ79P6LHgsknpnZMpouMY0sBFdk+rgjHDrAuv VpHdrTv6Dm4GIiqSad9CY4eRXf1q1lSEFNsSWq1fCGaZT2uQCxyP7aHOQVqa+gUSxTpJ DL4i7iwnjnrvURBZwFGeuXrNf4cAaeh8D7TUfSYnoENq+5aHnLK7C6JNSeqUfdAvkgU9 5oPIYDUmKy7dr/vtmW5ZVXM6zoQv+51F+DG2kVTlL6EKPEHWw7JPa56XIRejUnTzm4Ge r4TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=S/a3MOndWgVxqIvSMX11sqMVlwXDesJB3XTNEsnz3Ng=; b=lnvbHBFskyuue+vNvp+CeK0z+FfNIbIalp8CwSBYfijatnDNaq5UBsmFsrpHuAFFUd 4Bk6E42iup4i3YcdeSgkFzN+lVILK+qfl+Rs/r7f+ppDSYNOw3GHLja9c2CRmSzxxIHV ZGLBcnlAWRKUx2UiAKsVOupD7NDjaCDs3i2cAxTKWWB22kamSa3Otn5YKrWlvDYRnbXB QMff9gV+e21kn1Qm0G6LyOqGWA2QBa6HKGFtzsrzU/X/FKCvcxmaJCzLJsAvmTsi0dAj XRcRY/PLISAT7J01CaKo9Pl0xJk+GVnwQm1fxbw/9J1aVIYgLqKphzK2KbpBJcZ28tIl CIhA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f23si68522ljg.8.2020.10.07.07.01.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1WMG017929 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:33 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk9019880 for ; Wed, 7 Oct 2020 16:01:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 06/13] sdk: Update README.sdk Date: Wed, 7 Oct 2020 16:01:23 +0200 Message-Id: <6b3b4b469b32c896f029397f6e0d5b7d62fce65e.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901901295426359?= X-GMAIL-MSGID: =?utf-8?q?1679901901295426359?= From: Jan Kiszka Document the out-of-chroot invocation and make it the preferred option. Also remove irrelevant information. Signed-off-by: Jan Kiszka --- .../sdkchroot/files/README.sdk | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/meta/recipes-devtools/sdkchroot/files/README.sdk b/meta/recipes-devtools/sdkchroot/files/README.sdk index 9c1af6d3..3e06d8c5 100644 --- a/meta/recipes-devtools/sdkchroot/files/README.sdk +++ b/meta/recipes-devtools/sdkchroot/files/README.sdk @@ -1,42 +1,43 @@ -Building applications for targets in ISAR takes a lot of time as they are built under QEMU. -SDK helps to develop applications for target platform in crossbuild environment. +ISAR Target SDK +=============== -SDK contains cross-toolchain for target architecture and a copy of isar-apt repo with -locally prebuilt target debian packages. +This SDK helps to develop applications for an ISAR target platform in a +crossbuild environment. It contains a cross-toolchain and development packages +corresponding to the original target. - - First one have to mount the system directories for proper operation in chroot environement. -Just call supplied with sdk tarball in udo rootfs as an argument to the script `mount_chroot.sh`: +The SDK can be used in two ways, described in the following. -$ sudo mount_chroot.sh - - chroot to isar SDK rootfs: +Option 1 (recommended): Use cross-compiler in host environment +-------------------------------------------------------------- + +After unpacking the SDK at the desired location, it has to be relocated once: + +$ /relocate-sdk.sh + +Now you can add /usr/bin to the local path or adjust your project +to call the cross-compiler from the SDK. + + +Option 2 (fallback): Build inside chroot +---------------------------------------- + +First you have to mount the system directories for proper operation into the +chroot environment. Call the helper script supplied with SDK tarball: + +$ sudo /mount_chroot.sh + +Bind-mount the project into the rootfs: + +$ sudo mount -o bind /path/to/project /mnt + +If you have relocated the SDK previously for using option 1, you need to call +this next: + +$ /relocate-sdk.sh --restore-chroot + +Then chroot into the SDK rootfs: $ sudo chroot - - Check that cross toolchains are installed - -:~# dpkg -l | grep crossbuild-essential-armhf -ii crossbuild-essential-armhf 12.3 all Informational list of cross-build-essential packages - - - Install needed prebuilt target packages. - -:~# apt-get update -:~# apt-get install libhello-dev:armhf - - - Check the contents of the installed target package - -:~# dpkg -L libhello-dev -/. -/usr -/usr/include -/usr/include/hello.h -/usr/lib -/usr/lib/arm-linux-gnueabihf -/usr/lib/arm-linux-gnueabihf/libhello.a -/usr/lib/arm-linux-gnueabihf/libhello.la -/usr/share -/usr/share/doc -/usr/share/doc/libhello-dev -/usr/share/doc/libhello-dev/changelog.gz -/usr/share/doc/libhello-dev/copyright -~# +Now you can build the project under /mnt. From patchwork Wed Oct 7 05:01:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 126 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441894ooj; Wed, 7 Oct 2020 07:01:38 -0700 (PDT) X-Received: by 2002:a2e:9b02:: with SMTP id u2mr1386600lji.303.1602079297391; Wed, 07 Oct 2020 07:01:37 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=N7lLztSSNWN40c7wqp7VpTeqDJb8sbqzSo9lUnU4+yLo8Dzrh+QB42eZc9/SHVTRXg gemvQ+uuvWXA/I7t0BpgOKXzCX/BrLjGw2EuDOHSIulKBqMyF8vEkggvUi26hvBJI1Sz zI0+YlW7kT1DssQc8WMaXAZP+KnQzz5y42pMTG4a6bn/vs2dpr0ucbmx6pvbvyg8uyOn MrgzKHdfqDin7aPxl3W4soFgUSX/zR9u3srNrcA4fRWkjuoTTlrGzf2hRsZbo63lV6oI KOPP/iAD/JnX7Q26h+ejgJAYiRMXYUJweVEddxeMxqbGx+hG9rHRlrCjCijAgJLHwboQ 2kEQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=lTXIiFmN7u0g4eEdmD9cRNR7nWsZw05ZJ2iHQuvtDbA=; b=oW07XbFXzFnaXYB5lLg24eE7kmsdJj1PjPMvVzORXwBR59I//HlrzJGbYijd/C9w1C iHBQVeVJX8L/x5OVfScm1SjibfuFZ3hacWrkLRvbjLu+XdiFmBxBizImwosZczpFKYTD 5WRr8j624aNhWo2OpzqRCNecSmdK895iB2+ESQ4Klgh+Pd6HPQYMjoGBm9g+hFHSjn1j jGk/P6ZaOEUlhfEno0yNwxCTCKc10Wi/W/nU+TtJte/AW8Pc1lCIpfkMxHIY+AwHDtvD hGb0JEm5B1DUnhdTyFHNyPl4IBoTJ4nTh7HubG6Zo0dKfMTlcK+0yoP48TpeMDEi9GDO /RLA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Q1gDUEwB; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id c17sor456188lfs.1.2020.10.07.07.01.37 (Google Transport Security); Wed, 07 Oct 2020 07:01:37 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Q1gDUEwB; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=s+befiD0T1mLznfHFcE/WB3EGa2ZB6Sx3QXqSFdiFSrJgNXzSlB82mGXjqr2JmiO5A v8FnS/fZ8MCZrFp54zHAzCgSpRIbxTTxGAQyZ2ULrQgjnqZp5yZoMUcftewg2tosuPMQ A+95enydv1rNPBOgeRhx3AtjToCqgLI6PuT7xUPBt//M5eMVFjZyF2Y2HkyGB3Xmn2Ej cu43jWarPTRh1JvXGpTEgGS664WiNyTiXCP0Kvzx+j3ZF+quilH73zJl5pZX36djSQrw 9I/XkIQjV6vJvUrC3/KMB0DoTL6QgaQZkt3+2h8mJEXy8MLos7/oc2828VkzOz4SYQOZ sscQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=lTXIiFmN7u0g4eEdmD9cRNR7nWsZw05ZJ2iHQuvtDbA=; b=iTElU+NLuPzA1hdZ/dlO9D6sguIrW/3GderI6w73Qq39whg897cixM5PkdheOOrAX/ EoYy8ApDqpPIIDWFj6lsDcB7gUveQ5OTI3HkeazBsNkwgNcTwKIpL9c09DhrWAxA+1Ky 6eZl8ZkU9jMk7VHqZmZVlz8VHPujUyF3evPlWccMEujV5nJ+WHXdWR8AbmPDa6sG0qTs GMPUdpC8PsTzKhn0pHBvxjtuMHzs8p/RTATrCMNJgtsWVjCZNQ1rtY7hiIUvbrmyUyVv IxBHMuyAlyNeYTh8GLQnXvh+Awrvyqan6Hm0QLJJoMnXNOm7ehKE7/X5GVF1CxpreUBq ippg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=lTXIiFmN7u0g4eEdmD9cRNR7nWsZw05ZJ2iHQuvtDbA=; b=Q1gDUEwBDpdhrU0sopdAzT2QZUeVmuKq1bZClKTKDh4/JvQshZyrnyhmutnL6aqHUm n3hvrKxRENUIyEmRXfy7fencHsBAtSTwEIq8N9KJfWDD0DkujSK5QBFdDXdem+KR+Quq Ryl4VK42gB6Yq6OPDrfDsf+UXPKds9jCNNDlrx1AUcFKaZ8GkB1uXjljWntf8gA36TDr uKEHDUP1F+xrmFxRJeGu5hjTikFcAwI2Ej3WlPIqh42pt1rhOcf+6cnofgI5zSSGHj4P vfRxHk4In2CLil2YxFhUyoi1SR2hYjetgHQFG704fQJfiVOT5K8aXuYVlHTx2jqe2+RU gdew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=lTXIiFmN7u0g4eEdmD9cRNR7nWsZw05ZJ2iHQuvtDbA=; b=Y9T/N1Qk7LHQs13V33FLWFeJNIbbOXoIK7rOUKxRyDS7hZYtnbjaQFWh6/3agf+M4D 6e1CWzUIq66zz1/Z8B3vVmfEmfftBp1OEVssHq8thvSlF+gw8Ry8tCyYCMgEXUBWPYAD 2Lb8mHk8+bFTULNcQQy/4WzYImSPNF+1UzujafSOD4qGJCH0xS/5eB3XY7eOBNP1vvDB myH0klnpproz8becXPWNnCisgArg7FT8ICqpzsETT5rm2nTrBywL2ef23b+/6+jEgzRn AYlQb9zxUCqdUCsW+kd7OrFAXhBaH5QM+AHOsHqTh4ocd/l5ByxWUO3VXKCOIThcaNO7 5h2A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5314C1arPcH4bd6IiRpCcfLXzGI6u7uy8Cm3g/Yo1NoKGGHfMB97 d395P6563RyrhOJej1PpQwc= X-Google-Smtp-Source: ABdhPJx6MPNSzUnCX9GHLzKUehW0wktp8rmvTYl0bO4f6RGZGqYgremDTO90g3JR/Wz81/2Zs6Cmdw== X-Received: by 2002:a19:494b:: with SMTP id l11mr1104790lfj.462.1602079296942; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:554:: with SMTP id 81ls1334921lff.1.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:ac2:485c:: with SMTP id 28mr1123057lfy.584.1602079293836; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079293; cv=none; d=google.com; s=arc-20160816; b=WxOp2rzEOHr7lWo7K09VcchbCgC9TFi+z2RIzN5B0Ih+TZbZMPSxuxzKHT/8mDjLE9 mOWW2UbthUFJaVuS/pnul/v3YT9QT5dEQmi9qosd55xe4DS3UECbBi1YkCtK9yzHv9Bh E9v08Jab8AmtCPw5w2Re65/1NEgT/KJeZMr+KQdfnwwGhRuQJdEXr9zHoukK5mZC6Y6S bAKJ5c4l4RQuA6/Ah2E03GdUcWrC3TlcLWc3bzPikRK/2MdwdOk7Mz9CEa4Ma57qgat9 82vgITESc9oxNuDUOpAQUL4D4KzS+6y+1YsPfVsknjIOmLPXzUrDIFYhIs4WVt/F28Ds +exA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=jEtQqetIuPfJscR4fCzCoM9QLJPWeCMZTIojcQ6dOdk=; b=n2cdYJP6c/gXTe3UZUPbsUHIo8AAtnEWxFtnt7A6HLLEQLKHAvOxZiERHTdOZSB+Nj h2MaYk4/NC+wlXK6TG7W12p5NcQD7h79PHQTu+qV+vaTOu0GoXf5V0yZRPUj6etQPaYf jlqXVVH9ZGGc4j2wLVi0sBVj3znVhY8nhtcInRTjLfcdWvNoAJBkieaCxKeHEuRJo3fn 0nXwQCFcKsjtLtCWhh8bmXbCVnujZKY2r/632ztqdtlze8YfBgt9p1XatQEAT88COQPs uhYHGr3327LaMJNfP78c72TPktypJwDto2BjdRtaT4nramggdKE3BaWKZbXNbtHyqmlF Sm4g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id n5si66389lji.5.2020.10.07.07.01.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1XYY017947 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:33 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkA019880 for ; Wed, 7 Oct 2020 16:01:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 07/13] isar-bootstrap: Connect to gpg-agent before adding keys Date: Wed, 7 Oct 2020 16:01:24 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901901001723976?= X-GMAIL-MSGID: =?utf-8?q?1679901901001723976?= From: Jan Kiszka We have recurring issues in CI with the gpg-agent not being ready when trying to use apt-key: gpg: can't connect to the agent: IPC connect call failed Work around this by connecting upfront to the agent, retrying that in a bounded loop. Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index fbfe669d..1c5dba74 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -303,10 +303,13 @@ isar_bootstrap() { "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" find ${APT_KEYS_DIR}/ -type f | while read keyfile do - kfn="$(basename $keyfile)" + export kfn="$(basename $keyfile)" cp $keyfile "${ROOTFSDIR}/tmp/$kfn" - chroot "${ROOTFSDIR}" /usr/bin/apt-key \ - --keyring ${THIRD_PARTY_APT_KEYRING} add "/tmp/$kfn" + chroot "${ROOTFSDIR}" sh -c ' + for i in $(seq 10); do + /usr/bin/apt-key --keyring ${THIRD_PARTY_APT_KEYRING} add "/tmp/$kfn" && break + sleep 1 + done' rm "${ROOTFSDIR}/tmp/$kfn" done From patchwork Wed Oct 7 05:01:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 119 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441874ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:a19:8841:: with SMTP id k62mr993154lfd.275.1602079296279; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=bXrBpm8w+t1eP22NY0eaRqYZw3LXh3h8JzR709PLGfaV2eKqzIKo4BegF1CSTikYwd n8Tz0kqjILTjfMg1jTRBbJOT8kh88a+nnDc8Wg8Zc1z8TLVWL++SEanFoYqns8rALCzC fB4cEMuyhvFOybR5E3LNSZ1qTr0XUhHGdAndnPT/8OZFDhhd/waDvxMI3qPjklFtvqv9 rrwiBRiDtWHJZadN1IIHQ+nvwMIuZbeeVZzeJi6Hg8C/WGI22f77cS2pON7I1DEfzAin J8eYVv13FR6/MOZMK35QWWlod6YQgQA/ji57KC6F3DYS/d44wHGZCCGFeq9A7cVGZJ1r vBCg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=9YqFXdgT1tbUDii4SivjyG4GN8bswNaOrM5NePR2Ros=; b=cEKZHJ7Of9mPfSFQ19s+9TkijXCjCx/JoH166NdFfCS/BGmor0BOSRrLC5OWvPA/td 3HyagyQS2VoHLEON75EinyQTR/M3B5kcRBPPaCknsCpe2BuX8c8mW14N0+CMkKa6KZSg ImXrSsR1pM1zHgQSoRTvsYpP5Bo5pyndtypdgg/R39ZvYa6c3oLrjZpzka6+X1Zk7pZr llWJh3XGeXQoR6iLF1C0mhmI2snLogN8oXSs8vGf2M6VMc1hUoTipS2gV3nI+aB5mjoP 5Ul7SS7VPrTNjZ9RitPxYFnTIIv1TqUVFKTNI6HbuIAzbkiZiImQPbD0HG12yYfATyXM g1bA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cuExUlcj; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id l11sor973130lje.71.2020.10.07.07.01.36 (Google Transport Security); Wed, 07 Oct 2020 07:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cuExUlcj; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=zg1gWDNi/oB4HwNCfzNXglq93Hgzle0FB24DbNjYGqqBgNZaozycnplsCDNHBSqrmv kmpG7urtZbyY4+3B/AW5rR/czhdrT9tAn2TcQOHGlb5TeaoV6/vzAVlMRJ+IRB3MqdCf r6WRD1F1eB8pNMrTM80cgE9+oz3WI/IrIg3bVKUII8O2dtLYDmJTkWeU3xK2DK0jpwdM MFurBXNzCbKZXr4edEXTjrgpDSYOdz1FE5KLVMRn15g9ReONpnU/FseHu4duY0AQIgzh uHhU6QTBhA2sA2beykxa3qApE1zf+tOZPJlw2jgk7iAp8Gfk9g6qYh5H/CmMAYO2m2Vq 6W5g== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=9YqFXdgT1tbUDii4SivjyG4GN8bswNaOrM5NePR2Ros=; b=rx2YWj7Sau/B7nzsqAs7EeGf/ycQB2g5IQKsZJnOo5dAMEINKeXFrqoXfkojA0q1KT Hq6dtmhoJYypzRfVwYoDjc+dPRvCfo21bGXqtIWWR5x6QZnsxH16t1nPYXTVpgEKU8BF O63Loe7GWHyGjafNpheMkZQEe/x1JrbMe6Rczbuug4BbzZmOuMcEhUDmkVyYCMjGkhkG PECNl1DBI0aGQQF7aORz7tmqXjMqKlERqXAgrrCLcL65hPnkeqQMsGPTnKwsyLPCkTES IARXbrDjrdrcYUfLcaxxNs6vuW2vOSozUruZaAUOjIzFqxzMN0DwOhHX3LEEBxmyHj/4 j7mw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9YqFXdgT1tbUDii4SivjyG4GN8bswNaOrM5NePR2Ros=; b=cuExUlcjpxw4n7MgyF5PULgHJVSPoidU4pCE5HrZ8xmEzoRT3/aAxAieRBIzz52lr7 HLanvxK/h7YE9ryRBeSyGCk7ncr2ru3BU/kyY3p7mTODM1wFtD3/TCRYlABfTyI0w7kL jAZcF4WQgAgVA6GuIFiotCJ6JP6AEDmfBNH6h/fe9+SvjCsX6xXOGQ8GM0bkaSu1wiur odsbYVz1Aa0ah00XoHw794bYbc9Kz+y2sg95Ikg37mi51YiU+rkjivWNACkbRAiAdyAX fSY29UmSM3rdEStJ726ejDouCJEKoamebObeAhLMvRW9VRiZLUfxsqbsSH5diMhh6gVn 00BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9YqFXdgT1tbUDii4SivjyG4GN8bswNaOrM5NePR2Ros=; b=Pmbd5rYV+fTSjbYXq0wIS1qXubXqIme541U6CeRAYbstLxK1HFIVof7MsYWtRAaAy9 mm62jX7249pyK3FLYJ6tt11dpCuAk/dwD5JvVJhIS8To3y2eLqULH+2Vlw2PQE+UoUOz dqc+vpc+55dym6WWmnk76/9ctMmZiFMi9VWIaxNrBfIh7peoev/5xYaKj8RAB4iN2fHv neqUfWXaFHmB8JAtZlwybQZ0RoVo0t3USM+oNJ4GdiC/5vZNxXECWQ1CfU/IsXJX+yrm J/24Tw0RCva1ab9TR0b/Ew5Mro8WCa+cBW64G4Wwlzvk2Chxkvp3kgqFbtLRcovi6rD5 pEiQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533x4SNaYTuFpR1RJ21XlGGroVQV1WM7evgJeF0G0fijeA3/bjeA rcGIxi4rvVWi7uAs3ALM4UE= X-Google-Smtp-Source: ABdhPJy0SxUoree0lJJN3hNqtSPDEOMfJf3hM2TaHFYtp6vCpuTLWmtnWBZpVdqGRSA6QEdwxOAmaQ== X-Received: by 2002:a05:651c:110:: with SMTP id a16mr1342724ljb.110.1602079295846; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:84c1:: with SMTP id g184ls1324485lfd.3.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a19:4186:: with SMTP id o128mr952872lfa.148.1602079294192; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=tCM1ltKXfthsE9L3/OrwuYd3VQ0ClcI7sR8LkSCAE8kID+g5JNrK4DdT4D1X/PuNlh INeOeStiwda2fhryJO8Wuh/l/b5haKQaz8wimAoVoJe2C9gVCDnFXtqUO03N0Fy3cES5 /8K3B4RSISjedwMLKKGciB1vl5bzc0XE5vdISmnNb0V+CtJWwFRqacFTGQaEdaJZ88s/ 4Eklgz5OY/jGFng7T7zVTar082Yrr/SU/E0MxCQ0KvcITb3+TjkhcovPPcW88eh/WjgC J0fdH6d2nNUcUDfpwYXn4/B+p1dALMJNjOyJw5h61aFcpzoNaemVXDFKsttuybTPuPns xaAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=r2AgCFp2Dc8tbh9YNX91fKhj/2CR0osf2LA+ubJ4kfU=; b=A+irtd4EQfh4OvBXJLAjdrktbxfqS9H7bcLgEj/nEfcUFDmoLSrVKQ/PBT0Y+owMSS HDjebLJP+ogE4Ct2TFUH9WXH4wYoUAYIR6HxRGfmiuZC4EXjGv6MzNGIiLVcKicpiOJy cUObrQcxsS9aXEMmRMSRyn9g2dM6BIOZ1Z61W8YwkqRA9gd4sp/dw1rLLnVNqRRvc6cs S9IuCRtfUnbQbo0L9lGudCUnbmwtzfZ2pvf1LPAlYd9qj9bskABk2BY3bS/I8UzbEHXv vqpE+tlNpwxKTYqOiA+XL18PYXBnr9vLSCcLVp7bO8U2XwIdG99euF97+vnSj2Wf0yuc MUng== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id t20si58941lfk.10.2020.10.07.07.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 097E1X8e001434 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:33 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkB019880 for ; Wed, 7 Oct 2020 16:01:33 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 08/13] buildchroot-host: Drop unneeded :native for riscv64 setup Date: Wed, 7 Oct 2020 16:01:25 +0200 Message-Id: <3a64e7d5e9bb2fe9a3f250d2ae375111691ce4fa.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901899928343321?= X-GMAIL-MSGID: =?utf-8?q?1679901899928343321?= From: Jan Kiszka This is not a control file, this is a list passed to apt, thus "native" is implicit. Signed-off-by: Jan Kiszka --- meta/recipes-devtools/buildchroot/buildchroot-host.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb index 8e3a52cf..d8498a56 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb @@ -19,6 +19,6 @@ BUILDCHROOT_PREINSTALL ?= " \ BUILDCHROOT_PREINSTALL_riscv64 ?= " \ ${BUILDCHROOT_PREINSTALL_COMMON} \ libc6:${DISTRO_ARCH} \ - gcc-riscv64-linux-gnu:native \ - g++-riscv64-linux-gnu:native \ - dpkg-cross:native" + gcc-riscv64-linux-gnu \ + g++-riscv64-linux-gnu \ + dpkg-cross" From patchwork Wed Oct 7 05:01:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 116 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441863ooj; Wed, 7 Oct 2020 07:01:35 -0700 (PDT) X-Received: by 2002:adf:82f7:: with SMTP id 110mr3630553wrc.261.1602079295800; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=PtvMj/yX6QQXQcv/qu8JbR4LuU29YMiQT2hlHhOO23uT3/Xl88RUH17I0qbbnBtguU vlYbPqvpJsingdOsSPnFRufpJpAZIlREPLh0OauKsxyyMJpD6jI92ytHGTPV52eCDdKA 0rO5BspQsawJ42skZo7PzgqUqp4TjOgch5hUVH3sWVuCP58VhN352JMO4ARN059m3ZOL Q0upV412jG6GjvqyasOePtvjVGYKVLI9X9nmHiemmdfayqoVIEcGrs+RzIm1u+rzIT/E ow/sj03kBYcX1Fg0pYtsK7OLTp4QtQbOaGef5tVeWLPJtE9IdapmH7qiqGvhW4mt0IDk KZkg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=cbAiZT4nSyUmMwkKNuL1GiZ8eVaOf4fgvwZc5HHmOQ4=; b=TXbeW3ZNldR9eQfClXtZ9bRurfJcMBzdxPiB2nKzg1PmRwguV7QVlaKmqaO1dkBOMi j+ZTo4vtzz6w6ZYbxXi0W6bnhnvyyGtRwJ02zJ3t1BdA0svS32VhS3uEtaWjyHR4ch8t QFg9I+W2pwieFvzZB3BzqBmN6Yg0hE/AbI9de9pso0NWGc31ACv24Mx6f2Cyy7t8B+Nu GIX+/XOvDeRq3yraLAb6aC2WY5HToX9y4o5EEL1I33DmEVqbeZ1SSh6d2Ip26kW+proq LhKXVz9g30NoV5C3h9hKqB9JHLpV8i55hiRZti9jdOWI9Q2IyzuOHJjWMbBFD+ZufSi6 wQ0A== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="cRVg8/xS"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id h74sor1359993wme.24.2020.10.07.07.01.35 (Google Transport Security); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="cRVg8/xS"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=OMQVr9O6BRRrd3AxABq9K3cZPRtKUrU9VOZlwqZ1khrhzSoLdAlXeiWB1kqjAuJ2be K340ddmJlAgbaHEqnFkrjT+A1O4D/CgwRobol0RXanhvHvDHCEuzQJAA7aksAahjaKHX alt4hlE1zL/mvmchDn5YSIM/bV6uDr/pFrnJiBtzSa89DkkFJDrJfnCbalWuqG3aDWcV S3l9XquwCDNpHUa2H+1CUL9fiOb9qhBjvrv/46DWIiaUE7YGVBWc2llHhFJXDh80jdOb e4uXmhxEcz0XhyWKzg7JxGHTHtiXcgdXZthk+LJoX5Jo4rGTyKTeoN/Ksr14nlDCbbO8 hNmA== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=cbAiZT4nSyUmMwkKNuL1GiZ8eVaOf4fgvwZc5HHmOQ4=; b=f45HxN1M4zU8tUxreKNpwvusICplBoTDpa/KhWAR5rH7VzvBVO4++rDwJIMFsDEJEp 2FOks9RllQYKOCcT5aq6y/aCZea+bRyM7SpzDLrCtPqL3WRSgMdxp/fE+zAB8iIkuFcl qBc7qR/G+QY28JkZ4T1EC4//RG+SqtpqjC1Jdv60cdETulyzJmBv7OugQzI++aMr5rBs 4ouF9AABtNZyy2zKh+mOukXRcpirbICvu6Xv9m/bAmbAd7O0yn/gB7gEcwpLE2IL7/4+ 0jKCoCbSOa8bBqHIA8ADbOjxeUxjpoUWCf0PuivTv1RGGW7Ef+48X+dGf/S7QG+bmtC9 89gw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cbAiZT4nSyUmMwkKNuL1GiZ8eVaOf4fgvwZc5HHmOQ4=; b=cRVg8/xSma0XyBKCRX4cTduhx7dhtcpTSw8xp8G4BWAq3fg7RKcGafGPb0a5Oe6oFz N1wadEhEukAESlVOJEQZafTSy/yiSsHYGou8XiJbujNXpZvkp72oDLTXxmrZAmWBj5iW ct1ouCAS3hXzoydl8u1JZd9pHvcTPO14Yw26EOXNUyXY56QOctYhimOKUR3XJSU6zbXQ drHI9uxqtl5DWjR5f0Ho3r+etOzxuVcJBuAnaBN8okoLy1bmfWmushd+vcyZ69giy+SM sEWWycIqPhD3SWwDAYhYb7Gu3ZLtgF29/3hzMZlwlmCIyFQ9fdkVqEMBOBdCudohM/N6 VKhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cbAiZT4nSyUmMwkKNuL1GiZ8eVaOf4fgvwZc5HHmOQ4=; b=mr98wilxeUcpAkVEC9v9rKz2zlFcF6P3DH+i8EPwNAPQiNeyXIM6NXlaHdjSFf/Gih dnnpYF89b4ZaMotNRBs/OILHSxGoLdOW3TDyu/P1t8Ra1j5bHiRooVURBZwrKciWkF5B J6omziSNcNwsoRUVyn8cLNoOaSpj/8R1QZJkkXNkDi7XZC/FhmXLrt30+9uLocaj180q h1M3bIOuYqz56LT7T3xXdw2NTOuOSi/wtFZiXPpQJfkTtYwENWlyTDgrh1Ie3UBEetrE as5fbV8HlQd0Fkyhb4Xz5eQVMQ1eS71ieUniVYUrhZBl7Ebi08O3wZczZ0scpJPqlTEw mo6g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM53114SarkVjvyW9JPbWLbMdfruM9T+3ikuUg89Gmv6iUJQJ/sXZP psDR94jaty+PPWmVdVrpQ44= X-Google-Smtp-Source: ABdhPJx5WHICcI7YoUdEmM2GxdigNQ3SE0Z1VwLIne7SWAiSEAMBPp+fTiZjdVygAUUw3nUUT+bCGg== X-Received: by 2002:a1c:7f97:: with SMTP id a145mr3666828wmd.160.1602079295263; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd0a:: with SMTP id a10ls3046031wrm.2.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:adf:bb07:: with SMTP id r7mr3992981wrg.150.1602079294022; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=oi6ZeBo17dF4EGVCIdRhtxJbUtcehf0gvxcejZ5RoKhmR2mnqTkdtRhQjAn4PoZhXd qVg0inmjD+bY/40ohmxRNt1cjcB/9DDIn3tvZieB6C0upI8oYo2Psm76qkrEK67780zy lXYniN+9Mi5/ziYsi8wtBGHIX3gS4a81jQ8+53ztkgT6f3zHzC3CcInbghnjACk43V6v xBar3Alm+OkSE9phRUzjTD+MIAu6QNua1tuEXog0VauKMiqx9OboZNxp9hwbeYr3xUBp 6PrDEbUJvTRJEOIc2jCs92b+DpOr2GJyGR7ib39xtnN1zLS2FE0gS46J6eiennKlWetK rIhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=vl8NACv0Zxp+jYbk/riie53JtF5tnDwOBCJ4DAzzAoQ=; b=q390wscM2GmU+sU2zjkPo1tuFMYuvXyZiAQd8YIoZJGSPNcNbIM1t6CQqdnqwUjHI4 78WgRv4ROHT1EZrYlff/xfkYMB19A0jN4u0mgZpWSIld+flUwVpbxjWDb5jcuePqy574 slVnAwXLFcZv7wXfuSpnpMzxH2SffGjf440ZV2PaES1gyaB2Q3dR0O6oBfzBVDk+SUbc aD3RqoeRFNYJj96YUFgrYp709lbEIoxRaZvUecGXOmDz1uKhXBKjyyoYSFmNM+o8ycvD YOub0LfL6h5EF6C5AFORzF2PRbtgVht59W0BhF+nR0etOZ9GlAspYBViw38qs7pMvSI0 KMrQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id w206si61553wmb.2.2020.10.07.07.01.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1XVO010434 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:33 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkC019880 for ; Wed, 7 Oct 2020 16:01:33 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 09/13] deb-dl-dir: Fix quoting Date: Wed, 7 Oct 2020 16:01:26 +0200 Message-Id: <43ebf3825e63ce32dd388c9c1e8f9a81bfbaf8e5.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901899670687935?= X-GMAIL-MSGID: =?utf-8?q?1679901899670687935?= From: Jan Kiszka The outer flock call wraps this in '', so this can't be used inside the block. The current code failed if some .deb file happened to lie around in the build folder. Signed-off-by: Jan Kiszka --- meta/classes/deb-dl-dir.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index e9967036..54c29947 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -14,8 +14,8 @@ deb_dl_dir_import() { set -e printenv | grep -q BB_VERBOSE_LOGS && set -x - sudo find "${pc}" -type f -iname '*\.deb' -exec \ - cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ '{}' + + sudo find "${pc}" -type f -iname "*\.deb" -exec \ + cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ {} + ' } From patchwork Wed Oct 7 05:01:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441870ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:adf:ff88:: with SMTP id j8mr3609815wrr.69.1602079296036; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=k/9rjpkxzQWDoFl+onE780ZqhjCqZQzZ/1QPBRpi9bMAtPxKnUSXkxHrRtzIcj17Ba tSuCcTjfgVIqBpWXaVEkYYbYVLgENSc7zxKcZ4WY7/foy8E4lK8iaUX/DnuQNje6SZ8P E5PjwuwQLldUuXX14cFkXftqIU0K7A7s9EWyyIVBB6jWC3Z43Wh1v8hz+hGbBMh2zZrU 7gS/LBwQxokxAGo030ZCPmtGrOmHD9ZZfsdSCqFbo2edVRz4xTDkUNXddZpF9FqMoQFu +G0VotO8q1I7cFFwyOmTILcYyQzJp7qQUyp4RacX5JV50GAxht1ME8D9UUI5KCR0OnR0 mfSw== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=qGJXTlN4PE8Ar3DqldWndCVg2z9NlX4fHCfkqDYELvFiRRVvA1DQkZG1COfl8je9Dv jSkZqY7ZdCkhH30qo+7cJhAsSfMOEmFGarN4Ug5m5eL6eI2RDpn21e2XmW6XPo376lbV rGKnG1MrmByJa33bCtCFGI3rJYM0e2/S/JL+cYS1C2cYuy4LbdMMP4xnpG7P1UYhS+yT znmRytDDCGTk+JJB1SN2y8df1DDlh3Ob70bbxKl+AUwM+5ChkJNXBR3nQ7K88YluJ8MU a19zMS2lwVsT/Z387aNGJLAUk+U33BFW2S/A05J2BHTZO/NadX0LxXWoaArkZygIx5kO z22g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=GHG1vp7s; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id f81sor1427299wme.10.2020.10.07.07.01.35 (Google Transport Security); Wed, 07 Oct 2020 07:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=GHG1vp7s; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=zZNVuz6zbgzxadb4F06GpMYhjXgUB/XDxHVHn8ARHcffYR5xpF8PZwrz6nN0rgRjj7 fqGXWSHgJwFAVVMQm1+ZHhiVn3iyGR+7OSGxrwUEhMKaMVijw8jT6VaYLUYIDFbjaLIM PwHZ+w1N48ZZl7tcul3dlaRvDbiAZJT9tQNHiflrSPRS651sQvfPBr4UWfmCMJDHhQTR lOaQyAzCIyi5YL4l/mYJGyLfVE7JCwFo4PnAOiTTR28qgbC2DIgCYzQDzqe/215vcvGI 7W+Tc8Sw7dO7UIPtD4N9QzNl7IsFwvoMLyfjTqTdHAqu7MFhN73rMhLoWUazfm32W3jp 5+9A== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=CXr8hXyP29nyood4YqZvaaUN7tmr8zp3CGG0duDyPdI5im8hRvU8pCBgvg8RweA/zH jaJ5MDJzszhRQOl3X7NppuGN5DKcUUnp9UxuBBVnoxQk13nKCkby6+URsUJiJfjmF+fl scGK7yVnZgkB7drbKWs/uo0x+uXZe1mWPDgPzLJ57bUapGdCAulxdFiSw1CJCx4/v0UP Y95a9cu9FNojC/o7TMeHTYix2saDD33DcHf1+vUZ8aoC1F6rnkqSoulJ9rrWGpnvQZCp uPOrC4QlINGDs3r2MBND8OxY054s5YiFQ+XHThowTrHPBTHeCjdVxT/naINt0MzhVhdY QVZA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=GHG1vp7s2m0TkTnPLCr/L2oUL5Bkg/3uvLUjR9BFhXdaQEVi0cmlX5VZLex8pPq5S8 l2umLw9Ao5w8y6rjFB0pjQ4Cl7g2qjiyEOgIvsRxFc44TcULv09SoPcNc0MHngESRAwS Rd4sMyEakcsFT3vhqpOpLRl7BV88eG47tz7WhsY1xYY/5PFyJ+hGd23TThX8I84yetKH 8Uevwtk/tcenZBHDgs+BgPSeNEpzTOCUcqFxs/nhi7U8yzRGbzIORsELIUWZ9yA/U2zw KJUJaqsZNCyW4QB/TtAFzJ8syBn4DiAU+iTeJ7JGNrODHNqnGAD65/QxAHoQfwuja+cl 5fVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=FGgMU1iw7hMWVwbyii2MLm0OqXy18HNQvb8L3GcV/npeH5tGAWMDHESJ9EllOlUPj3 jc8BZV3INB9lgCpUtZEjnjitniXJirrwEukBcYVcY6vxQqo4bwCmJb7G+b2p8XmPGlDG 61JnumhBIqemHjMJLKivGlP42XshDwoyTNoTbFTQkKuefgEMIkJRlwn86XzrQLoRb0PP kVmY8pRtITFiUgSvBMaIiv1l+/rAEhvCuSVAznVXk30EdbQ1t8OLj9BnvEB40mGiFgGn 1MzHpZcjeTwFyhDppQX+TFrLT1D6jZjlTaPAFgGsY/wrPlmm6d2CuZeiqbsmSkaT53+Q OvVQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530+GCSphaY6aJABVd0MQk2p/7shBTdTILkGO3sgAiivu6jQN9n8 IOFdE0Z+QV6b82SPjhURIo0= X-Google-Smtp-Source: ABdhPJwhPwURM0uzLSJoig5TeGv0P5eAJezQYzipGUmwnrAc44wAGp1l+iTNrHzebQ3XwyVfejrhHg== X-Received: by 2002:a1c:5988:: with SMTP id n130mr3616121wmb.95.1602079295502; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:4e19:: with SMTP id g25ls1173137wmh.2.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a5d:5261:: with SMTP id l1mr4004014wrc.105.1602079294543; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=VqS0Y1xw63NmvxhBIqtq/TikZtE+XwueYKibDjAaC8Axnd+Zj3UTUDBeW9luFZpeRE 9ybA3a5OFcX4fBAJhUWRWS//wOZ8LSi3yH/dYTfVRRRVODVlhVzogBNC08oRW5LqK/Vn kZ5DTlh/QRFZkQwd0mlyN/uzlNNTRTLe8WpB3UwnsoZhfUj9yQclUGbFVQbu0ZH8Uw+g D2g8yaYDNTJCHkJjOJ5gHsJk9Xe2vAEsuMsQvkyvd8ROSlEh5yT6PK8JUDge2tGnFLcH bXjXYX4IiMcM8RBzvO++xq6kYdhedCG7RGEc8g/9uFRGcC/LicX1HI/f5sMqAGYxE2ZC zGBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=yrTnXZiotmpVm2xN+wULEQEnH/qVK43RpBQ0NgLnQt4=; b=nMcNw9i4YBiUxhU0s+UUW4pni/GbE/QeXQZd2MDNiC+j+MUnNsnYzpGWNPRRVI760F mv0QvXzV7zgwPyYDGNDLZLKlrIG63XMh7ScDrvFCDUS6kdZYyMR67Incc3hLcc5BnR5u bAzpXwRt1He0tj6lk2SHMMoQfsIsSKSvaXsf5+4hZqeRToiGMuxi71tLsT6Tsx/snMfk 3GzpHVix7VnV4Odrbx6AFaZtjS7HFoRwReXte2LSisn9L9V9viHBCK2Ga4auVqM7AlT/ W7XyAXXVyauD1vRmIq3xwOj/pbEw+Uo9tvOr3pp2s0+c2nKATKvGo+23KXo39ygmTxT3 21mQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b80si186019wme.1.2020.10.07.07.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1YIJ017974 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkD019880 for ; Wed, 7 Oct 2020 16:01:33 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 10/13] Fix dependencies on isar-apt Date: Wed, 7 Oct 2020 16:01:27 +0200 Message-Id: <34ae60959477ac135316da85daff9dc05c170883.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901900383859378?= X-GMAIL-MSGID: =?utf-8?q?1679901900383859378?= From: Jan Kiszka Currently, we fail if only running isar-bootstrap and no other task that needs isar-apt. That's because of deb_dl_dir_export expecting the repos already being available (even if empty). Fix by letting the isar-bootstrap task depend also on isar-apt:do_cache_config. Drop redundant dependencies, also for base-apt. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 1 - meta/classes/rootfs.bbclass | 2 +- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 08880d7d..7e12ab0a 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -180,7 +180,6 @@ do_deploy_deb() { addtask deploy_deb after do_dpkg_build before do_build do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" -do_deploy_deb[depends] = "isar-apt:do_cache_config" do_deploy_deb[dirs] = "${S}" python do_devshell() { diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index afec1cbc..00254ef5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -151,7 +151,7 @@ rootfs_install_pkgs_install() { do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}" -do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build isar-apt:do_cache_config base-apt:do_cache" +do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build" do_rootfs_install[deptask] = "do_deploy_deb" python do_rootfs_install() { configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or "").split() diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 1c5dba74..b7dc1ab7 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -224,7 +224,7 @@ def get_host_release(): do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS ISAR_ENABLE_COMPAT_ARCH" do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" -do_bootstrap[depends] = "base-apt:do_cache" +do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" isar_bootstrap() { IS_HOST="" From patchwork Wed Oct 7 05:01:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 117 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441869ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:a17:906:7e42:: with SMTP id z2mr3470772ejr.206.1602079295997; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=iuJ0AJaLGts4MKpJf18hlnlbyT87U0AhNUMcuZ+pFIP4eTjj289R1sK3mK1UGpjw39 FCetak2YYWEs9semFk8tFYsFM+KbLY3X6gzrkvTbydS8Qg1x/tmRPtxn8A1/HuKxmH7k vcJ/Vei7IGxNr6tSrAfSbiO8Ft01rAzQ01MP9lGzYUuexNHn/RL9gYFo/CWbsBqaEqbN 0UuC0nKmM2ZpT3uYXLmsKrbYUU14CYUa+6WVuv0QxfVLGY7l2uVAltuZHs1+nFqSY6pW o1skqTXojDrDp5Dgmlx9p6G7Ixo8rNVEY6zrQ1ENTe0IzUD+t0B5Nf07DNVfx1M+jfup 8l6w== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=f7oenluWz3mDHaW6ZK7rpvWkpXG5gL0T4SfCW3c5ZXd7m6g1iQhf+nu/fqus34+Vm3 1MjPwu+H6lF8arZ8ObnVXWFpVAnRQHoCcxOocPoRMR4LBdq+YLwvuO5q0hz2+Rohdhv+ /erQ0gy4w0CJ3t5On1q3cNjfEQakEZQiHaXrqGh2xvfC39+2qqbUlEYQPgPj4Nav2lmV tBDPf5jVqOq3g/oZYDA93I3gDMNVghCdM/N9cRSyyjSBmfg6QplaDwV1TSZHCfaAO7iv r2P+pqoNMFVMKZL7I0UkSWFCYRClRR/piaHcWFeBJVsB7pbfuA93B8GZenJ6mbl+ctYw U8sA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SEZj8Er1; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w7sor1308575eja.55.2020.10.07.07.01.35 (Google Transport Security); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SEZj8Er1; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=SfiU+0sv3qOHHdVYJ7bZeDwysvk5khpi0RzzG2Y4qnPv57zcJ6jnQ2ozk2ZUO+Ktsh AU1IqUcJFVBiHHgPLkFySKTGCjtxa94IiGWL41dhUnXmZmekp5EJQncm8BW/Om5pKC7C pyBbSW8KhS0HREA9pN5e0HfQZHTI9FsusR1HCxriEBTjTD4GxMAR18q/JQ5rep1/SYgK qpmt7NpbIUbGOKxseaNKphI6Zwj+3nvi0Fk70Gk9QdeJuG4lbmH3kilaGkWN9zoK6opc 760M5P0WRTnAEqOknMl6az3vJtx8bPLFpr6TYCyALQWtwkjHdJa8C2MGLgv1naU4PC+l 8xYg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=bEUaBv0h6zRc9eo5udGFcDtUrGTPq2ZDJDoemVRW36kuu8zPy/2RQt2V2z8stjZbDc Vbhn14uYKGoULPYgx/2frJLgMvuxuW988bs92+BxK3Qztflks+dQXGAoRk5JpnJIjLl4 LwDJ4y/fgsLK4wkbIH1uWAgG4RPkaDJBq3G351VjMEb4lAIgClmbCZX6UJ3aPxnFkA3r Zpgjndt1FkLKC9Y85pzjPG/UsUM4aaLOkKrRpj5Lo6lMII8rxidsbQM0NK1WbzpG5D5M bNx+b1tsoywY8auQr75uuJZabs+xJeCUkbh+AnWGVNKDR0tZd0r7THAt0RjgQrkEbe0T ncqg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=SEZj8Er1Mb35Fs0c/+MAGAS7x8eXKdyBzHXjIvHABTnw8pNNCf6oeCI9xxjQQImkGN 4LgNFEo/4DwOqh6KM4gOWNjP5SzTNREgnavy3VVlHLr/MsSJPAYgN6Pxl8TMGZ/Hte63 /pczrKgVOZkWU85NzAsYPWupgyFWTGhl2e7l7IM3guYtFmCQEX8HzJzZIRo9yJu/gt1R AeuxmZwGK+RqHkxany08hq0oW3eqhZXodc8B+FIugVSeRI98hSixeR2v2YQ0dk0lBDFE wc4LtaJhtgSHYaNq/iHqTU9nMdvD+VLVN/mlUMnLK7i/xDL8cqElCrJTZuMRmfhb4yip c2+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=goptvhRrG7OvhecqjsbjZQ5MP99ZZqxOHAZUtGpd9xI=; b=Gj49mCcbFJA8D39gzjVjqdNcKEu66/A/7ytfUAEN5xlhbdAot5BcgzGaieYDZqULcQ 0Iknt5PvDBnNrDqaJfRvmkw+4tgXwB7nl66jkyjFEdGVZuHT7nNVf5cM9c7p1ECHVSF/ yWWIhT6o122NL2IZ+VVTfd/0glzv9VEDTM/TI1CkMzARcvs4ZQjPreel1rewZG6TA3Tn sDeqqiAbSZ6kreZeRE9FJoKK3fTTusw6p3MugUbkTV/s083Q+aE1ZfOQJIEB5awb7v5e 2XwLMEwTEmFp2d4IXxLA1T7RIQSOd4+XkyenWlVunHT9Kt8VI0NNgdPFycM7cMPjd/3i jFtA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531hJc27x7IIGiFpbkR/lvpY9AHDlSrRnKEYFi7UfLEuV1MYVCjo 0q+w9pdlXmnSPmelTeNrwY4= X-Google-Smtp-Source: ABdhPJy0WrKBQjDzrEJSuyxtygn/sjP0ngS6ysexW2xzWVwEjqwBwo0rtjeGoQaNdOKXr1ABvyOeAw== X-Received: by 2002:a17:906:d159:: with SMTP id br25mr3631363ejb.155.1602079295567; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d3c:: with SMTP id dh28ls2645712edb.0.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a05:6402:31b3:: with SMTP id dj19mr3882447edb.210.1602079294703; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=set2MY7MKMFVxncKRKqc3LmqaReJ8D7Me8MW+8ETIFCmapWbG7j7YLSlQ9XFfpNbIf ijakDfA06qaJzhoVUnYWOIHakU5jHcUEtblY0czm3NqJ6ILvIa6E8B3jg82BzkMY24xj K1Coj0p5aBLnPBsN4e1UTf7KpqRQb3yhtnoZ97bqEeJrAYirIlZ20OpZkDyYf8J4NxJc lowTMKYdVTf+j2Gr5INMZ4A+Gjwjhs4HVzGCXfTZEo4PekA7IhXpB1y8mBXq6pb3/TVL GFBtSocKQ8MiVBrlqeKHGtEtEgqPVxhGUw0idH5DUSqvBVoDCXK2KTq9wjmzO+LsNSXh D0wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=lt2wFXzD5h4Kt8SUmVGioEmH8wYD1tR+YCVtExb45eY=; b=Inb0I+4a/3WmKoCTYtyuqTqAC+R31jqw9NfNf+FBZHPOG027IXne54SUxmR1k2JEEf AHFe5LdZIOE6CREFMHzJTWiV99Zj5z9TrIAdVx6Ty52e4Y3zgyFrYK5mMMfI3w8bMi6+ aQdrixJvbwwMaVnWplj5TWc0rjjLcjDNVoxicfgMabVk2g7kzMSdljyw9SpJQHei8Z++ 4Kr2bdqct6l5TjqvTEucv2nGBWFWBLIZhmxh6p3KYCGY5efGZW5RwbxuAYfVEjIo1wiw i6I1kTKRLoOtsIDDWw2fEcfBXSEDXxROrfoNtKSURsoBuBIq092vWJZ5cE4pL2LFt1kJ DPEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id u13si37971edb.0.2020.10.07.07.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 097E1Yf5001454 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkE019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 11/13] dpkg: Account for changes in mk-build-deps in bullseye Date: Wed, 7 Oct 2020 16:01:28 +0200 Message-Id: <59a66d0edcac96380074741c548d41c13d310064.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901899784380403?= X-GMAIL-MSGID: =?utf-8?q?1679901899784380403?= From: Jan Kiszka In bullseye, mk-build-deps now emits two log files. When rebuilding debian packages, those files end up in ${S} and will be recognized by the package build as deviation from the source file. Avoid this failure by stepping out of ${S} before calling mk-build-deps. Signed-off-by: Jan Kiszka --- meta/recipes-devtools/buildchroot/files/deps.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh b/meta/recipes-devtools/buildchroot/files/deps.sh index 93bc9cf5..1d617bc8 100644 --- a/meta/recipes-devtools/buildchroot/files/deps.sh +++ b/meta/recipes-devtools/buildchroot/files/deps.sh @@ -33,17 +33,20 @@ if ! grep "^Architecture:" debian/control | grep -qv "all"; then set_arch="" fi +control_file=$(pwd)/debian/control +cd .. + # Install all build deps if [ "$3" = "--download-only" ]; then # this will not return 0 even when it worked - mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control &> \ + mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file &> \ mk-build-deps.output || true cat mk-build-deps.output # we assume success when we find this grep "mk-build-deps: Unable to install all build-dep packages" mk-build-deps.output rm -f mk-build-deps.output else - mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control + mk-build-deps $set_arch -t "${install_cmd}" -i -r $control_file # Upgrade any already installed packages in case we are partially rebuilding apt-get upgrade -y --allow-downgrades From patchwork Wed Oct 7 05:01:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 122 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441909ooj; Wed, 7 Oct 2020 07:01:39 -0700 (PDT) X-Received: by 2002:a19:ee0d:: with SMTP id g13mr1015666lfb.139.1602079298550; Wed, 07 Oct 2020 07:01:38 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079298; cv=pass; d=google.com; s=arc-20160816; b=RyN6fenBIRaXe9jGDg8dn/8rx4T+VfKaxoaCKmF35ZMF6mzVMNb1qZMk2T8sD8eLLN bDwAxgm3+4qz0WuYp0qMDnygbWYjlxN0NbfOgz8SIF21EAHikZ+PPJj4NjQPYIIoMGfW q4KaiwkGncfuC9YRBxVcNrae2PejbEN4TKT7JOqlVOCiId97h7Y9ux2IieuBXkjyhIon VP75u3cDI3UPVGyaacvCJ4j8tRee1/1GW1S/EaG4ztooSbyZ33ZbRE1TEc2C0Apwfe6G VmAvKeWiHdaxYSJsD78Eg2XZsOgyDEZz6BKN6fc2Gtd3ejKLZNwFBJSg2CW7DpMFdA87 DhrQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=SAa1T1ZvitQTQM6Yis5s81YbUGKnDk06FmA5+WJqjzE=; b=grgcE3u8jIIT08UeWa/8fpIIkoyKub/qwygW3RBMKFFHzqsOxGRiEr4Ax+J0BbZiFJ RUyPvBEI2qi+wIyQlWz2ionetoSXxPnO6+lWyTNlI3Pc5eG2w6yPxOsNuGyh3QsbMgs7 mqaBaNIA1fkrOMiRZXn6u12JmVodUrCl8xMBMKggcLOIeofiy2D+Qp+KGEs0BwTzHf82 Gd9Izr6OaSWG8SiNqDRFe6cvE5/RDCc9oprjrEO80sPqA3ha8vymIODBcZsaWSVYFGek XY+hCq27k61j0jkMn5KjGAcjsJFnLlJRJS3h3A9V6lZoCR9WMF+EUcbew7oKnHLrmf7c 4ePg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=JcGMAjRE; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQMU675QKGQE4CLSMAY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id 11sor449207lfe.103.2020.10.07.07.01.38 (Google Transport Security); Wed, 07 Oct 2020 07:01:38 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=JcGMAjRE; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqmu675qkgqe4clsmay@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQMU675QKGQE4CLSMAY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079298; cv=pass; d=google.com; s=arc-20160816; b=C2bW3Aqiqm8TNb0fzPwSohVoHwwcsJiW+PjphGeK/XKW08+qMAaJHeDnxz3+GFR85W iAccmXoIcXOtKSK3IWTzy19HP9Kt2/aT/HKBEnkPvyjMCZ9YKRMtftc279Ctk6Opq8WM xeFRUvOJlp2gq6XqjIxCz6ih1OPeudNOpMvferJuohWN2gDr6CBL1F/uW6cuGQFSubII F5BEMPoQlA+eeo4SHPPEaqpOGnpI26k7yDequvbL+ZlIZnTXjN60JwD0e95Xgf79nePa knY3/gy+eZI3Up8y2lLGJ0QBdl38gm2KxDvSyFwHpOOaKsb2C9buN3qJ0PVx9L1N31qM 3zNg== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=SAa1T1ZvitQTQM6Yis5s81YbUGKnDk06FmA5+WJqjzE=; b=rWX15QPNkJT0zwj9T4hSx6Ak4nT7xrl3DkumDrC2Ua2fPQeM93LAVccrltlo4u9iQV RfkX/s6QYYzQ8WzIDAQuhAwbkcZxcqCCnxOz0MnVUYnw0HIk3EJAwvpFaemqyQTqzU7q Cm1OXPIS28vucmQCzVXPUfPiWSJiqM6K2IxTY2/R0uj6u7sK1VLKNWBtHsg2NU01fmnM VvXYyhNWNUR9tDFOyvySt5BL3kPfAh58Xoa+f4bwxuPAMeOgoLyfkdhU4Vmhjp6CEPEq e1//xnyuA8Uh/WdYEpmVDGPnEgoBtz/tq+CT2jb563kfe0JO6XKyP/8oJjj2/Tka4TF8 GbiA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=SAa1T1ZvitQTQM6Yis5s81YbUGKnDk06FmA5+WJqjzE=; b=JcGMAjREXR7tr/pgKzK7ctbL8WRLy7DrfQUazS1Nm8/beL9TkwphADGX5bwPxfSa7L LIWH6+EA1lViEQSjLqL2THnyOcSAh9UuD0e74aKsEgzFEy+oqm736X+yXYmAuITPDbGz GHieh8y03Zjyv1sxdk/4pk7O4wQC/yNiEk85kaTVlVO33WivkIg8go8dl/zpwv6Xsj9c Jd/453UzG8I9Flr8jiPUWY3a2YaB/jmRpj26MseP6Ri4Xq6u87Nc+3xBzt0KeC1Fo+8t JpB+P1D13j4hAVHTSOzcGBT6yz+dG5L26zAW1BP44Xb9ZZWQZJnM2aLRSnzy71w0BSZp iq6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=SAa1T1ZvitQTQM6Yis5s81YbUGKnDk06FmA5+WJqjzE=; b=EHC/YHXnBg+8xcd3dfuK+rvg2sc2R/DtZKOAa9C2zUDQjEVzdYFOsA3GdW7fhR5Pma hSnAzJCfrtWwCA7zn4R4Geu0axqsiYeUO7uWHwJMfdsxkx+rNGQHiiuOXHoHm8dKxFQ8 L6Dr6CdsDgZIkFehV9Mm8+9++BDZRgEcBInsK8vmwFCCpEOuOgFhTDaUefA/F7Yp89wb 4Z+/bGdebhpwDKcLp6qJelz9bu3tTDYRxhrGr1KJUyVZvmQbdAVgWToXcexmfYb+C3Mo bF27yayDAyHVAsCtmzcQY57Km+gVSp+3Y8HX5QrU9ywvhHrt0oSIeJtSa15N2WpIukkY Pekw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530LCVB8O67C+JQ/ojCUnGQu+Ed4Q7REaFPHWgEAwqpNOn8OpzWI tlpoyZ3daQ97XgGH4iB7OOQ= X-Google-Smtp-Source: ABdhPJxealVT9lMOEvRnsUK8w+TAPbg/tr7MYVaCtwV7BiD46RJWfvvGZMf3UPpFAMA+F7srNyurtw== X-Received: by 2002:a2e:b4da:: with SMTP id r26mr1353609ljm.68.1602079298175; Wed, 07 Oct 2020 07:01:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:554:: with SMTP id 81ls1335055lff.1.gmail; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-Received: by 2002:ac2:5541:: with SMTP id l1mr1098263lfk.89.1602079295332; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079295; cv=none; d=google.com; s=arc-20160816; b=rVhk+gmfqSJgOp4vvNxqr5apak9VzF6rSiJIcRWSuBJTrJniuJQRDI3SFRlfLNhgYA TVAhDyr8hMz7Mb+8OqMdY/GL7NTEd9HJcpRBHktXWvDg7u+UnehLAnYnhhGc8jENdHM3 Hq9M1CRrN7sL0NwOjJsVi9TupFZYCCVNGg0rSUGTtoV0q7URDfrsnIEwy4R15roQ3sHf kMulamUzfNx9kWwDQ/oPHfkWd6piQLZNGyMiHSKm+d8dvoUHwDFmznbiNwZkfZvoQlWl f1DzrnpF2XW5fd/diZor3MOMsXyVLnA8MJQlN/XTEsmYjGnfb3/IlM3xyNscibrMvJPx QWkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=Rjz1+gqht1Gs2uc3+qum0GqJP3HfW2bZTbnzA+plJJw=; b=TcuuB/nRQLJxxr/cogUVc2bnl/CwKPuBeKf/C3Zq121Khzc4YHqTuMIdF7x8rxlpMI pt/DGWcataHLgf4BNu+6D4AJhM4oBsOU8VP6jmRc/l+TvYd/+z23nxXBfLyfg18Up8F1 vaINtWjf4J3Gv33c/i76D8XHUlG8zFZfsL/N4IfgXuiKkwBUpKd0c2CsBZ/KEAAoRRj/ L4BYwo7ygB9Idnq4Gq8+bC6TSrgnRHFM7VpVIBZsVphVZ3qG8R5Kau01WOum1OCVGHqc 4Kzx1UE2VMMStrpilQeKS4gW5oH+Vxd/jBkyXoCn9g6g5775SItBqkxgM6FE8mfN5w+6 Xg+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k10si69077ljj.0.2020.10.07.07.01.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 097E1YXb001463 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkF019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 12/13] isar-bootstrap: Align debootstrap calls Date: Wed, 7 Oct 2020 16:01:29 +0200 Message-Id: <83772ea0a8cb60d64193d17dcc645a264dc6ed70.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901902127886186?= X-GMAIL-MSGID: =?utf-8?q?1679901902127886186?= From: Jan Kiszka ...both indention-wise as well as regarding quoting. Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b7dc1ab7..0b3ad452 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -265,14 +265,13 @@ isar_bootstrap() { "${@get_distro_suite(d, True)}" \ "${ROOTFSDIR}" \ "${@get_distro_source(d, True)}" - else - "${DEBOOTSTRAP}" $debootstrap_args \ - --arch="${DISTRO_ARCH}" \ - ${@get_distro_components_argument(d, False)} \ - "${@get_distro_suite(d, False)}" \ - "${ROOTFSDIR}" \ - "${@get_distro_source(d, False)}" + ${DEBOOTSTRAP} $debootstrap_args \ + --arch="${DISTRO_ARCH}" \ + ${@get_distro_components_argument(d, False)} \ + "${@get_distro_suite(d, False)}" \ + "${ROOTFSDIR}" \ + "${@get_distro_source(d, False)}" fi # Install apt config From patchwork Wed Oct 7 05:01:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 121 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441890ooj; Wed, 7 Oct 2020 07:01:38 -0700 (PDT) X-Received: by 2002:ac8:7309:: with SMTP id x9mr3388867qto.302.1602079297952; Wed, 07 Oct 2020 07:01:37 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=mU8FMRw+LGbjJAcEcgpZ3ydVnEgf6+wwU6VXKTL6v3/+VRMw1OdmUFVfZgUQgQghnE W0fHmWod3Zq2829zACol3YROMHAnC3gjlR7bg9JkofORPMY0Rp0XXEmxiHl4i++Ncnp0 mymYzE0w9Pa8WQDOYHlAshNy8iZHsAnTGXwcy7gnguQmYSLecmREwCyteSWZSz9t1BTP J+iuOyPIotmblkRTDAi1arsgg2K8PocxNYXQ2myKIiiZBXCw7DGDzc9YM1hZvAtCXS3v ZUUAyQxKxwV6YeKzP9PEYPfUhEX6KyQmbsIIeGmSYud9aI2SeE1ITiWpI74MRROPpWz8 kMQQ== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=EIkEM8/bJH5j7mq2d5ZsDfE8VoEHsGQS0uu386L+TAr63GUU1EIEV3Crfuef2vBFlu riI6x7u/O3ESuybRC2A5TBU6TGZbLrvuwZtdP7vqaYothidryuhfgQ9s6eItAUbx/C9X +MZFi1q7UkthdM0zNJcK4v8NA0Ad4yH0OmJ992a7ZC3LYk2jlKISxP+DTi+3T8rLHaSH Cua/WPFbdRZ6Qz6fpSvZs9J6XrCRF1W7k5uGQQ+kBDbd76yBM9flZBzZZntaOZyG9YzE 1Iclo+l/02xTItt3WYgIiomfIY5/emuEfx6m83V4WQZjEBGDBxGmiVPFm41tMQYkmaDt kokg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Eeps5L4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id z6sor1300897qvm.61.2020.10.07.07.01.36 (Google Transport Security); Wed, 07 Oct 2020 07:01:37 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Eeps5L4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=XIHYZQmcV7G1COJVWpRrKnWwL3lecuTiha36p+IjMiUQgLkevKh4HoHqyZ4mdlcoTd q8nAjTRk7LnOIvINS2W4cMTzDcO8AwCIU0un/w2FPpM7klio4J+TyEZdBqPv4tQIKwz1 V8mX9XnbgwDpu5tpu1hqsKZpCR/7kd45cplyUCO4L+o8Y6yeqHeqyoGY1rK6VuVs85uv 9TbdWCLaAKO0TeZK1Gz84GQgw/q3GMONMRGVXgCO01npBo5eYdPDzfmCHpXnVnJ30w0a LmqpX1XCUpC/r2ml60Z8c81AQh55KyLSmJgUbcdAMQmseULWZWX0pTg/XUUnJVgkLwUN /XMw== 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:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=BqpimzJpFcwNMcuIer1TOcPTmml7h40wFeIn7D2dHL9t8LItcL4cOB9JiYr15H52vy deY/PybHXa3IzqP+Hz2UZanDK33G484fbPTRHOUjWVbLYYy1PlBFn8w/aCmk4Iclr2W1 zMB65wj0ojsfvP5Um+jf1mKMrdiwUsAiD0etIuxREr1ClSs6Li0gSG0ReMiMbIo6mhUg e0pWx67/uCTYxjdzO9P02ZdqRjN1DnLqZZ/Df+hdN6ZWueDpTw2+/THCRB5ZnAO29S4b rpRgdFV/sJa7HaWOSok1IzoYPGjCepgyz4xtJxbCCF6b0LsfAwfWoGe6iXCfrOzlukk1 GCGQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=Eeps5L4lCgBHtQCmtQQ84PScGMUdmIQSS+6yO6FyhsMz+BzkG+fir5T+0p1fvK70bC jgYuR5NP/kTlKaq+EZ9QzZWSmiAiOuOW2ba8uSgclSoHwsVMl+x9EXH4BqPVF9OQz+AO vskoPkgzW0qLG5h1ALwVfE5/Utaxmco/RJFhM7ZVSgysn+AR41YDhHXqqHKyFnzZRNVn RLh8W/kqgrhWQS13KYpcY286e0OFDlWRPAQ8LSlVMuwZM4THb/DzlKsCVBvA8x88t9t1 Bu13Ilvdt/VrAcoM4Hngr+2LBBnmx19R7hdEjZtAZcbgX8wLa5PsgXDrLo+f/9UrRzNE t0dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=VqIBcc15jgoHx27Hpg/kkaaLu6/05Ww1LOGXzwF0w2ZQhcyuwixFoVPyFeVlkQfOnN En0B14xMl6KIWtx5sylIxTrtRCYhXO1gUPjN4JjMJwCDvQQTWMKK5kVob7/QXKPEABmq z2jPhDm0Ho096WNO+Afa43k6oiHnV1uBXMHXYQAzFWZ0agecqDp8RjJG2i7NwKAB99D4 s30px0JSnUWX3B36LLyJEm3pMHhzwIDja5IzQAV54blhR+R6p9l4XpUQ+tSe/lqh7Pt9 qho7cNNdq9dFZBr+lZbTlJ51lB/6/V7e2Q/Oa6g49RueJej7Myh8vjtnDT7jxVcv4vbj 9gQA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533frbOx+ItJXYX4+synk9PZYjyrUBRvuNMCqRLODCUo0/02cLGr rJljtA0VrpQIJAFYUb6hJmw= X-Google-Smtp-Source: ABdhPJw4V1kBlwdrv78370dp3eU1jh0mQ/Y0Y3Eyqqb+vt+wTDJ6ZZXumL3j+AnI1VQ3gVXV9t1p9A== X-Received: by 2002:adf:fa41:: with SMTP id y1mr3794889wrr.213.1602079296525; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:428e:: with SMTP id k14ls3026684wrq.0.gmail; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-Received: by 2002:a5d:4908:: with SMTP id x8mr23428wrq.189.1602079295319; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079295; cv=none; d=google.com; s=arc-20160816; b=c4WBbNTc4iU8HBPOslSc0Mfq1y++aQpcp4sEoR3Vy0nigkOGVHex2J0bTXhWxv/b8U IBM2aeuKkvs1wwbIB3drS0/btTwH/Mo98hhNnwI/+R8pXf5k6lontyvS8jWYIS5INn6b kewdN+AJnHz0kNlUfmh2nM83iG5EGx9Yjo87MbIY7TnoymZTvuxW7R9QHm8pgv+4EY8f 9uIM8t+4qv5CbZ2GHw75oU0Q5QgUY6LH3ZD9WD/HPkdDfXK3X2qXTE1nXXCI3KJTaE9Q 4dKJWvxGuLyzfFJI1C/hkhCyaJcw1gNmpmAflUoPthWvXwnZd6yAWR2QcvM3bbaOal+7 26fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=JhadybXlyO5h1r6YpwOlkxXeCJbRhQKLlyniQILDszg=; b=NkKdSHHZzvC//fiSiXXlV04mcxjhukNaJaMyUIHmgmqL3KNAsQXPIOybvAVqRrbl/g pORVq52p7u4Jagv2lcVqmGw0Jbo5X9FHR2FBQDFfmj2OYlMYCS1+5iA6SmK2pJMDzvOR agRz7KluaafnXAw3KJYidu+Nt/9xntRTYRwBb22wbTvL4ORDHENegapNk5iWxiBSW303 lfb6Iz4Vm9yh+wLsZAmjI1ZiNaSY2KKdbs9iYCzJAqttz+ZHQrvRQS01uq3q4U3paTWe lV86CLBaT4Z1iK6Sv96BjtvGbmKtPC/MxJaaBTn7OSzyPBLSS+utgiX4W2rjDQ+OqF8o zTZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f3si233782wme.3.2020.10.07.07.01.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1Yph018032 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkG019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 13/13] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS Date: Wed, 7 Oct 2020 16:01:30 +0200 Message-Id: <78e84769718556b15a8a81b927df68c11db591bf.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901901903072560?= X-GMAIL-MSGID: =?utf-8?q?1679901901903072560?= From: Jan Kiszka Aligns this recipe with deb_debianize. Provide a compat path along with a warning to ease migration. Signed-off-by: Jan Kiszka --- RECIPE-API-CHANGELOG.md | 4 ++++ meta/recipes-bsp/u-boot/files/debian/control.tmpl | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 10 ++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index ac9d8d63..6e40fbcd 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -252,3 +252,7 @@ with ${D} which needs to be filled explicitly in do_install as before. ISARROOT variable is now removed from the bitbake environment. It is unset after the initial setup. It is replaced with dedicated variables like BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR. + +### Deprecate BUILD_DEPENDS in u-boot-custom.inc + +Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl index 0ab3a295..9379be7d 100644 --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl @@ -2,7 +2,7 @@ Source: ${PN} Section: admin Priority: optional Standards-Version: 3.9.6 -Build-Depends: ${BUILD_DEPENDS} +Build-Depends: ${DEBIAN_BUILD_DEPENDS} Maintainer: ISAR project Package: u-boot-${MACHINE} diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 41124fc3..34bf91bf 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -16,10 +16,16 @@ inherit dpkg SRC_URI += "file://debian/" -BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" +python() { + if d.getVar('BUILD_DEPENDS'): + bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS") + d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS')) +} + +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "MACHINE BUILD_DEPENDS" +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" U_BOOT_TOOLS_PACKAGE ?= "0"