From patchwork Tue Sep 22 07:28:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 63 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470882ooj; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-Received: by 2002:a5d:55c8:: with SMTP id i8mr6094686wrw.331.1600788537700; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=i1fQd03kEIN0OJvW1X2Bm71uqL7p4QPHz7ChpPJyHfXHtyRUFprFEruLada5krDvVZ toxkl+o/vSdtyX8KN3lGRD9hwKu4cYK5XgTCFc1i3FG1M6XUCLuWmQukR0p2zPqfJ58q qgi13EiGA82gDVBJcCqa48t6WFpeivqvIIBiiq9ZPi4NtqjfhBWTuGoZIVuafRkQP+NN mjsKJE+KM6oKd/y49y6WxXtb9s6eF3RVUgjg5Q83QkLOtBVhCux6gcmBwASww/IV1QLl zGgbmTtGplpM3JjP6z7bTfrpLyf/piLSrskH/moEH9ONqHQ5S7z4Chavom7UImBgSr1V fHZA== 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=Ry73Ba6/6eZ+OyhJ9B+IAlHrOPDTy+A1U7MdcWFCqQo=; b=u29FnCqsPBciFVxvJC/7y93HBdKlv8CyaAviW/FAbFjDaScFMUNIvFy2l83uwR3Bto ZkpFJ3CtmIKpAP8gqCw58V6EwOmB0wAAlDlGScwdett3IZ1wne3Mw9A+gBGwSoCUm2a7 4WoU+KemTEq2r7Xu7NPxMzklEai2N8KcO07cPK4bkjD2uh/Qe5nzj6WE9XkE2QRE9FYh S47OzaDJCHsjm72Oj7x6qyt0dDUsQ0IeO2EpR8WZ/KuWDIY8Z4/ij/JYAeKotx2Q+Q0R DhnvxPHeO2aQOk0mhNlRJ6pvDaAwzHJnX9oqBI5OsA9apmiXBfLAaviSbUKk5mcWy06b x5ow== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Ct9lpe4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@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 p2sor1967570wmg.26.2020.09.22.08.28.57 (Google Transport Security); Tue, 22 Sep 2020 08:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@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=Ct9lpe4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=zboRhO5CsGINRQ6j433+I3KOnGmCHs6lM0AhoGlbvuXT72jmH53qZgSMvM13KtmpRM K15FspWbLg8Gwe8RIMeLAQ2FKZ3Veu8IIQ0yJX9T+50f+Zef1smUFMwOp9VbmL9/ZDE5 saH5coPgN9AsaKKU8rXpI58akTy9knT5veWqqiPIGfWCDpGgJmZJQtrv8z3JDp+8H+yM w4PjmHdh7oEuHQQYdkX8fPeA7+jfnYDVe1Z1ZsVHKROgd83eRsDQgvFRgSheqXxTsiAQ 7gOORFI0lCZzurNGiqxb+fx2JTTl27abvyVUDurZbiJMX1YMQ2c85pkqAy8LBbJx5F27 O/Ig== 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=Ry73Ba6/6eZ+OyhJ9B+IAlHrOPDTy+A1U7MdcWFCqQo=; b=y1OoI3imPxbTTw7nhCKitcOxr/Gd+l+UqCK6FYvK/uML0OTwTG7Su7vxjn3Z9MsPYz ShUyDtb/NE+8xeWjHWnwQ9Onet1QzUzTEyGeEwNl3VXiDdKxH3AtYgQQcpJxiQouBkq6 Cdd9XcRJPbrtHljfFiNKbRwNGafHMdweAealRV2K/wiFICkRwsvXnUCHe2XxRpbECgQE z0n6P25ugLyUNsdSCKr93clAC9aygeBtZWGSBfunttuFWMV8uMG7iMsb9WlQwpfo1m8e fMwkE1Koc6ZIPaBrPv7h+wOHa5a3CpfkWGhlgucaKV4bFGWWJEnkVuZNTUb1ZFKJtFF9 MoaA== 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=Ry73Ba6/6eZ+OyhJ9B+IAlHrOPDTy+A1U7MdcWFCqQo=; b=Ct9lpe4lagdIi81qAh5lakgUJ6ITBIgDWXL9CAZxIvm5HwSz7lCROl8yiMo8CLa5wb HdzIkGBndKnP6qrVrEih2IQ1j5EWSCnfnHC+XjlfJmn1DLSykxMg5g5rLvgVGPPLz/hd 32dNO6VoevKrMoMplwB2fqfgycgL7yiCG/8zifuxX/8YCFcbpgGcAcpBYbNMqvx7FgM2 6+Kzp9ukzCxGJ5/0PcVnfSKf3N7y9n/OJT7v5n0qg0Ras5FNe3GMRcsYzuT+sQt1bn0I a7xN8jzl9k8QVAQP7fV1B/h+LXquPI1PjUBtKjV4w3ZCknqlrv30EqIvdjJZiNmneQJP hwKA== 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=Ry73Ba6/6eZ+OyhJ9B+IAlHrOPDTy+A1U7MdcWFCqQo=; b=JXaaE/AuU5wlc3wjnK0iRUrnb6netzDgZnGlPaapymwQF9Bt78KUF5CTqPkM2g1gWf oh4d1fGLCi4y30vUJRjigpRNI/uLZZCTxy8d/EBFDVoFPxpZoTySQuritY9VIi2TUb2K x+LmhMtFxRtsrWxZqDHnj3dI+2fcoXG7HjcpFEf43Heue3hHMjHg5qhN7uEV1Fq3xJ4r oqZ2HCEQpWLILwl7572nxocTZvMGKcNuAn8S2NsfOKNcVeTVn29CKacfh9e9T5j/Oobk jj2qE5xQ/xMM4Z0Pd/nTIzUp7m+SJFDm/ZlcAw9tObnSxP8tc8ni3bowu/pVg921RZlT I5zA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532/PntacQQORrRVyiV5cRbRds2zxZiNhRK2CKOTi42b/adCWNM1 XA44kOfS8YOeKxhbU7lnTiU= X-Google-Smtp-Source: ABdhPJyLQwSOHazzh6K1uNg5WKtyM4UqK1cm5vKsQWVW4hk0JgKrb3804Hr6qxgYRcnavdMBN2Si3Q== X-Received: by 2002:a1c:7c17:: with SMTP id x23mr1632211wmc.165.1600788537358; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1bca:: with SMTP id b193ls106616wmb.1.experimental-gmail; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) X-Received: by 2002:a1c:19c1:: with SMTP id 184mr466928wmz.114.1600788536200; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788536; cv=none; d=google.com; s=arc-20160816; b=dgjyUn5owWuin0/aEammYGqK27HzkICug0j/Rf7DomoeHPzVTsZuGVHlnjXMZbpPYK DOxXLTf716zNJpkc+jt+sFKyl5MIzK/iMJfSwTyclbTC3E/jqt8Oz2VKZbmEbxprDVDA JrErTDkwd9XXjpT5+/mw573+8u8JuHkcdjVPPs9PhrLDBxVTT86sQ8l9AmyvsnIl6Bu5 /GmQd8t5xeAHptrHxz5w/nnijg4vSjS4ppLTmTZbgoLusEFD1xqcIBaDjGzg5GRVkzX4 OV3TS55Qm75m3CXTXZxVYkNd8bsKY8DBJ/lf1kBrcIN+ryUm0Jqnb9elhk/q5UUol6K0 2+pw== 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=QJvQ/q0nPdVsVpg6MPdcdgHsLN1lCgEKhNuJtGZRF74=; b=zqdcNxlwR8AhgypnkcJ4yHY2KO35b/OlWgbkyIDfpGIikq7hvmfCVkONEoldjJ5Lhj +JPQISC8uRwgvKibHRMiIyHoUGcBOHuT28/43QiEKSR4wmWAcfbiP0g9MQT8crJ8gyFQ YOpZVxkI2zwSdi6MRmzK1Ftms1S0tuYqKdloqTH3l3EwH82sKNCSqKuRvz5X+rKhCZkf R58aC3JGcuw5dSelzHOmd8lM/v610Q9V12hxJGkX/RxfFpep4SDpiLmYBxc5+XjbPohh l1wa3jyNNVSRI8/KSXx79KpoygFn792JdLlZyZmR4ippVXiOLQv5aTkuVigp9I4zfo4t +BVQ== 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 v5si413104wrs.0.2020.09.22.08.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:56 -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 08MFStIB027241 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:55 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV4031723 for ; Tue, 22 Sep 2020 17:28:55 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 01/16] Split up isar-apt into distro-arch specific instances Date: Tue, 22 Sep 2020 17:28:39 +0200 Message-Id: <47cc08eb66b2ede076025b1b3a738f967f4c0303.1600788534.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?1678548441841608343?= X-GMAIL-MSGID: =?utf-8?q?1678548441841608343?= From: Jan Kiszka The split on a per-arch basis is required because bitbake cannot detect that a generic package (architecture 'all') built by recipes running for different architectures will produce the same results. The split also per distro is for consistency reasons only. Signed-off-by: Jan Kiszka --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d2834f53..44ded532 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -77,8 +77,8 @@ QEMU_ARCH_riscv64 = "riscv64" DEBDISTRONAME ?= "isar" # Isar apt repository paths -REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/apt" -REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db" +REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt" +REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/db" THIRD_PARTY_APT_KEYRING = "/etc/apt/trusted.gpg.d/third_party.gpg" # Base apt repository paths From patchwork Tue Sep 22 07:28:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 64 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470886ooj; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-Received: by 2002:a5d:43cf:: with SMTP id v15mr6073004wrr.269.1600788537796; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=vKKYEsletB/+GfrqK7A9LslbFnTMRn/lEM7D3j9M0Ij7mIPJ1/T85RBfG1kZXMznEA xO8evKRPKitrR3yMJLvnjD/gvC4oSPSWno1jPhOkZzSCt2lMIEGfIPQbKHh1ySJQQy8y 4swHo7jJ2B0tdNneE6thkP9WC6kUW3wWnMC/b/ddbxP8zbJOuoeWkxJtnINlnkZ0NC7J V0gtlKqG9ni8/aFJELs2P+n8W0TRFzZPDvL8TR/kJc14OpbpT9XNYhvGJf4SUWz0CtAs 4ah1+Th22oCkCibxP/9hKp3fp9KdADrZ1J4eH/U/GTVNAK1bwwUJNaERC+9EBTcsfA3u ciMw== 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=wdN9dfaWm0Ttg/glpLeB372r4DYQJYUMW59Q/17W6eQ=; b=QF0uh29B/hHBx8S7hu4o7lStjKxZf7kMtgCQArSbBsxqgVgYPkmHLbxViLbGBXNKBJ U+osf3uzXtVzUJ5IEereMUnjGhb/BpY8IqLaLdTm09z2eqziiUG8XKSwXKB3LIOijBf+ R1nAHhTTM+L56K6B2by1SpnKNpNGisDPKHTpedPcN7s+FPMkDbD61ZmU27FE59VS96Zr dbYbbjc6MfB5eUwPYGwjMBmXOxK3T7f2/s6zGMUPxC3XWNdkBXZXrSzBcofeBcXvnv4L CpnetGUu9Z2QcV9VVbNRH3roHmRGb6rvSfZXHo4h3TyKRIM50FjTtJ9XuR6QFlAbXeXx KwpQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=gvrD2SJR; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@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 n4sor7575322wrq.5.2020.09.22.08.28.57 (Google Transport Security); Tue, 22 Sep 2020 08:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@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=gvrD2SJR; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=ptwAtTeOFACgFQeiEJw/vqE1hDoQGP7wzOPi+HiOzTOrehYHw83VaoKxSdn+MyJgEY E6LilZJpje5sG9Hj4CwfAg4TUpcHAGgg99vdSB3+s50c8RhhCxl2KcBipRUNyAuDn4yB nx9A3o2pIFlB84pKqHCqhK0GpCG1AZQeKtn8Gjq936kYUTYbs6rjb1Wz0W98WjZwYopN zG/l85xNl1wE3CkljpkvSk6XzXNeSsgrEvlNUI4ZqAw0BMrSSCTsVcAruBWgcPAq8Mq6 GXPHcQYbdm4pZyH00mInuqJ2WJLKcIKxhFsgUgy1OAxpWXX8MhNYlKOKJWBe0X3kB4ss EzBg== 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=wdN9dfaWm0Ttg/glpLeB372r4DYQJYUMW59Q/17W6eQ=; b=GYANHkOUSP7MT75dqLFdRdq1FHoUdX7EYWzmq0hbSXvZt+xG7wEPdiGhm2tPmqiyzz ULN6iDcVPBOJMJ7KLj3NY7GYeQcs2CjmkVyoihYUdbhOXO2IX4iM9Bsek9cDUPXi2sgR MJh9q3HZuwvvbhBYUrYFc8aI6oJhdpVMabOrDZ3v/rvoSkTAkHmaFhE9hVzqVSixaP+r nChGlC/9ueXjZkEvxV8XKMlAnOQ2gWDQMjLmEaBktA9WT3KHNRP+06SGspCyemR8bNSI dQaUSRgdWQGdymmj2qtJdvgg4jV4t5WnR+cqcNGPQ7WcMY71AwljDitAUgUbQ8X/Usyd eS9Q== 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=wdN9dfaWm0Ttg/glpLeB372r4DYQJYUMW59Q/17W6eQ=; b=gvrD2SJRz6kv9QuprYxXrp9zqIFHXCh0Ocb72g6M+Lu/8XXnK5PhdWiczYfe6ZdAor MFHlhzlT3XN4xnCDZy5f48xZDU7tpFwtmqBSMDTioiFjHG1lwxfZMEvG9Z1Pbrce6Ax/ zka5HOp4PlDJU/oUiPeSVUzNDNK40OJd7XfgV/eyxUOL8rzrdH3Qc0UZ1wojZx+9wA2j UrkWMp+Qe4yvT+GRExkWwMmvyIX51HnBQHLxN/MOK44DkywM4RZYq3iy5o1IOfICt0Tk Wx73shACQc/k94a8xsKnqcRQskNiQt82ZTkQUtkjOrXhNAb1ouPphpx13Ir3ItoFz6an M1MQ== 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=wdN9dfaWm0Ttg/glpLeB372r4DYQJYUMW59Q/17W6eQ=; b=ub0ZRul5KeFWfygX23VQCkC7EMZSvGIzr8UcvomnRcG8dkPeI2bbmQOOhxhLoC3vU5 Nm1MX5UDK+Km/Z5eAF+VF12MCLxbYih9UHPIe0s6GmFUFSBfvs7yE9mUL4U9fz76fro+ XNdz940NpUppQeOCqlxE7WSBMhaJ/M6PDyjCN3Bu0/MeVyyO/pAfBxAQIDBfxtYpRH7p 3SdBkmfVC+TFn+TMWKz6xMlUYYxdlohedNPqmO69ngBUqbW5VbJyzdp+YHXCR+R4uWRd yxn0FvHQKhxgb6WRLWOPkCSGPL8wQivBgb+m1q4Ps1L+SJQW9/a2OyLBBIm7iVTHiqz0 tHZQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530M2Se8SmhVW5pIIV4ZSJjyXAJE4t29a4SZBzG4ReVTNlt+N0Gk ovoTquvTsjRrtsw41HBMpzg= X-Google-Smtp-Source: ABdhPJzngSE3mJoDXllYuMgPV20kATCovYU8VG2DW+Ue35zkEqGYQOY5xwkvRW8AHdAmRGhPjcMjcw== X-Received: by 2002:adf:ee8d:: with SMTP id b13mr6433215wro.249.1600788537427; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e3c3:: with SMTP id k3ls4729727wrm.1.gmail; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) X-Received: by 2002:a5d:4448:: with SMTP id x8mr6323326wrr.207.1600788536449; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788536; cv=none; d=google.com; s=arc-20160816; b=x3ueVhEKkMCD2vQnjAGRX+dOO8esLXlphEJI0PKqIBgKiPlbgKw6WVcB4G7a3Y3hgw pkFmpqWdIQMW5kMlDfcgtBdpDzcxs23Nu8XZ2E1dLN6ckVh7qEpBmVlXIebc5LBJcNjG TO4PzsH0hb4xoKFGB7UXkRyIqV2btZ4jUfeePWjeoYGA3LUNyPR6J0QNyTJ9wT0orkJK TPyAUBw/X9qPWjmYF4421kBVKKvR97GlYxbv9ArDcE94+6gQWrxmvxycPa1pq4dFMShY DIYvEjWpDjumcw7ZvK+DPvzeW2pqnO8vAQiU8yR6fLHX9POxDd6i3LBOG2zTQB+DGkdG 3jhg== 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=xVY8a2ZXDdVvl8FR2t9/9QIj4yCILQE4CRwGMSFsxGg=; b=gvMoY/uEn4Y9wNzNYmdxLj1HpEAjdciFBzlvUb1ChJo1HJYLeIc2yJlCwUdffOoxrL ER5TqhxKF+37iPwIjwRBvHBEjYOFxKzi7hPd8JsHKVdcNBXfpRkByzD5vrtl2ErPmVaJ pkuel43BUiXrZ9mjLGF/BiTVxTpn5IIw11R9aykHD/OIeh0rAIbj++cKpr3o9j9U3RJM ogFFOd9k6zko4ejjcbfugyQQ8UE2hJDrdRdfwsfPASPqZFmT56I8vjX2IIzQcMAj9sHG 76Sc0eI1C1i4oF+kbfZ5PCf8QftSa1Iu3yrrTEH1qmquDFF1rO6nv5uzTTyqMRvgx6G9 7HDQ== 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 g5si152371wmi.3.2020.09.22.08.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:56 -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 08MFSu95027250 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:56 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV5031723 for ; Tue, 22 Sep 2020 17:28:55 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 02/16] linux-custom: Clean up minor inconsistencies in rules.tmpl Date: Tue, 22 Sep 2020 17:28:40 +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?1678548441647300104?= X-GMAIL-MSGID: =?utf-8?q?1678548441647300104?= From: Jan Kiszka .PHONY is not needed (and wasn't consistently used anyway). And that missing && before the last export was apparently not critical as well. Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/files/debian/rules.tmpl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux/files/debian/rules.tmpl b/meta/recipes-kernel/linux/files/debian/rules.tmpl index 46b56ec5..05a26fe2 100755 --- a/meta/recipes-kernel/linux/files/debian/rules.tmpl +++ b/meta/recipes-kernel/linux/files/debian/rules.tmpl @@ -12,28 +12,24 @@ isar_env=$(strip \ export DEB_BUILD_PROFILES='$(DEB_BUILD_PROFILES)' && \ export DEB_HOST_GNU_TYPE='$(DEB_HOST_GNU_TYPE)' && \ export MAKE='$(MAKE)' && \ - export O='${O}' \ + export O='${O}' && \ export S='${S}' \ ) %: dh $(@) -.PHONY: override_dh_auto_clean override_dh_auto_clean: $(isar_env) && bash $(deb_top_dir)/isar/clean -.PHONY: override_dh_auto_build override_dh_auto_build: $(isar_env) && bash $(deb_top_dir)/isar/build override_dh_auto_install: $(isar_env) && bash $(deb_top_dir)/isar/install -.PHONY: override_dh_auto_test override_dh_auto_test: true -PHONY: override_dh_strip override_dh_strip: unset DEB_HOST_GNU_TYPE && dh_strip -Xvmlinu --no-automatic-dbgsym From patchwork Tue Sep 22 07:28:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 65 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470888ooj; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a1c:4c0d:: with SMTP id z13mr1521757wmf.115.1600788537907; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=gUhCrZHK+1Uf0fIk6bqT5RMTw/TsEmssoAz92yX4tuMwpMcCYdliveCFfs0bvuovxJ Cxye0Ym/vaMSRlmxQ7Ln/U029fg2VWmP7KgC4O/PPR8aK+dfnlVyhMUKVBqR8czyiP6L IrGV+k6kZWTJUAPYl5SjuIhWlVJ+202jl4tnT3aF1mb9Cjh2AW8QAu6OjbHg8Fn4IZ/V NWM136NOx6z2EY1QUopIAC2Rrq3s63jK4z0BV5Mh2BFIjZ/j5OnTX7leWVdPwPCpMh7M IAhw0NegVg51XSr36NBIRS8P6UMoIgkjDK3luHw4/QNMejkKje37/3SopxVYRDUj3kd6 9aog== 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=ku5bnbRgvc2kAKYs09lML7bPn7DoPeCsR4VO9Cb7BkQ=; b=yQZnaNr8AhrGXPXj+DoaJdGsbwTOcWzzkfu/e2tNyIJeczqTcmqblNThzQl9pPLhlM YXaPFwOzk2KqcCsNRtmMgu1Fz4zdO1V7JA+KVdTJGnPZR/wr04aAYNlE/7VxmBNIsayd BNhSj+0HzBBqaylH+L8MXyDT+H4H3NivKhm18vVs1Zd9J8l60/Gk2LeIXJr0aSqb82s/ 1/vAnQ/BS8rLrU8knniIDj8lxoSeh8tq+POSb6G3CKE6EIGk2fJw21vaID6VsorLeXPA 37osWGxl7a9S2ckwLesKU5Ur2tRqu863JRdZmy3UvCtwVTgcW+qCqyrBL/Ws49GMuSUv l6+A== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="AEjVk/7A"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@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 o14sor7946498wre.63.2020.09.22.08.28.57 (Google Transport Security); Tue, 22 Sep 2020 08:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@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="AEjVk/7A"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbonqvd5qkgqeznh7zfq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBONQVD5QKGQEZNH7ZFQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788537; cv=pass; d=google.com; s=arc-20160816; b=HpPwllUnMbZfNA8/O1eEGJSW1GOoE/AtzJJ6/zkyvJ8Y29R0juoD09BGNQLxf2d7bY iDdSQh6zKkwRXEL28PhDkA7JnHTYyq4KOiRVfSbtrZ9Pq66Pcn7ei/GPXgZqqbFtpLlw i8gpSTEcuAnltUcj+M588wYshFWdUWh3FSHvXxcc147/Ou8jViuHrA8wtnJlTjQs0Dvo Kpre+2FxyqcIY+uLh+GbKpSzGVRa/5vZuwgosADXAx1azyLw+QeB3+omssP+TuH7dO/O oLqpF7tGX3PbdAYwxX0tjYIR6zgKb6ZzGzz8xdac8WabY02n95Yh7b+FIkbc9Tv1lbSF faFQ== 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=ku5bnbRgvc2kAKYs09lML7bPn7DoPeCsR4VO9Cb7BkQ=; b=PikCN5r1ftWnRpSa9xF2gYjmUaXt34CPZgtpEqzHzEpReqdmEz7iD5T/9kY0DWBJij nHWb6l7wiG6ry4ROTlcghq81PpfsthHrgdK0O5nhk12uoCWu2QBHVMnlNVJRJzQhUsXc j96IrawMcEi2bb2uggYT9IqYdlm4OxI3UiCNR3SGuFiVDsgqeFYCHeiooudixH58u1R9 JJKo+JF0MLev1EhegrslWx3K0k+cRVNSGPxy1yvXgolAutK6WwnSlLCmfzUOtOFfkWai /8uZTRrP7GcMuA4y7yfhgGmUFxQ1ym3ocsO3FJTzdXweTeo9yrJEwbIg0+kDLs0OnPBX wJtQ== 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=ku5bnbRgvc2kAKYs09lML7bPn7DoPeCsR4VO9Cb7BkQ=; b=AEjVk/7AR1gHPUwUhpthttajsvKeVBG+wyUvhMoakFwMCnICdv0kwYokpJU1Hl4EzX 2NO5IE+qk20R3nJPjZC1kKPRxbZPnupWlU1fHI7PhHTd8ckB2WE342QbQPOGSHHPT/tF G4wlILsGZ0rJwNmiT19ImRooY4TNFlVZi3XBuGgXBv7RK+R++sEnVfqyLWTmRfFEURst Mz0riV9NAbK5OzoyhqrgT0PT/uTiFWcWLof+rkP928ZqL4YsllNupirdhI4rmZcQBEeR CaegF72ENG9Sp5ywd3uFPah5deGmJx77fdj78bp7xWjNvUFbXI1G9T8RckJP9As9edYu l8Rw== 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=ku5bnbRgvc2kAKYs09lML7bPn7DoPeCsR4VO9Cb7BkQ=; b=nerqlUBwAJZP73JvWaZROl7i9LMyOgig/RWRMVmPVBP8GznLrTpoucsoDzPJ+W2+Pu WFwFmxtOXE1rJ9Y17IN91gL8ceMS4vlQb6HNYW1+LRG5QojnRnKFHAhkl5HEiASPsa3L HKwnbQaikhmKdFKMf1Ws5e10O202KfgAnLTJxBgJpPbMtbm+qhvhy3nzsCDbrvHQv1I+ sn8fv1GtiaZtoH1hBxQz8KFV38t9G/K16VTNQzpipFUtZZqGTR6rwhSQWsq3mKtGOC88 gdJwn+HRI+eTgC5yT42BYz5zH6IZdPlB97PyeHKtLd+VZUhvggEzSdDzwrXWzLRBa8oR XzMw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533rbt+mGrH+JXGB/nQlHBODRvd+Sx1/64HNSBRq47gGsQPWBl/e 7bkk/a/6XwtXYmMaHrMxzos= X-Google-Smtp-Source: ABdhPJwc55Z7dAfaB4vPwIZAgDDWT8UuHMFWvppfSCAXm1jlU7Vfx+oaDoIjwtydmBmEkJpi0g2HVQ== X-Received: by 2002:adf:f552:: with SMTP id j18mr6390648wrp.128.1600788537543; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd0a:: with SMTP id a10ls4724401wrm.2.gmail; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) X-Received: by 2002:a5d:6b84:: with SMTP id n4mr6494161wrx.55.1600788536567; Tue, 22 Sep 2020 08:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788536; cv=none; d=google.com; s=arc-20160816; b=QhUDj1qt5J+63b/d4Bo8Iurxo36uoh2jEy/S79H6orWC1+0aCR98b08pQiVHNWYs6F Kqx5hQ4p6DSHsIon0yLVfgFXDwckxa7yRXa8CIRPxdfUOCV6EXPde0XR2IBufTpKqX2m TbLJMAyMgXrZ+CQv0YFqfsozoLQqkl14qn+fV9UREwutCpDWnAflvc0argI22iaSOT7M qaEAW3pEfVE3eBPZEE07KUKu4uqf5B/xZdhpN2zXzGDW5ZFpUOYuhYVGPdQw+fGaoMWu BVTbkE1NhP18mFJ41vbssZhIbyTPeZLgcgmjDl5Uz4xiHj45pWMSiYws2alppZV8m+VS AMUw== 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=nZf0w/c14pdwwnXV/kCdva31jA7ZUNivtf6wjcOx3j8=; b=03yGmN+M8kG2vEvoLt1YYRY98EwMW3ae7CjCUpj4GEVClCt5ftZ6/BGene1WRVtyMB 7gaiuaOjbwshCGegIC3XNRDqyZ4H6J1Gh2YqmDnNlViKirFozZH7CxYFfrxdGs7S4T4N 9/QR8U/sHW6vVUqEnWVBX1Eobd96poclQtPIA1ZHzzh7BuAuH3oBjf7NDHosFCPrPc5V FkPc1R8tf75dEjDPQn8hv+HBALKOOOv9vWaG+e/t3BVF1DT1PnHrfNaBDahAZunED0HO Kx1XtNBqSnNjbVXNS6HT2oPqu9Wk++D7rPvhcXEUNaNlopAk7rDSBm7K2xvbDtebj9/f zxtg== 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 s79si95077wme.2.2020.09.22.08.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:56 -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 08MFSuAD008482 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:56 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV6031723 for ; Tue, 22 Sep 2020 17:28:55 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 03/16] sshd-regen-keys: Issue sync after regeneration Date: Tue, 22 Sep 2020 17:28:41 +0200 Message-Id: <07a83fa777338c8765794db04cee2e57681b6e6f.1600788534.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?1678548442135430806?= X-GMAIL-MSGID: =?utf-8?q?1678548442135430806?= From: Jan Kiszka This reduces the risk that a hard reset or power loss after the regeneration leaves invalid key files behind, thus prevents that sshd comes up again. Signed-off-by: Jan Kiszka --- meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh index 11fca3b4..910d879b 100644 --- a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh +++ b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh @@ -16,3 +16,5 @@ if test -n $SSHD_ENABLED; then echo "Reenabling ssh server ..." systemctl enable --no-reload ssh fi + +sync From patchwork Tue Sep 22 07:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 66 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470910ooj; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Received: by 2002:a05:6512:338e:: with SMTP id h14mr1725252lfg.422.1600788539361; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=sD6hs3UfITWzDjGADYYh99/cN9+KthRJedH97TDiDxY85kn62CCG1+kjn15B80jA+1 Vm/bykZaDl+6a8r7NsPOuCJNiJHa1+u7fK5qdfaLBC4KPBM4bRQY7WdggEtfuoPwsy1u TUzRZo+pB95xTm593VA+ghIXDlPNDVl4RomcIVWrAbRFLgfn6RwlKpMHXfYSxl5qmYn2 ggHfnNz9SN2o0I2hKmuMwKxvjCCXpYIbtQz2eF2FjMQ8gyyJ0+k15PvY8mx7fy+Fp/4P gxV3pqJuYUGTF8GsTimcE3NsNCetKBNuj8HG2iUolJIvIAbLjG80zf4y47Mvryh6H7jX 2ZsA== 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=FKyxneASVHiu9kocoUgh/TIW4UwNRZidmrAjWGW2Ecw=; b=PZM/JfkXGiIAKsANhMPu0w6myviaXE/iF6gdjaRFrybyYIGSvIZPkqrZOXAZ2D0HT5 3rppnsYWR6eL7/JbgTpEEwEW8Z69UU5Jfd6OWabz/HIqJKNIUth7yCOJ6vXXNcdxJXKS u/iduItYiSeAGB/COp6mjirhK0vyYQyB397UwBEDPZ6kn4CNQv/d+5mu5uGk666topeZ RRUMM4jNNjuS9q2hEtgaW9QxFM5/8AZ+o+1iP3v4in2ZPBn7EkxbLDvD9GLp71jW3TEJ eiRovvee3CUehycNsDud+lpjBFBym6bJ4QGzwPB5osuecXfyqjComD7hCteUwI25QF8K ay1w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=CF7b6lhq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBOVQVD5QKGQEQF2TRLA@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 f2sor2923952lfh.30.2020.09.22.08.28.59 (Google Transport Security); Tue, 22 Sep 2020 08:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@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=CF7b6lhq; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBOVQVD5QKGQEQF2TRLA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=vAzLNI3/IE29EU676F+pqI+ZAcynSo9SPhXtk09UmI5/dVrjkGQIWhhN3w/sblKSiS Fpp8sgmjP1lnHw2XX3ohpVzy1rxFckHkolKAJwOu4XIJOqVbSBbMaQD4A0KHbkD4l+Xc NStlrWwN9/Bomm/aW7wpbXwltcSYbg2709fNEppj75VSk4K0uufDJu2ddCpAzbBkyPBx DKs9Ipq4Yg7LN/miChN5fdeoNw/TizoVzvJHcBxpydnRJBuHHLDj++PDJWzDN4MWSgMZ pERoHi4i6iDG6v+O2Ch7AI/XpugIaaSI0yW+z0Yctm5CmL1c3dehgA8Q+cpbPnjf/CZm kCHA== 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=FKyxneASVHiu9kocoUgh/TIW4UwNRZidmrAjWGW2Ecw=; b=DLlibl8aZFPrxGhm26NwjVNFdlD3kQtHZeVx152Wvnyn4AY44VrGm48dW/uyDgdS94 a4/FGAoQlVxReZohjZrGsdCeTgZxOk2nkfmJ0WT867bIA2eddnJN1Z7dY1qDkCkFn4X4 5U9VXrXuHVQJ6OcBPKMYgtautbKa7mXs5OSW18uR/76dr9J86/WHlev/TskUXTbRpqR5 jauxfbv6Mw7lOFSmvd3mn5FkKdiyPdsSGvn2j6Bp9WEenCL4JWz6BFS3Jr4cBwpqNswS dilF2LynbLiJVOtv4sQ4ijLco7VzmxEJVY5aQVeeBPWJ2WoIS8ml2aOQlbjv1B/1iz7E dPRw== 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=FKyxneASVHiu9kocoUgh/TIW4UwNRZidmrAjWGW2Ecw=; b=CF7b6lhqHPUuKI13GG/SEwM/BfsKKmGODOtpZREJYjVQryBO5+WQLeLOBoymYaU9Uy 6vBi9KyZCvLmEXBIqREgEbqladzFx7vu5RoKw7I81dNldTcn3G8OpYl8hCu8IbAt+/Np rNlNwF4DZAV1ky3x0qF2RETcaO/xhKs2SRMqf2sZiCsNS587s9u37iphGJv6fJ8PtsnV geoIj4RGdBofITaMCPGlRJAwCShcAd46lTrIqgP735jiki1RDZKe3YPT+q1kmnxurV6B /5hdGRJNKcnePSAjYrFoqxKKrncuPxIb8hky0CBNr6972ih7nO1Y0Klz8ZnQQOYAbhjU 0VdA== 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=FKyxneASVHiu9kocoUgh/TIW4UwNRZidmrAjWGW2Ecw=; b=o1rS4EXC463CaUJa+e2CNTFqvyBcPTLu9Xiz5Nnec5ODCVfLW4bvzDFoVrAGEsIufT C4Af8QJmrCJzhekjN7jWmJoH5PXgr9ELXpxjmKcphDGfA3dOWHujTjHfVcbKQcSnFbgm Nn8/HQSgRh8IjkSTfXGmltE4AwidRMh+Tjrg2L5kkWCPLCn4vlyGaFjWfjAf4wlI7Q/Z UJ/cuEsis17CH32zBsjmFMnYzSGnMZNXGbK14EvXgMeAzs2OSuCVze25eBJARgxmysXQ GKp7E7oWUftX4cIcZT5vvDcFyi2uzIfYZ2bw5/aApr/SevQ7o8iVMPDmJu9Cmc+msobX L7EA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533PNBPnEi2iX+FRQuus2RWT1qyHueU91Cw0b/pCcN6nvJp5qzL8 M6O5/RfOgwS8mZQMZryIMgw= X-Google-Smtp-Source: ABdhPJwRpmskUV70if9MQ/JGnp7QiEp3/08IMP7AL1f/sJa7G/XL86JWUyTfysr77mcyBzg8yk+4Iw== X-Received: by 2002:ac2:4116:: with SMTP id b22mr2068074lfi.224.1600788538951; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c7c8:: with SMTP id x191ls377517lff.0.gmail; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) X-Received: by 2002:a19:dd6:: with SMTP id 205mr1716942lfn.228.1600788537516; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788537; cv=none; d=google.com; s=arc-20160816; b=JF73XnuDLLVCEAK386rw5c9KXCD2oKm8KO8mEHPwXDDyWxxNSc8WlCFmS/Irp06RUF n2x376pk+8fdTKRsWJFvtDErrX+arJn1HYPj9Vvftkg76N4gpJOpO8ssmP6j8i507fRk 9aEHbjvPpl7KStbs2/vxaW0JgcMAQcpB05RZGk5VqvxlGOF9546wxc+2jZONEyWLVjEn LB8SMdQc71GTkPvCHLKDsPCWGkeKIKw6VQauaFCoC2mS89/G+dw8eVNWY9QT7bIaTWyu ZYV1k+3hhlYv9vwM4v5QboFPGVHcIJb6LhtTqeiNqBAuhxvcnYHlJ3r5JY6dTtrk2FiE Q/sQ== 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=6xnnwq0CokJWpLaLIm5TSUmlrG3z9VtGpIBre4xMRgU=; b=Z/EMpUtiUMdZWr/vZS8ic7tcSSX6kyK2lvMnj1Iu/PilbqD4e0LzCUXLokCG04Kls1 l+DbzuNFGAbiGhg6nPvLMo0ewv7i0mLD6JjlGUo+/mxPnXK8/4HIDNCeb95YyTx8+xcL Q1liSmWVdBVJncI1kjFcohRUvH045rb7U5QSVb26AevrFe9mdeFyzNWthE3hjOARoY8h ERCLKhshYO9JdO0NSPvljLKfRNTnvxtzPA8wBPwEQuR8dMk9QxDnYtO2qNbnbSUHgnSq DLQ1BAFlq7E1948la+8hiENXP8mQ7c3hSba6XeQ6MmaSH4MGGnQBVSvTiojEvXyvAhnf HYhA== 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 z6si417581lfe.8.2020.09.22.08.28.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:57 -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 08MFSuHM017550 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:56 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV7031723 for ; Tue, 22 Sep 2020 17:28:56 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 04/16] meta-isar: Drop outdated cross-compilation comment Date: Tue, 22 Sep 2020 17:28:42 +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.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?1678548443476481657?= X-GMAIL-MSGID: =?utf-8?q?1678548443476481657?= From: Jan Kiszka We only support >= stretch, and all archs can do cross-building by now. Signed-off-by: Jan Kiszka --- meta-isar/conf/local.conf.sample | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 274cdaea..e842c129 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -173,7 +173,6 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc # # Enable cross-compilation support -# NOTE: this works on build host >= stretch for armhf, arm64 and amd64 targets for now. ISAR_CROSS_COMPILE ?= "0" # From patchwork Tue Sep 22 07:28:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 76 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470970ooj; Tue, 22 Sep 2020 08:29:02 -0700 (PDT) X-Received: by 2002:a2e:9b15:: with SMTP id u21mr1811674lji.283.1600788542639; Tue, 22 Sep 2020 08:29:02 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788542; cv=pass; d=google.com; s=arc-20160816; b=zel6n9b9v3AZ4GIPUP1RSkAtlBcQrzGEFSgr53vmS8qCm9ADOgDgNiY7nQyxPjpqH9 ukaJ7SPmzHt30E+WyY67ewLT/2fzpY+fcpyzaAA8YbuVTODyBvxF2s7W75OD6KiHXLZz j9UrycGnSndbErTGjLqRkw5X79Q6yIig8Ux5ZwPqu4jri7Uwj4F/lpcce3BNVnVXSOSp yOjho4X+ENMswRQs65NR/uNrFhznWfU05jhiEc83Uo9ND/b5tjyPmNVazlv/o0IASydr q9kIR+E1J4kyrJjIsTwvZa5gMNzySiP/necZkBMWdIUMeaOTQd/h/VDRplhCDBlkjoVj oTBw== 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=HvPrqrxc+s7dyCBoNreCKtFWl99MWBT3/o9Ry7XGciA=; b=IHkGYiRe5bDPte9fRlKPyP+ATVII2iOcnMJpExeRUIebsJGx2iCJgTDI9pVzj7wb7D jqD491t28wiCp0KnarHBSJWzB9sIGBvt4xBG7V+JVEE/uLp39dCI1f0Tx22dfrwDURHw u85qu4q4LgHxiyA1eOdZitPW1N69XyXzOEa7e3UebYHoNXmyU/nyQ4mfQgg5OC3gkmiR SEBTPFLxfjgIf7NPaX4gSfOC2cvRj/fTxae7Slu+F6zIJet0DSDSAVKluLdw34B/+E4X mBSKIAUIWmiM/6hRVla2tm8EMVXhWc1W6KC3ekrsgIk3A9RsCJ1bXYxBlbvD2ZHAMLx0 FeGA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=DYHYiz7H; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpvqvd5qkgqeoucvljy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPVQVD5QKGQEOUCVLJY@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 j16sor889344lja.33.2020.09.22.08.29.02 (Google Transport Security); Tue, 22 Sep 2020 08:29:02 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpvqvd5qkgqeoucvljy@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=DYHYiz7H; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpvqvd5qkgqeoucvljy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPVQVD5QKGQEOUCVLJY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788542; cv=pass; d=google.com; s=arc-20160816; b=IUxi9lIWGmrA6r+6zJoVTIwRWsEIAdMX46al4Jl9kkZb1qtko6AWTaljm/GPyolI4K m5gcBYjPNq5mS2s6DUmGJGVWqL7wsvy5YJ6RZmoYkVow/unEgIB/BsB9QsAT5ECfNGWO ziccgNOB2f2z27IvaVelLlqZ7TLiDDUo4OdsCXR/HsWOpbnN9D+AVtPlzecLcLLaFzbL hQI1StUSEiIGHxNKsRp8DTGyIgaqOZYRdk4IAjsf0BgcZI4xccX9x8UqM3JHgshaQUKJ jW6WXae0Nw/nAY0cJ3Bo+qT+AqH9IK8Qo8by/w1kYzjeAnRVHstqKvFDn/K2IFD9LNWE hOEw== 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=HvPrqrxc+s7dyCBoNreCKtFWl99MWBT3/o9Ry7XGciA=; b=Elqwr+gFoYCMbNsE4lKq9LdG9cj5VAHBEsfroJrwd0rDwfnBymIntKoSbNjP/SoS52 ualTD4BNFAtlzWaFh/dhdYlK99TfeMrc2jWBInXFE5oSjHppnLdxRwpc1BDqf7v6h2QS WiTqsvzaZ5XTv4fljF6ATrjN5ZIWSr/lIp/EtCVwlocln2A6TnTL6fYbcxYF9pRPLdkY 794Q6v0L3tNXE1q2BWcepTsp8PIS7xbL59Igu2hgAUMaM4J7hoFySmmlr/CizR5Ykjca sKfSb2OxDN0CfI+guWTRfTveKwkBABTkT3xWyZwxTvyrPCGhGFEBAuEcaF6nztkNIT7E +ceQ== 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=HvPrqrxc+s7dyCBoNreCKtFWl99MWBT3/o9Ry7XGciA=; b=DYHYiz7H+f/qzttC8Nlq6yNiVWdA+pooWOR4juuruM46MFtCJ3AsoZiQcBTQcXlxsG MfyMzgajLWKwFuHs7Azwfy3yqODOrvQYW63SkDfe5nMZSvj/8FMd22lBqjKVADP8LfSA feuurQ693dt1Tr3NtQj2xxHOvMuscFBfgGP4oOkKDyovQlIb6rMtF1rvzXzfelNxtyXg BbO6sH34ahXtaXWTQC8f3bToDmv7Nd3AB3L+TCKnR5/MvALDDXAJwt3f/d3/sDGRcYHm 3AXw09Jpkea2U2z68GO2SD2NXfRHdz2KNZv9/7TMqAJZCLracZdl3xKT7SWlAG21BiZW JR4w== 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=HvPrqrxc+s7dyCBoNreCKtFWl99MWBT3/o9Ry7XGciA=; b=rQ4vgrky6EFEuAQdgUXVidUqfJn9f4XMQbj6V8BKzyn6UqnaUoJdGARHaxMkMt1pVh DAdhUpQ8xBcwkWqEJw/kXXlY9yy6LaUZcU1QC4Hx15hfsYs412gjmJ85kfAcqXte0wrO ueO92AmyTBmMN+/Yw243G6Wq7eSJlvGQc2GoWvlBVX2/lEoqwIQ0gjjyBl69mFQnmUnU hpZAXThSaQrg8ykQOiMBBklzH2tOEG0pNad6E/oR1JvLAIyI3u2jTvWq61PUE1mGPJY+ PaN8HLhbtoQcWfwQBqnTIY5QyU+TV6Kt5GX+DZQW6nsBD3pJRAGaKoYuwfvM8TIlY+DM ug2w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533gg8Ngwj+GvTl76GhAUhYk+ATxoNeIUeF/JO+ySRXNJcF4xwKt ewJUal1Rl/hJEEvh+4GyETM= X-Google-Smtp-Source: ABdhPJzIjbV7ashHxdBt0Lraez/t+N4zJcMc68sFxcQH8kNslImrLIEFAk37axMZqJXENTAOfzrXKw== X-Received: by 2002:a2e:7a14:: with SMTP id v20mr1788384ljc.429.1600788542304; Tue, 22 Sep 2020 08:29:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:93:: with SMTP id 19ls2243250ljq.4.gmail; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-Received: by 2002:a2e:3507:: with SMTP id z7mr1580176ljz.317.1600788538885; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=zLjCu5Q4NaXX2VYLNhvKf08ROoPOiz+8d00eJ/TGs8b1V1hBq1H++qvG+Pxl7a54E9 p9mL3WruDK+CEBxQk0aeszkoCNt+XXzNlSZhkLEX5I/0sCkK5xYU/aR95pJ6OVVFXLMc kG9BKQR1akhuiWnqSpCu4eZ7diZiMcQpYoNP9eKlylppWcaeRARbvsfMVbyZIRMfjlH7 Xjla7tRPPApW8bsy8H2dDBNyh7In1xe/GKm46zv8gUqXOQDbhl/CAwBUJg6vnzvnODlY ZT/f/a+5AYqztRqW5cEns2a0b/vKDAH3l7r1sBwok4E2x6LLXqkPsNT/vKrLiy27jtPO hFfg== 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=g8TiFA+/7LN6wx+JLOU3Hm7x7Kq6DUh68An7+qzjiuo=; b=gMH5ZUC4ASUGRdw76UGMx2VqUWpljMZ1DxTghCkjbTbur3s+zPPjx7xmdhYPjTapqZ Ve9sRoM1JMzv/lrx0jgI9H06MlkyyCyLwEuzI6+S89FTPuXH6kwH6tB+r1PjnL3nJD/y tNZVb8zeKXZ3f6XDj/a7HChIxhyweviACzN5L6HivBfOZltYgXlS3sasSsynSRPtTwXZ CF6YXxDM2e3HseWr/GBbTHy5jqMSPUW4PIbNnpCF+gh1RM+eOaLg7ltkm/Ue4VyUgd3Z L1T8k7Z7ztK0+xfOo6oNGFl+MbMLRgDHIxiDnYKHg0PJoa9jepDk5FFw7rbA78m9I36F dyRw== 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 f23si33184ljg.8.2020.09.22.08.28.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:57 -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 08MFSuaJ016742 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:56 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV8031723 for ; Tue, 22 Sep 2020 17:28:56 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 05/16] qemuamd64: Fix OVMF path Date: Tue, 22 Sep 2020 17:28:43 +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?1678548447120498214?= X-GMAIL-MSGID: =?utf-8?q?1678548447120498214?= From: Jan Kiszka start_vm does not work for amd64 when trying to use a standard Debian installation of ovmf. Fix this. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/qemuamd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 028b738d..29fc579e 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -14,7 +14,7 @@ IMAGE_INSTALL += "sshd-regen-keys" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/share/ovmf/OVMF.fd" MACHINE_SERIAL ?= "ttyS0" BAUDRATE_TTY ?= "115200" From patchwork Tue Sep 22 07:28:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 68 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470918ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:ac2:4c07:: with SMTP id t7mr1751941lfq.194.1600788539621; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=KuWBQ8EERJwvEJeZVVkRKbmJQdeGYKdO+oAU+AsOvpST1H62ZI/xedQ8xhED1COEZT VYn/YizZnvCQkFX59Gm3uA54InxLIGrdAZ3/ZL2mkqszG1hDQfUunVs5hi2yQmHJKOyn 1URmycimpzo9F/+H2TCpzwMacl7K0xQqTyzRST427uuGiBl90B3DLmamqftiS13hKzdp pa8/cWJ7jpYrBXaMsXlHxigVBGNbjFI1pvYfFX9Y2l6E0XtUsTeTwoOZet2q2BnMzeZV axQV86lKqvzDBx9x2ZWs3d5izsCfYzymKURWiSsU8RzmFIkDJoRqACK+7iLha1Zk67GZ hg/Q== 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=Ct/EC4rS707nAt6isZjvpEhKUAn75el9z4feI8OgBdU=; b=GhM/ij0/oX4KoNnqbY8MTS9bqF8mfii5QG5tV8NxPYrqNXbFh5Ew+tOBW9jY8M5NsQ wNZQ7qTfwPZnrsGFbWo0y1xoUlJY4VibAyfvnghItibbnVRIchFx+v5JTcji1RhO4q5O ACqJVP7GkLanLOwccwebuNs7NSUhvEpMTWbmucrFyX9GcWl64wj9IBPFSukCfK5p4lgh RMBPQUApSortMTNkLSNy2pDLEc5ESq/nXMUcb2T0boFcmOJ9skywgrqPm6vcuNQz42S4 KkZ0FQQBtNr6Dd6lcnaVB4Ow+2UgV8qEeI/NoIBncEqwrsnQFBNno6jQCdYhwz8lxzyX B5Nw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=HtvHtSIv; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBOVQVD5QKGQEQF2TRLA@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 j15sor2988044lfr.52.2020.09.22.08.28.59 (Google Transport Security); Tue, 22 Sep 2020 08:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@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=HtvHtSIv; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbovqvd5qkgqeqf2trla@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBOVQVD5QKGQEQF2TRLA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=CPIB4H2W42xy4yehb8+JAfil58IDPWTOEvvHjcIeCMV2kJvGTWf3aWvf7+a4sxhFRv A7MMdQFtNwuP/J5pHXI7G0g/mnOfWeDHJWkLW0rSrmegisC2GR8xrzKKAYy5z2ZrsLT8 XUBlfNClADJ+M0iLMtL1KyGrjBqqsxmOo7gxxsngdnvDSxKZqF1tqbOWN89WnpZUXyhT FiEBdwAd2N3igmbGdkSetb93nQMDTn3aa+bXE/60qez82qE1z6tV0UI9VARcv/r0tHCZ XHBYDzEPFZDWYwjUIIRvkLmO5/2GpAfWXIg7p6Jq1W6Swusp0VAXsji8WQ0r3xhpooBI Q6Zg== 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=Ct/EC4rS707nAt6isZjvpEhKUAn75el9z4feI8OgBdU=; b=Ip6GwXQlRHZnK5wYVyXBgolODcWSEO9ilrMirqfsvyny4NdUSw9C+VBEMFhrZFnZOR oVAQkYB5IaJ89uGg+L2GejqHflQrbH/RjNOSSE3zmnd+ctTxnG+Y63LX/N7soGEjUonA +PoYszykGlNXu3EkT2osel/e03mm88xZWlg1Nx5rz+JkEs+E3vna/6RkNetp/kGS+Plz jtZO28voQ/JdjpNcKxEmXBrUpqe1wLsGrAPNUNbyxcmMO4Zs3cAOohO2FcnlyPXxXJwB vKvfYCytml8CCZQW+Wt83Ot1duosWiP5bFt8Jpxwij9tVSqQe3/Dbb37sUfBqd9EMrjT Ge7w== 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=Ct/EC4rS707nAt6isZjvpEhKUAn75el9z4feI8OgBdU=; b=HtvHtSIvDLAlPQMIZQ7lVyHs3ZdQVvQrdm64Tj76FJe9Bl1PjXyTxknNzJOx4+Kx4g KmtALiPDIUHehxcMxUferbAQLrol3QlhIyriMCAY+hhQlCunqpd6+HekJ3W9aDJV4exs 4vjR8RkkisIedNIJ/RsC9bRJSl2jrXODLkRRv93K+PuAEd3audyRgPRKuoK5Hw7YClwM Ick0HePQoW8fQeKXzPnNo8yOzwBHKaF+OW5NXFnlf3No+3c1rF6aQLU0Qjn4dj1uI/VL ycw7iCPGg0IkRDt6oqaq45XMfyiiGuR33yru9X10CgFmDP61j81gsEbk0/5L90Fj+0PD fZNQ== 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=Ct/EC4rS707nAt6isZjvpEhKUAn75el9z4feI8OgBdU=; b=ppbYcJLpKmJlxzAubKDCtarwfGE/RruzNzyaxukLyrlO2PhIhipCIv7INagdIy5haf NZ3IqGd6nwUVvVgVlTpCzlcyT5GeKLZBPka/rcJIaH/swqYho4Zjn+TX6ivJs4AeKqWB 6ta2OemvQAQHEOKcyR3Zy+qBpy6e85cWBodicHJ5+RgWsCuuewxb/8bmkeOT/gqU14xb XOV6VsRbDtD+1WMxHaDaoiTvb6U+CBqARpH/RTqxi/k5zwDDdveIqjP6yTnQ4xOkdrOn zbtPZrmFc6QuFQuUFfU2BNhhEpr4eXUu0JPS0XJcqD7I1eFAF5P3VcHllgtmmm0b3uhQ I+wg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533pyKx3YPGv31icleecww2x4WBKo9g3Iflj/f1c/KptzTliwMoz Op9yykGx4AUc0vozyMnYTMw= X-Google-Smtp-Source: ABdhPJwOH9U4R7uWzwFcJKQnNpvWJIAxC2QKcjQUZb04ZCL/Ki7fEtyMR51DQDpJtp7D5HNVSmmr8Q== X-Received: by 2002:a19:610a:: with SMTP id v10mr1993511lfb.414.1600788539217; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5c44:: with SMTP id s4ls378492lfp.3.gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a19:f50e:: with SMTP id j14mr776367lfb.426.1600788537945; Tue, 22 Sep 2020 08:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788537; cv=none; d=google.com; s=arc-20160816; b=iJdsqaoWNUr+9GQ8XGUXQIXDUH3Nkxc2ufUaqUIeOOKaFzlSbbniCnx6yclNH/mVoK dqqZf0vwM4TQcrla2/s7ZpVqhN2ppnAv/3T8jiahSxc5HAq6hdB6JBMZqwQ374ULMjpq kEQ72b0HwAVS6YhniDvTp6CJZf5rbWt1VfvVpZBeUZI20QLfxa0THMDJfBNoCuHtoe/B Pg+FLii9/x1gWcBvAoHYrbQu2/bPxRKV3hMx9mwI/G2ryw48xbAxxs+ZcmE7ugkWDdB/ 9zFoDxAlRdhqrUHO8GUs+EOWyYKiecN4nsxjqj1AMJcxvcOeoM9V9oQ+zfRYffN8mmvF HCjA== 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=c00xoyBRe3bDb83JZxuVd7126t6lSGjUeVtsU5wO5mQ=; b=HztIYb4ZN0xvOHO3C7IJgBct0wGqQcDhCaekj/bXo7w3ndVttgW9ODBfFpHHKBFpg3 BY1IU8rI72bevNgvkgy6YBiEbyMqSKxRs0Cj7UEo1sSPRCAmPl0TfhW/WOC6LO0JBL4d P3icUlLx9pr+v978ft+QO16z+M9daJIGwE9z7tcw6p7vYzrBeOfvMQ0zvCyMkuiyJACR TAZa4trnZ1pg0r0mOhWJxeW7OpvTEwIPd/zeyddruBNl5clsV2eCOihnZythoMBF/Ig7 KPiCZ96zYpR+NdTNtYz3gUd830zKZojyYPex8YpSjioZeujfHo0oTUm8A9e+04SfjWOv wioA== 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 v191si376349lfa.6.2020.09.22.08.28.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:57 -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 08MFSvcV008489 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:57 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsV9031723 for ; Tue, 22 Sep 2020 17:28:56 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 06/16] sdk: Add support for adding self-defined sdk packages Date: Tue, 22 Sep 2020 17:28:44 +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?1678548443812289357?= X-GMAIL-MSGID: =?utf-8?q?1678548443812289357?= 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 d13a74e9..fb6574bb 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -744,6 +744,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 467e6824..ab0a66dc 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" @@ -21,7 +25,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}" @@ -31,15 +35,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 Tue Sep 22 07:28:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 67 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470915ooj; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Received: by 2002:a05:651c:107b:: with SMTP id y27mr1560654ljm.338.1600788539669; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=iWg9J3nVS3cyLSP2QzDqtnD0+cYI+nXwSyKQ3Yjmh7mXWulZJGjV7Bdir8cNEs67WG GzeT/x9xp66Yoz3HNg4bRGALkdouxGARJ0B43Jw3+GM/b5lhJqUe1ngPNXQ1cWHZcN1y /jvUNAufN3RODxlKFJ8I/8LRsSMA5b+wktS5+ZOTxNgV0Md3ZaOnK6BlEGhcMyYdgCpM 97UKHFkii2ltYnxdxHEQq+bSu4BA2uVSb4iwuWxgJEVcBXtHIlzeG2QscXYfkvXzz503 +Z3H1xt2EYPuX58pKck9jiHS6hpVRFv7sgL40RutQYyGoPvQW817BSeDy8xgSHuuCVRn kLFQ== 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=kOX4RIQn0GMte4Ue1cOdH3if2LV85WUye6EFiJ+Vsd4=; b=DvZy2Odn7ZYvdPYPDd1iXRDAHnHcaXQJAxa8v6hJHlfqwJyH1Tu5j4tnCBusSOd8bH ATzreXiG9gMl+N9xUxIrbrOmHP40VHAMgyHJFkk1c0El3/Lzglp9wJy/w6z2enyvUa6P rTedKJNTF5qO8k1rdZe4y8pmCjOn6y1pECI8UA4FXW7mxaqioFb4V8yogw/pWFkl0Mxg Fgannj6sZpu9R3moqDO+V/LcofgFX9c6OIyCSzH4Fqigi6WLkAIPilfMuXXmuys6LNeN Uk7CR3jiONf0vO80vmI/1dl8SWySTi7GnTAfh0KuICnfQBSFQtSLTQZR18V5QnFSVwJZ rgvA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=D8mhoXgg; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@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 f15sor2882901lfa.137.2020.09.22.08.28.59 (Google Transport Security); Tue, 22 Sep 2020 08:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@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=D8mhoXgg; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=J5V9e8vzzJl2PLVKpwjEoTD0O+sieIr9l86v8BtEBDTMCabz6tpatg5g6lvAhNscco 1SAGqQIjtq7RFA+y2ZQZq4nyaLa30icFrsmk+2XBD+rUcxQq4QPTWihGS8q802EKDBJG uRnuRjqlfJ29jANlCqj4M1wzrEV7J7BG4LF5TlnibEjkn9Iop4E+W56tC42ZFWAVv3sa G8PkzxSBES7zeGmmcecrJX0EnE0WzgsvKutKtGlF1EzBSibIdBethUUcQ1+u9nY+CrhL BkXbVvEtNssSuE0+DhoxRsoTJxLuBWgygk/pwz+fznLIuAEzBf5uZ8r1iHB/AtTJUBz8 Pkmg== 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=kOX4RIQn0GMte4Ue1cOdH3if2LV85WUye6EFiJ+Vsd4=; b=S1bWYLFV0iDN+LuyIyPiCqpbmDirrJUHCoN2Kdqm4duTNKulnofNf/GMG3u5bVT8mW VWrjb7ZAPL5uGxkh/3HyURrlDSJONZ8kpYnkqF3lnhJXp77fbh+97XOowEotJ3R8YEmn pnmcvIMR/QBPa4zFBmgcI0dLjl72vxNBbV20VMyw9YrRaQsJLIVFyC+FI7gMqBTFvu+8 Cnq5aOoH11ofasaZrye3C4SC6vYlc8RRWR2tMLLk6QkqN8LzQTUqInkkUUEgihopFifZ LNNZM2evYP89A2D/yyjv1VzhT9u/FFFYgnmrRYgeVBHAoNwD/HFhKy7AUkrbvfyaig+w HBaA== 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=kOX4RIQn0GMte4Ue1cOdH3if2LV85WUye6EFiJ+Vsd4=; b=D8mhoXggGXsDeFJ14ngY6gR9597aBA7bkdDbrATPU0VmB0lMJtwtKulIhpfxAfz2J6 UeAYOQPggPNB2KbamCiparC0LUYv9H/iVfuL/nsKGa2PFpTnWXsWZIT788ytsBZ9/cJs GCFX1o7hVf85LGMo0PZ530S6CrkBr9meLpKHO8AqxbNxk/4Jsmq0WZwJkAFuFP0bZKnS Qp4ZehaP/+pdRssIHvNqQbG3Bi02mDhuhAFIUHre1uDwgFtBU/GEUJuqncNtbpZIoXrj wSSOqnFc42Gf+8yCmjlWANnNeI/MYn47x/Hx6BEpOx2731z3KKbjfMSuIeygYWATdHxP MwuQ== 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=kOX4RIQn0GMte4Ue1cOdH3if2LV85WUye6EFiJ+Vsd4=; b=M7cBLnAP4snzYwqVkFiB+qjMjS1MGUm+EPIxFWenc0bYadS3r/5XxmS5VZuZFagnTm ruszJblodPNeeSTLtyvWMnBH18awM/5z1LwFzC+OVoOA0DHjuHB+P5+c0idsSV90x1cU jt6/nU9XnTLEeisB/BbVZDBr919g0N6MQUL6T2Rnj7DBvf/C0vbAspoAn4zYFRDJKCYg XiSpoPNutdIhZx0wBb0oZSxOJj5rhag8uPAMMehfLAXJPpVx5653Lnfhds378Wp8DYH8 CSIRGvrYiby7R1Iqjg4Yj67mY53UGiF2DcnJfqK3FTsc3B6ya4mwohsF5WcHOX0I+GJP j3kw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530IzOsKpsI49AO6ViKOxOXYIh582rLtYkNwlRgSEPQN2wcOJuyL xrSToQ/KT6AuE/2ZKXmBO2A= X-Google-Smtp-Source: ABdhPJxm7+EvMt/n06gL7WRGLmG15SgJ76725LnGvqn7fIakXGilg64pceDVgpl6AtOtNL0MGlbmNA== X-Received: by 2002:a19:4344:: with SMTP id m4mr2015439lfj.181.1600788539294; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5c44:: with SMTP id s4ls378511lfp.3.gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a19:7e02:: with SMTP id z2mr1676582lfc.501.1600788538249; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=xCCc2YPUR44R2PjFGvi2WjJBg4+odf5NrYl7107BpaRhm0VknWGeHyzL4re3Dsr0T1 4clLDhpoCYjG6U+znUjwDUF6ysYRhyWo4pQpQIZpaEefdc89sLeqO1kvsIJtE+yWWkfo yAnmFaFk9CK7lKH9asHpnW6Z0oPzNf9mJm0ORA/Owt7R6tDmDoKnyMuFeUDdJ+4JcvgK RgyLpFDNx5TuKJRRwC/WCLoLhXK3f+69uzRBH7H4Bq6YDrAqbM/xz2/pAcoj0vkOtq9R ADkGKP/8KPsq8wAfKuzd0PT2Q8Gd23YobBLPoGn2kHQWGj9qW1aPyRFucLyd1NFJutrT Nlhg== 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=1UC451pqOa0WP6HfWQ8msrb1skBh+gaFCi7Su1EJmlA=; b=jUYbDrNJ4m7S1k6Ef5BxlfC4tNtyM1sqScx2FrOiSA12motI9AZx6a1fDaMBEcx6bS 8hb+iWBJy5wG2cK1BbkxH6aUswSte8FJtuT1mNC2tLxlA7UCK3cCU50XidBhYkuHe+Sl N5ndt0KXGgenEPPSAkXlnhJswdfWxXW84LaoKBgVgywf6CnLwnqZXKCVWveess7Njnit 35zPd7swImFUkPSY8nKtMiP5Bt7zlHC5jUL18TYleSaxZS4DaSK6fNW68rIq6iEd5JmL wkwEbadeXiXgedaBnYtYZ8Xfju8dXQY41vZrAgM6lspSAI+wS9zfWMHxnfJ0Yfvof6vj TM/g== 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 138si373322lfb.12.2020.09.22.08.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:58 -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 08MFSvKr017570 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:57 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVA031723 for ; Tue, 22 Sep 2020 17:28:57 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 07/16] sdk: Make all links in the SDK chroot relative Date: Tue, 22 Sep 2020 17:28:45 +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.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?1678548443835345778?= X-GMAIL-MSGID: =?utf-8?q?1678548443835345778?= 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 b9f2cf4a..84ac9c6d 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 ${ISARROOT}/scripts/mount_chroot.sh ${SDKCHROOT_DIR} From patchwork Tue Sep 22 07:28:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470920ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a5d:4b86:: with SMTP id b6mr4308580wrt.173.1600788539956; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=AJEmqSCFUAddhozwh7De8X9SyBll59zbVV60e2fVC9br1iOvIuP/cKNBshEzrV+fZQ aeigl/98ORYxOi/qS0jor5TZM2QCQYM9qr6DCy4KlJxG0Cc59yskn0J7TE4Y4O/gLP3J O+C0AR3raugVig+xA1jEmGCB0D6rv/+WSiAVfBwNBdTj5JQA8CzgpBOkjrZoY1Y0lrJa 0SmOAt5fiJ68VBHaDIiVwlMSqI+YpiQuWiwntN8G640BTx13FV2gzoVnJ/2PwXM3LZt6 FfqK/yegIdld02NLTTYdPBCLeSGhqsZiEv+7yBi86ComRjy7zMZGAns1qJGneusbfT/6 /o/g== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=Rmyy3+W24n1/ZubpFBH4XGTG2FNiE7mcMkz4cHIwaSgkT3xj5W49jOUFG5y/+/Hado DguERQOBjoTTlrbceEfuoTcU1htgkDP/AuGhV9llxRvaQlpk4GNXwVy6SK/V1/I/2Joa mFF4yPtZVnI0LcdPLgiamS9BePlMe83aqyjlqoVvS6dkMovlxus7dSwGQLJTOb3i0B8m vJvdh1GFzAF5gitutQ4DO5nU2AlszvJFf7cU65bS16BjU4trLzFL0QCNydgXRIDGamL0 8A+HW3s7K67ViLNvlUfdA7d8zoDqYySSYQTjwJtXtKgedC7VG7BS6O40ktjAEIZQSo4u s5nw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=fxZEdfHI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@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 w128sor1950867wmb.28.2020.09.22.08.28.59 (Google Transport Security); Tue, 22 Sep 2020 08:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@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=fxZEdfHI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=qClNyra9jAGSV4XOAWOHbrICg6SlDQ+H03dJs9QIkBRLg80AjNTGWKrQoq6az4aOrf Iif4e93joj7KWY7BIjVy7pLd7KGvlOIRpaadpF3VyMFDBJytFh0gLk62FA1uTPgcmQwR dDr2XHMP/00SSackLEnsNoWR4Q5Qp/AHpDVapM9aLavbkxJDIRe1MX0jWEM8Qe246apk Q/DzwBiunix7TkzYgPPskB4utYb9nRrA9izm6WAnCkzQb2gTQ/i7lZ8amH0HmsKUwFJl IhGUzLTrjWPwKynm9gsQq9qT2zPPTbvsO2XOoX0BuX4nJdA5+QCILztZEXnT0e6JKGWY /z6A== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=J/1jRBvMQJYYK4vDe5rNHk+yEfqUK6OdCFMYkV0c7DfBpzjwQCjpdWV3TZlO02Bcjg Npcr6SNjr2aEqyx0iDkxXaiGoHrejb3snn90koAOL848y25a/o5ufGH/fRZHL5b/kojW lVgRfIG5BngAJ+0we43kNAUI3WF+MO6aPVQ+HIta/vdC/tgf7HVkFDU/kE4IsU+TgXho IBChA57yypq4FC/hn6FewXz8QlxoSq0m8zR/iA++2BMrTW4Tkp6Ro9ruTCXVG8H/Jmjf tA5QaKuUkzWdjb9iAF/QjHZzhE33oRrtWHwqjcLLos7K/JbdGvb3/5T8aFFt6GDtgd08 4nJQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=fxZEdfHIANbvHXR6yjsrLxPw9nqjGgwqZ7OZSbcVBQaVC1hSms/hnp7w+dAxvOgwri wSeoRQJWCD7/rS5t9ffIOj7FXEumfSVNHy0qrM3fB6WPABERAzlTzVfvX8UXkuY/3r5S 0Ae3ff+/joV4XPevOQclhjQOYsoL0H43+hhPnPRKLlurd1onIGa7VSyp+bbKW6JLz6UC wBVN0/S74ei1KhVDSK86Lzzx2CRzZwW/Wkt+dhBl1SoxmEKN9XDaWTWnlpvpLEwGEG3q v3UUcH69+vhW8FAxQyBnd3Tcx/Svnql3Qgv9gSgpDKGO7+5WNFzjgvhHlDY8VC8pgKYO DIzA== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=JcmdfBQ248Uc1bEcJT61IzDiptqYHW8DEQtt8HsOV0FRUJNfbLfxCtU6V0LJhKMl7O QwjxYbmR5dtS8YnwVKbE/srJDemJ/IMvr+pkU4c3QH9d0BRqQToPVFBu1oL/9vNw7NNY UoAfMHCwrRyfUg+U0gLp88T652HGAmxHkf9q++AMx6jwU2qU2ohUagv6TcPQx6a69dmf PixgCmabDqXp+cYDczNFOsQqJQn8WZmmJsbCWWAfzRcgYkEeDobp7TQJq8c4iOuThadq YOIiybX2zR8xUZQnX98dy9Mi/7XDurMUws7XWnWznqks7qRNr4VKmVHmV70+wcSUHuXn cfXg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5333joung9EF44B7YLDBADzH1OLiHKDmWkcTgL+wpq/jdrzHrU7R ZM1Shh5VRd9sD7JP30UcpIU= X-Google-Smtp-Source: ABdhPJwATFZdFTJDkTR37tArluiRfpwflwLknwzvc/Kw270wDxBIq6X0C8KZ/du9UpKu4/WjjUSBNg== X-Received: by 2002:a1c:770c:: with SMTP id t12mr1686150wmi.121.1600788539656; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c2c1:: with SMTP id s184ls1745195wmf.2.canary-gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a1c:ed09:: with SMTP id l9mr1607591wmh.89.1600788538650; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=UhlpXXQQFb8yAkv9DZ8f4vZFFMTNQhWHKlJtscfkUKh7os4U9FynFIQqcGKU8fJ10G OCPL9mWyN8pRIFzMEeObxRcesKpnw0fXPFR+5Y07ci/cW2FZLDUacPAJC/3sRGj7AsWT iC9raPsas9IZem2EtBTWeDGuQqpucYC9XfXXTZNorNRMlJk3zIqu3E4qzm4D5SO0IC2O C80ZV6PlX1rjpzVlq4zU1YXAmBmT/aFkna5pquQLEVaA9Cy2SKBe+xcRL8ggdev8FgZK XC88s8gNEVsGG7ArodmqFSX03ejjAeBC4oSj4M5e/A5q4mz6jXjD4eDoESFE1GHbYK7F fo/Q== 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=q58MMxBk01Ow2bFJpau7WzmX6HvMorLpcQ8SGnd8i7s=; b=iMuDNlKwaT+bGN23UnKmtV7yMTQeUZt71erXRdsvt14XKXZYg75uB90Q1X10Dyjrft 4TtgAEW2oUJUzyWfZXVo4XvpmbqT9ycnA0RU0XZKGp3cbUh5I4KVBrb3i/+pvvie9njw BznLznG5lhRZ4YlPpMJ1L2ghc/qR0UracfAfWEQO3ts9Q/YPVkl+9gnncDcQAn1QqnB5 U5cipJPx2Anz0AD9B41ZU0rYhSi3smwwHUVks60YgusKVyc9MSZmHJfNY8wQR4BVi8VG 13C1ji9oOEeo5OdWpHb/yRZOgajYo2Wwr4UIG4g7AkkJ7ClrKmX/kLo8tGlAjD4HiAKd bEbg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h2si113690wml.4.2020.09.22.08.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 08MFSvPQ002235 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVB031723 for ; Tue, 22 Sep 2020 17:28:57 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 08/16] sdk: Add script to relocate SDK Date: Tue, 22 Sep 2020 17:28:46 +0200 Message-Id: <2d6a8a8d664a0c2023da1d7a8520496e0418a173.1600788534.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.28 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?1678548444145941321?= X-GMAIL-MSGID: =?utf-8?q?1678548444145941321?= 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 ab0a66dc..2bc9d291 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" @@ -58,6 +59,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 Tue Sep 22 07:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 71 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470934ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a05:651c:107b:: with SMTP id y27mr1560670ljm.338.1600788540546; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=j22Ot5OKSohJZfRz2wBi2t+AyI5teJQ2cDDAG9gfghhNuuzGp5bqzul+8tOBsQnQqI uWb1XUj8edgnAvwm6d7oKlfOzDXNP/MdelRSSgmoLkW2+rzNonkar6jbpj8cuOSfwbHQ ykmUwa8THNct/Pv9jyndafoV6HljHc4XlmwZUO7P7/VI0801VAbDh6rdgDLENyfaWAeX o5XM5dj/79K39B5RirJrzzDhqz+Zm9lGtRMJD5p2kHmCRg5k1++GF3GycfUwrcInUOnC Zhy/gfZHP2zUa9UjKY8UwFbWLvGpv/xUKL3h1pKFQq++l/HdlTaCmjRBRHMM9SVTUAhN AkjA== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=oTsx11Ikd8K3Q8u2LDGFttfSwCZr3oDyp3nL4xtMYDZHRiVpQ8ZA4PQj1xUsR8/loL EH1ezXoNtgO8m6CIrk42zN51txgtfH77OONpufxrld6RLJfgYUl9s/QqRlwhgFxepYBw zKwhbk35bqTjId5+EJxL0Irt+nu+GkRM6z3NysiHF/wjhBK/oqxyVft8kSXja8BkYDz6 y2x3wRf2RAwv6cZ/PM9Kiqp1eMH2UR/eQe9IFhP4uFQ8DffVR9iSGknS2PHxx49OPKxs CoM6CAuZ1F9opNHwbX81iyw+DKTt5R63XCkQzrUVpeK+ePpsJrABS7mJ8SucV6GdgB+5 q6bQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=KM9vKyP2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@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 c14sor5017567lji.35.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@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=KM9vKyP2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=Fyv7NWCAGch4b+cmdzxI1fWOOiHOoCFFn41sJkrZCfaniFO5Sko0YfmqPUp/7K91d0 q6rfcLYvPb7pcmIBpPrR+O8Jo6tQmxBp8SfVqX0QE6mUydDsZ8llCFtgDMROHgqT+yr3 wKbtky9q0Cyvdf7Vnso1MboQpl5MEWFZ/yCM3w8LxYQiz3sGgU0jHrnk+zjB9m6fx3Xs diu/ziNd6DfjJS+Bv4FPXPckxRla7bV+ESR6v2jK0XvxzXeq+0e9Tucf03QELQg4HCEa gAqNjo9fpcd9N83wrFXUwBvn/mDvcTF5GrDfgocrrZzrpWJr32rRAyMpGeY0JRGlCl0P Kq5Q== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=JjrISEht7Jdygp13S+OY4BS+OuZBqSlDxxgxunNJR0r95GLJGu8jdvQEwpeMA84zzY N8VxviTnw315U9/xeAOh3JHZpcKBii/TEUyLFqCzQupFdxPLed++L2g8woN0SdVxPDOi uFlNBy0yp4hdnfqnhApCGZ9b1PD/uUoQBepmu4xlO28T621EGZqpoHcs60rD7H1m1bli I+msIqa2sMrojxcgIfpWkE1jUJIE7vCx0kqDjXdfeeSGH/D7UeyIQBRkwrSiOGoZalvL rhA/vJh9xOn/aNyf4Ob4jpx51RbJr93tGVsA5AZdDkCFL1FVJNtsO1n+5lGVw8+58PTg MNUA== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=KM9vKyP2yN5GzCFXTJiP8BjZoiJxPQr+6jnWO/FW8Hp/A/xWhqIexyJMGHPFdRQYV0 x9FCEqx+BEQ2+9SFlswZO9TWXuBpfiIoETR3fKWX/einOQBwIbCcDxEmKM/ovNzWJ4Eo z4Dm5g3jbYOUhUjLLrcSYZMsXx5taSqsDJAyCmdgkPWS30TcG3zIWL3yarXjMFCuWxOR Kq9jk/OmTi9wxlwrk39IotoR80HtdJc2JyA2Af9lbKyPGvyg9/HhUNYZPqE/EAQyO/rG /1eouqrxCbvXAs700T8QfUUGlIDYxmLM+OMh0Ax1+XLtlfDK2q6hi3Lj6EZO6suRceUT F61g== 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=Welu+y6ijMrxWb0KiRQNAZcLOviRmcnXxc1EPfo80LY=; b=OPaJKe7IwgPgqTPlUpVYlyOAwQbVdPzsLPPebscfoV5Um/WlP0WPDxc1OK3p91kLyW J/dyJrGzhyTRPcd9gWxvIJN/V6r6CflunWKGJrVwRyDtAcb7sE3Bevz0mlu9cxuJYGij PnMh1UkzmylI4L043FD4MQqYRxBZmUmyWXZtIRDs6iExKiNvVGvdD+ud7K1oDQ9aiXe0 pSgIOVGUS3m2EuyjtpCfuaqjrP1Nl9ZNGTpgtqXk5HRyTNhaZhpT9dJ/m308FRODkjcU aNFU0BCf5vPtD2pCFXDzKEk6CyUgagZqmjYhwBDIFd8XkSGZvbF0RYfpVnnytyGS1ls4 lw6g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531qc9sJxwzWNKNns4fOltM+iz7DDvby5bJ2e58Z5kg4ajWqq48F NWGXZv5GRk3fabXg2jdqgQU= X-Google-Smtp-Source: ABdhPJy/UorMN8wE3LutZ/ZxnTepFRzszJ6PXBkH8vdb6uqFjhiRpg0WB4RXzLdY2VyzwOKouNj6pA== X-Received: by 2002:a2e:8884:: with SMTP id k4mr1763271lji.333.1600788539968; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:544e:: with SMTP id d14ls376246lfn.2.gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a05:6512:370f:: with SMTP id z15mr1715276lfr.289.1600788538795; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=DLtW8lfRVjhjI8CohNMq7Gd3Bv7tZv5hqvZ31JqACixv7fjTRZDrKFbuXw/BoL+YZ4 8F8kjynRD/mtcZrkMEccrEre76UMOzbt5oYWfG+oywvo9cl71dYhDVpuQG+1Fw2rPzxn MGBMSRi6KphSQuuVr3MqMb79tcudjPritS69t2gbvGff2z7km1cSZzKx1MYjL+TVPz0J mnyIu6Kz7d5T53ehUeMY64Byx47f+a6HK2/Oiadp7j9dwUQaFoLhhp0ykTecr5Bqv6AG ZkVNkcExIxtEjH2lOjlqkQIZc34I2wtu4YjFj/DlwgRdRhsjcvRuiivFhG81/B3SjmEH d7NQ== 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=KTA3tzWjq7+P3Atk0mAsFLqFG5Ob1SvgbkB9iYC33Ws=; b=CX7RvBTwheQO6XC6JeW1WpT7gHbYubLi2WOP7n0gHbIdyY9NB6DTlSaB0+VwZN9gHZ 2NKcW1TSFVshSaz9BbCFrCdlpcJQ7pVDhKh5jMUSIHXF09AoUKQUSp5/GwQ37RlK9iVB 3gK9FZpxPqHOPUgMIoDY6eDHVNRu645Uh8iUVhSJrAxnXvJKTkao7Q/b6Jtg/ffoWDns 0KrG9AllmtjHCIEDPmwhO5cCnQX6Cr+7gaCzzRku9zdR7belVTrRl9iztBbFYCNNTepl xkWVZiBujY/rCB8dGWoAz2QrNnkgNpeP/EreA8fgzVcZs9dAOjeesF1TypEoh5LY6BcN iMjQ== 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 138si373323lfb.12.2020.09.22.08.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:58 -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 08MFSwV8008501 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVC031723 for ; Tue, 22 Sep 2020 17:28:57 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 09/16] sdk: Make shipping the isar-apt repo opt-in Date: Tue, 22 Sep 2020 17:28:47 +0200 Message-Id: <727bf9c021e03e0fb9a90239c2062d624c0f7552.1600788534.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?1678548445071139002?= X-GMAIL-MSGID: =?utf-8?q?1678548445071139002?= 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 | 9 +++++++-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 84ac9c6d..07a53410 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -8,8 +8,13 @@ do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" 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 2bc9d291..e5d44e73 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -47,9 +47,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 Tue Sep 22 07:28:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 69 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470928ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:adf:a49d:: with SMTP id g29mr6422479wrb.219.1600788540252; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=LhCWOrtJK22jA4zdDw0DkBDur533FC/0YpcT6zMzHnvlkchv478SYouMXHWU37pHE+ N7WchYK3NFFo5+WsPIKQH0eMMmNXvtkuwlktjFyBPkAiOL3cWqDg+ixp9GzLUWbkDzcl LAshnSJusbtNMt4jvsyhJG8LBrX4+AYCrbvj4KicjbuxMpEjdrvf2OyWr1lfW9+Za7nM xGVqwvt77fFDrViqDz9Aag9xJUZvC29R/XRlQespLb+wT7uMAEsYFGcDPcszaLozIQEq V0lSTj6JT4xDhWpA7oX6GHZmZ06rhx42w+Zrpl63naQMHLvzQT8ph+aCgpLoQ0KqG0Me xlIQ== 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=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=DRif6KDnJpxWx+2HenLAysTUcMPOt+Ycg0zulY4zrjPm6yc/tdVW7Q7UQeZB15Vzb7 WdZig5mUT/ovil5RQ2mNMdqOS5H0+cfBVvzd+76W1OKcJD0jrQYLlP3HXMgxDhkyw9RS m5uBz0XTa/BtayVTe02W1rdl/V6HweVnzBwDgk+XIW9iFPs3tyYewLmo8h3PVNl3tq57 0NnDagLkHJ+nmWqgqXACY/NuMWxw5ZIo7tSXoWP/WUhZLes+Ft4js5QfOqoXmwBXkp+N RIbnZ1KJi+O60JkucggOtAyI7JqI8SbQKuiHZ3+P/nxI2uA2LYkBDPWz15sY0l4DT9G6 1jBg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=s0PouOlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@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 x133sor2041521wmx.0.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@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=s0PouOlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=uoNLwuQOKuCEdoR/HIyZ6fxsI1SRCg5ZpikZ4eaKMvG64rwSzJv1HfiIQIm8MUwS/8 sRM72vtDv1BSMmCOtp0HLEqG4l5kZZiCZG9pQyMVw37Wq8o/yfHlITm6oOzjjOWNgOBV Shziji6dAaHRU2dO3lEPjDMhIPPuaCZVcMDzKrWTJ/9nH9cGHMtaVNRfCxNmBiSvV8bD rpIfwaF402fqBBtG3Bf8vAcrr6SmZPshZcP8SkOrcgqyvvnZ7lNOKz4ovRYxJ0l5ovPa LnTp08poA91KBZAyhYkPTKRLJ8yGFAk5o++QnD5UwWb8hCzkpND0hrp89hjC4eevRcDC 9I1g== 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=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=Xk6mRIluZr8wp4DV8ScT7lqHQ/k5mwl6VawsjR0tWHi6eOXUzkkhN7IxB/U8WXyU9J TtFJKTDGt58cQdse+vNfvOOWNcmNh0sXzIqF0eZQjAyJorncQoIDLjMlkJgWRSvNxB+1 +3u+YAvkOdttuYXuFLOnVNc9sMYdBip2jVl9tsVgiON3oSCAFnlT4wM30Xk+7spdt6pg jEYcYVupdvz9gg0JLL1JPDXApcPo1h7HOLwPOLTDSU8XhLPEXjxvm8+pxv4Ms1eATUnK gNkL7hEiilE84Pp224nyGWr53oD7QpaORQ6hSbZr96/Seh6QCcjyC72K8GI1JyqHjK76 7M7g== 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=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=s0PouOlNAx66VV2PZ/fo0rIDHSy1kYHfhirSOPMKvXXHTlfIdxpBlJnctsVL1app2u wEJgdVgn9Zm/QQMp2sKrfYwgVuYZwvpGQdrd7qkJ990W0OabviJbxwGKJUy/p67cTJLj y5jr0kTZg9UjucWe2Ue4ADsERpwE1clvtHY/+QYV8NwhhQ2kqxTh5oaZUlL934YP808P 2szYeNd7YOfde3kgTOlc53xXs5baSJzO0xB2NzhrzOiA1jpUinD34LkQHiQNxo8wtCRl U9kt6yxRZn+LtH7mRyTAtEK+QFFF2hpGwvXOMlpAUeg0P1q5MnNwgU1JGFIiDQ1JXVwF CUeQ== 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=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=YoPG//Szv/P1mSFBpqNit5+qeWKf0lkxrzdJIsTURVCX5oB4uN5+mCAdrs3zVjZk4a 0F+DwmIz681ttPUapXza4Vo6e+vijSSxE1oPVz/wuDDBPXrg5z1VEydZcq/y92cC1u6r 4ixWwdT+nOVKbo5vtW74yAD2UgYe6UyZ4oCD8uXfbAkjErlMNsi5uSm4/sSEgnJ1yUqM jAAQHgATeSOrTGbNwlyRv2Bm8UuuLCXTvvj+eab/E3ucqQswhiCxKdfpUsDWaJoAa8dC 6MdAfZzKUv2Ng8PBN5lnKnrP1z/XtZH4KamePlKgHZLdRxvL3rdiX4nFUQpkKehTkKsG lHxA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530QNkaVhtZ7Ou0z8aAl4lU+SkIDi8+B/JIpNbTQnQEMdWTOC02y 1BvN6eb1zVg5ClUqYsxKfyk= X-Google-Smtp-Source: ABdhPJy0rhu/ngtJN1Eqx+7USa4VKU11dMcZYJ03C+kI2CjOjkg0FFhWX04vucxVLzyur4llzWVdYA== X-Received: by 2002:a7b:cb82:: with SMTP id m2mr1755261wmi.56.1600788539890; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd0a:: with SMTP id a10ls4724505wrm.2.gmail; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Received: by 2002:a5d:6886:: with SMTP id h6mr6177176wru.374.1600788539089; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788539; cv=none; d=google.com; s=arc-20160816; b=KTP1acj6AbfwzaN4O9wQ9mBIiTxpNXp/pYgiI+OXj00F9wUCbz2v4PbXwEba0wCjLS Ixxy8kgMcOkeZzOYV18wSRKPpc6QZihVt60gH9RgWxJ3zXv8wg8+uy1W9e6p1Ol6lM+C jyd/3YL8oXuqqkGCnAIw/XHygaQU0TLtGLLeunSM2odbnzggSAkT0N4Uqzs5+pJDAt1e w1soY0UVrIT6puBdjd1/5DHmnnT66KhZ512GiWnORTgSfqBlqSbarBXJyGmE24dHsI9W XWggWa6Xee53u4DAsHRWOwLWUBjba2FuQ70rqYFlUzwc79MTVtMkzFw6BRhSmfTuFK3a TLvg== 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=yZ47VETkl3kf52cYqORZWEr8EDNknsK+uC8wZrPsAC0=; b=YYoAm5P45dQiDQxkwuDTd+/QbTXB8PFf/xgwlpgY13b6xBD1LEjBUK5RbDvj8oRmUd /16G1reFqWRYZQwV6I9rIA8r69cpALEfPI6Bby6z+gHsuSKQOuQIvdG7FV4EsWG0r0fD 1eN8S9v88K1sttArxPCpEyoBqwk4fHiLRUoQI9fzAZD1nKgsLq0338DWqp7Ba+ji/WpN wSDbDn1btL2Pzmp8SjVe2HNKh6DxDZzmRQ9FkW7JVpbs3LeXASzQNFfIPw7xVjR2mbjD H84QKzufRbs/eWKPfs0bHv8cqEFtO8snXsAmFVAjrgZH6k7/EpIOwpkWDUdS11G8jUQb UUzg== 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 z17si361678wrm.2.2020.09.22.08.28.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:59 -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 08MFSwNw016765 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVD031723 for ; Tue, 22 Sep 2020 17:28:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 10/16] sdk: Inject sysroot path when calling relocated toolchain Date: Tue, 22 Sep 2020 17:28:48 +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?1678548444305677214?= X-GMAIL-MSGID: =?utf-8?q?1678548444305677214?= 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 07a53410..59d16cd0 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -37,6 +37,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 ${ISARROOT}/scripts/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 e5d44e73..82b430b3 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" @@ -62,6 +63,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 Tue Sep 22 07:28:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 75 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470964ooj; Tue, 22 Sep 2020 08:29:02 -0700 (PDT) X-Received: by 2002:a19:4915:: with SMTP id w21mr2049912lfa.2.1600788541987; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=NBmnFBTCNowaJeihopbZdimvTFnIhXavGC2Soj7NhLOIJEr3xan6SJrgpRIWn0JWTL JVmQUBzwbh2cp0t3v/VaTGr7Xcg2JOHQ6ZO9lCwClA77rb7zNoHI3dyFJTCNAuWBMd84 H8sPdWtdj0PUTBX6wDdJTjnzonRyLRX+8u6Blxb0RKFLE+Gbn3hHEX+XuoadOuNgYCaU +7kMsf4K05w10LG49aC2oaE+5jdWB0CV1Y0QxAmzuzRK1hCl1pEcGBkW7I/Vp2i4lJYx CCQ4fwxHB9VQPb3CKN0TWjaR+I0pEn/eoTtItnLUpboxV074hyjTldsLt18Ufqejp299 XERw== 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=OLi0dpFWDvY5HPHdxQ1XrBb+MeT0XbZbcSNkaHxyu30=; b=JY83o6Bwy8tsp2lZcNp5qJvDBTjfjXchpASJGYjjUEAQuhpb/8IRziDlz+eags/KA2 5yA3E7rntaOVkyesZ/b03aTD8NmyXRI9MWJRa8868HL8uxMk6usmn3gMY3uy5Txg2sPh dnsyLu6/M8kVHyHFa09r2K3BtKVCutOOmk9qVO1TDo3Kanr08by6GY+Vjbf541Z+Uu1k pXm8LcL9TwrdVfRPyQbkgWseXQ9xA+rku03yAjulGrD7mbhFQkgtcWshP9qNoc0In1Km OO/+qFXp/A8daiy0HjuIJNARHpjyfrtUDYDURc0ZlWeD6n2rRX1rQNmjm+LqUzQePDZq kiiw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=NaYW0EvA; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@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 h11sor2835583lfk.151.2020.09.22.08.29.01 (Google Transport Security); Tue, 22 Sep 2020 08:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@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=NaYW0EvA; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=f8QKdMp2Eb4Gr/ctpqQ8RaO2DeZIySwYZe49fWdEfiV/ZpS/fhBHrH8jyWlHrPxzcg p01AGM3f/oz3kmTUJleulcsd+Z9+lGe2pFS+8vP6Ite3p1PW2qMd1yOKrHnBbMvD/3cl W7s+nznaGvtK8HlKCUkg2NFMr34IeUZe3QVO5RbuABgH2ZZzFf2X3VFLGWKKdNzDXt+B 90VUu/+lR67E37DjL/BrlqDZk5KMKmW6UMMe+x/lEhYi3v8PWEKA+9JI9skqn2M37jwH Aa0yZVR+gVhF0lLDUAV7MXcHmCoywB/wEnFgroYG0aAHfbHjc3IFDHauye0+jDnjBw3k TIcg== 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=OLi0dpFWDvY5HPHdxQ1XrBb+MeT0XbZbcSNkaHxyu30=; b=ezANtxLqueXYGkQb77A3XDexa4DEmhp7kmBciEE1MPz+ZN3wgoUFRfjVdXe1H5pGVu cs1mIcp8WSBnJdL7wCkLVcAWEsId/Y5T5NDxDKIbNvIpJnPRgOd1Tdo+totOvrMpE175 ApOabj5QI9y/mewTXk58A6zBL61qXwosbpWTH0xT1REMhI+Rxm7RFlQAEw4XUe24dOgM /ZgIDd7s62kV6J+2O09qhvbSEDIDytRzVn+ACqk2sEcP0PKmfVug4g6Q/WBZF3KiNQhg KTMvGQnP+RdLLvukWq5kQKWM5kuKPQatdszZWPOGt9aGvUXf7Gx4OWTi9aVkl+q6Tk5B K+xw== 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=OLi0dpFWDvY5HPHdxQ1XrBb+MeT0XbZbcSNkaHxyu30=; b=NaYW0EvAyjNs1AOsBO3cWv+l72NrjhLr3mbLZTfNEBtEaOTCTqVUbXYJuwrenLqw9/ WwSUJDqAeCEwd6Ebn6haHUFICseBL1S4FNl0za7+WvPI3xd4lqmFQDM3D0+/Yb77tLFq l6bmyv/N68XTA4aM+OxPWvGhoUH86CRkcYmbBqrCCOFZ4lN3SXptEywqNaarr9sAYJct pX8//fAEjz/qobxmJQ4OvZhraxxxhKaen0CUP6MI7uQXaaPH9IXSPCdVFQhRyStuQhAY OZg6jb8NIko2BdmNTGIfo1DxYYMPaW1pSEfWV9fvm9AJN4gG4lvicPjSQpvuC9sLdYEl 2DyA== 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=OLi0dpFWDvY5HPHdxQ1XrBb+MeT0XbZbcSNkaHxyu30=; b=FWNhnuO3YsiJa8wn/fFkgsDSZShq4ybhXdOFdaBBxHCZOIoAuzhusIJGsR1KHw+hy1 jtC0ErSOqXFj5cZp3sCDZmyZWMClx6iT8V8s8i2fXzyspLtOGSUxz6O7QGmf9BgFeFeJ RFWOVVeDAV7fV2r5bnn319ln3gfFlgGDaQasOy82tKOsx48/8xIN/h23bKVEhAEfc6Nt YnjjVALwuZF+xlwJd4BhisxxhrjGMbqkJ4/fS5/J0ICj1mlJ6bWX/PkDNsCl4XhwoVq+ G2mQPqTHKh4MH/+UCbuwaELYIf5J3RlLQhfuHA5lFR7+VuGSyWfv1h3CoEj1Wt0AksH/ abcw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532X+ManmHElNbjfZMggoSoluUDES2VVdFJUGxuS9Iev4PdtZpoc 6gVRoO8UWKZGlYD43pdtIOw= X-Google-Smtp-Source: ABdhPJyxEbxDQKnMym0LXOnzwmVTSEPRi70DQsoP2hYGkFXLjIw1eI/Z8Bt8yMEQ7CQOnc/KefKzuw== X-Received: by 2002:ac2:5dd3:: with SMTP id x19mr2137308lfq.340.1600788541611; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:544e:: with SMTP id d14ls376308lfn.2.gmail; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a19:4c87:: with SMTP id z129mr1897744lfa.189.1600788540563; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788540; cv=none; d=google.com; s=arc-20160816; b=ovi9yg+IftYRXgLbqS+KJ+7MyWSKMJKWEu4lBbbGhY3ARzIAOHmFoAsh+WOKlvAQBT IAEkZgOEf+JfnN5FXAfUgh8vLL8hJJxrDa3t3uzn/zsd5Fe13s/llBxFk/+h/dtkWV/D 1KsouWf9aQb+jkK83ry/EFxcHPpwXmRlCn7NpEZsm9PrZc5VjgcgwKG99oJxl+OLsR2m LUgfnN9tyrw7OeeEh/ppPprJYikpwx6l/3kJomSDxtsvGq3m4wwYl4LYEyBML8pKYRze AJ0dcLjJUcdZITv5AJCzvYQ4leJFX+w5mkK/Hn9nHdZVaZjPk6DSWrzWOQ939GDtX+tK 8Blw== 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=Wf7gm+oivgxuRM/W7xHEBvxDF6l1LOXzRTDfmh487dhkRU1ifxOvH9/IwZiTIruq/n Z5GdR0KnBVE6vIvdK2/rJlMJlgnaQ3Ku9vwSA16ZaKUsz3E/fpN87qRIT9etewWA4dee Qrrso0QDaQGAMAIBSKIYlAgIvHDyZz3VRaBtCqi/hrdgdbkqvQDJzZFNwZcryMUN5fMa iicm279zQ0TJcpFd6iNVfZXunSbZNCWRQimU8TsCbWq7vijJkPrKwjPGSKk/f5VPrJ6X eowhTqiMRmduJdSvNJ4CCL8ymESrq0MuuOrPS/k1B/mLtaHCFd2NmNItZA9x7c9l2njl kF6w== 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 h22si417565ljh.7.2020.09.22.08.28.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:59 -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 08MFSw8w027300 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVE031723 for ; Tue, 22 Sep 2020 17:28:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 11/16] sdk: Update README.sdk Date: Tue, 22 Sep 2020 17:28:49 +0200 Message-Id: <11551cdba375ebeef9fda6523c62387bdd60826a.1600788534.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?1678548446685987165?= X-GMAIL-MSGID: =?utf-8?q?1678548446685987165?= 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 Tue Sep 22 07:28:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 78 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4472471ooj; Tue, 22 Sep 2020 08:30:53 -0700 (PDT) X-Received: by 2002:a5d:6784:: with SMTP id v4mr6356861wru.132.1600788540680; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=AAJgMc2WyNLvbRdOqrULoP5jWou5bZhLgk+fih3Ohmf3taKUPVyRIbl4zVaWBtGOWo QuKfswQfvFzZGqrgULVoHzoAIWwHtNn6du06AeuFT/eTFPkXUXR5PK9ZReOMRh7aU3XM KS7ErUXKExYjc9OgTLz4jkZYztEZyXKNMTSlpNPGXpBitKnQw7WNLme+3yaEbtq/S5sM 9lkoqyVyHGpbAOa1mDcayQAaA7l9exc6K5TdaNLyYI2JZ6D//XsuFB+xk+MZbv6/9duH xAHCndyviP6EUbqfcLRKGADeqNtNStfJhFGFMW9JLEdt2MoGWTADBmmgPeF7aSx1V0qN nF/A== 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=IEpnvT2JSqnPqcdI333DPdYSMzl5wzRxKcb1kaIJqmg=; b=sXZAIgUgtHRP+0+oimREdDffkn+9jKcX86NCgVFhIs6w+AV+0jMYS+Uuajw1a8/ep0 yYJHQbTSH8Xvytt2+P66P6+wPxEUWUVsSzoTRWdyVb7SWomo5j9Ty9lQyKBs3AsikXn6 KNiIsOSUYejGCfBOGa79RJ/6wJsu/cA5CSOYdSBFzKXqyDkBO2a6nTjYmYwLcGS1945f x9VweoabyNPcSfvHl+SHFflXWWOBETTbdD0B2B9ivy21jRkGzIUsgOx2DdOOIMBhqsGA kSis30BRT3m+vMxrKqlGebOpn6KRYHZppj+eybatpzZpH3zd0uaV1y2h2FzagGqMMdWl kQRw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=j4Ulls37; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@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 v132sor2080983wmb.26.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@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=j4Ulls37; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=hBCTLcV6TJFG0Jre+MjaMlK/qF72tGYUED+VKCQKWGmHoTC2uoJh3sScLsmiJt/S53 IBSeZwEK3hMvto6aeUa5kxG/Jx3snejEKgy/Ue8DrLgh+ixeYK/EvW7AGrJigLz0YWO7 NPHEoLtJ4hd3PAsU/M1esUJNC/3CLs4k6FO4e3aGowqcFI6t5c3h5RPHWJlBZnxEqWy3 ZGDvPpcKEZxNLKip++WGItDcVzw0tCDNeLnn2AE0WdN5KTGUwPALLfn3lI44JVysQxz2 reivAyeZ8Ga3vnyoawm8yApHJfW9L4AQPQxdC08de5GDQhDyu4BE/O5vejhgDahelHyk LlIA== 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=IEpnvT2JSqnPqcdI333DPdYSMzl5wzRxKcb1kaIJqmg=; b=RqxhnjHNZfEuIXMwunwYsXurw/Us905m2p7yh7LQa7c8lTumM82Trpap09YudgalEF CXIPyT/PJINbHfeis59yEBh27bjW5j5c9wJx1OUQAtmg27tHGwdReU8/o98Iv8IOcVn0 L9MkLmXKbgqNEJz9LGeYRFAN491cEH+NgdwqcyNc0fFtlNn2/T3/VTgXL1Y5QjSN3nlQ K3NV1kkjZqnf6Lw4uuEhpyNIEBAc14KAIfU5R4liSaWuWS5YW8OVAb4I1sc3e/FQXM69 M+KR0+ei3QDE06HvNIs7U9Kk1bUUReZE1kERAXzod2QEtvHKijvy1js5KpCieVSl4UUr gY4A== 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=IEpnvT2JSqnPqcdI333DPdYSMzl5wzRxKcb1kaIJqmg=; b=j4Ulls37rcym4ydhyJEsW+lCx+OFvmINJVWLyQyfKbvoF87OXAdRfT70WxqnX3GI9I PiT0oWpEToQookeAFCrmxZXx4195DrvzXScMuOEA1bXl5hRYVDWoTs+ECsjLC5J8370C mCCN99DsGtem4ZNSi6QkqqKua+A2zXD8GeI4DT8HuBLeCd4lHol8Y2jL5bi+4xHuM1pL 9lLo7vgi+FwXc66dFAobcp1F5Gx26HYiKgsirKskyOyoT2ayAe+tQtLSpn3si40YAxVV bt7rgPJDA+gvyPejNzfhgJlDTFwDBnIzA7j7OEwJ4Hg1J6mKB5t0Dw5N9AZyagRUaqey QyqA== 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=IEpnvT2JSqnPqcdI333DPdYSMzl5wzRxKcb1kaIJqmg=; b=X4cfomgJEypTxCavYocxMVarGnO8DqWttisXaclA3haCp7dxRpFsxlZ0f22jV4G/rE lUkdEbO3ImBrdo2Oh7k/Yx6cevXhiSJ5rNCBufjBgCaybqcENs7OaVbwNN/glPWH6d2a B5/vZFqE3GEnntURl5JiLIw+xGK5VoaqxFjcpUXQBmvADrED35dFXexN6MsArDd/bNlu qsEYd9pHn27przLgY0oIH+9TjqnKvyZmCyDaJp6mLDqIq5C8+W0LqbCTO16aEOFGhoim Lv7Yqa3figRjkiBxhUvOSrfmuN0vgLVc2Rk9gh78ApmrjEt4f5FVsOO7xB6gZ60HjXnG KwqQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530BGfeToq8WnJNOO/HH/N0Ui+xpl7Sgk63iAhM/zIPX9juHy/LF DdXjxYCWGPI+TEgtpuWqb20= X-Google-Smtp-Source: ABdhPJyPfXo787geSZy/KNPdToBfbvyqJnCeAXhgmGIz3sWI3mjuaQVgvwNer1gZTN4HwkmCIkoEVg== X-Received: by 2002:a7b:c151:: with SMTP id z17mr1684051wmi.53.1600788540290; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:98cf:: with SMTP id a198ls1751530wme.1.gmail; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Received: by 2002:a1c:6a08:: with SMTP id f8mr1622279wmc.151.1600788539349; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788539; cv=none; d=google.com; s=arc-20160816; b=w2eu3QzCcguCA6/2Wbe9HI9ypvwfCKq7kwFXrcqGbfUTB2mBhocjV9+LrFC/2GPVQJ 4PATXh65satds7FvsXppOdrWWqAe92qsHu/uoVk6EoHRnVeRP86bUohbwDqGgmbOMS7N 4ubDmO3FJUqVk7sjK1YjWmcQWlnJmsWkI2ISxHqYLU6L3I5sFoH1Tz3igNsz2LWhFLzn 7aJGVz5VQ7NklXGctzTfAuP4hjjEu65OnRvKcYqCPyCMwkwqzcTv3hXzIlfTCFXBUHyG m5BDfQoYGwyIHHUDzD6InntLWA4OLUET6g9HlIv5tcDIyvgniGYeBw1uhJHnn6AAV2zA 5cIw== 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=MgeWQsfiH8wTSN/wMcmu/f40vy/396kJwTJr6IupQNY=; b=T9tMJng7DSR78bF6e2Osi65HqpztBIbNBd96BfKBN/mfDfaTGPySyHLljSDK2f0Lau PiIt9VJd8kNy6wPSK3cKQcL2xqZJ30MyNU+/QrsBm1PhKkvB3jFrdhjrr83FS33Yps6N Yc3oS7s6BqRyePmJVVwGnhLi2uiJ6DBThuWHF8/GXIbFnOHUPasfoe9iAj0QxUIDy5nH 9CKE1HjII6zlllZnxpkvH6QNNtJqBnhs4LjkrVhfjS38enIRaFjubCOCBCDklOsBR0M+ +Pq5JMAi/RTJDXgVEpszXvjT5PBJoi/5VDkJUV5yXH0lPUV41vMws8ET27mT1Uu02+Tu vi1Q== 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 21si89553wmj.2.2020.09.22.08.28.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:59 -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 08MFSxYc008508 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:59 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVF031723 for ; Tue, 22 Sep 2020 17:28:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 12/16] Add compat architecture support via multiarch Date: Tue, 22 Sep 2020 17:28:50 +0200 Message-Id: <970e3659843f28908d0cd08d6604ebbfac6c9cf0.1600788534.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?1678548444796842798?= X-GMAIL-MSGID: =?utf-8?q?1678548444796842798?= From: Jan Kiszka Allow building and installing 32-bit packages an 64-bit architectures that support this. Namely, these are amd64 and arm64 for us so far, minus stretch-amd64 which lacks crossbuild-essential-i386 in that version. Control the target architecture of a package is added via the PACKAGE_ARCH variable that defaults to DISTRO_ARCH. When set to COMPAT_DISTRO_ARCH, the package is built for i386 on amd64 and armhf on arm64. If the build environment and the target image should contain the compat arch is controlled via setting ISAR_ENABLE_COMPAT_ARCH to 1. Signed-off-by: Jan Kiszka --- meta-isar/conf/local.conf.sample | 5 +++++ meta/classes/dpkg.bbclass | 8 +++++--- meta/conf/bitbake.conf | 3 ++- meta/conf/distro/debian-common.conf | 3 +++ .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 14 +++++++++++++- meta/recipes-devtools/buildchroot/buildchroot.inc | 5 +++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 1 + 7 files changed, 34 insertions(+), 5 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index e842c129..2f82020d 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -175,6 +175,11 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc # Enable cross-compilation support ISAR_CROSS_COMPILE ?= "0" +# +# Uncomment to enable 32-bit compat architecture support +# NOTE: this works for amd64 and arm64 targets so far +#ISAR_ENABLE_COMPAT_ARCH ?= "1" + # # Uncomment this to enable use of cached base repository #ISAR_USE_CACHED_BASE_REPO ?= "1" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index acccc1f2..a24386df 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -3,16 +3,18 @@ inherit dpkg-base +PACKAGE_ARCH ?= "${DISTRO_ARCH}" + # Install build dependencies for package do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" deb_dl_dir_import "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${DISTRO_ARCH} --download-only + ${PP}/${PPS} ${PACKAGE_ARCH} --download-only deb_dl_dir_export "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${DISTRO_ARCH} + ${PP}/${PPS} ${PACKAGE_ARCH} dpkg_undo_mounts } @@ -27,5 +29,5 @@ dpkg_runbuild() { E="${@ isar_export_proxies(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH} + /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} } diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 44ded532..a3e2af2c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -62,8 +62,9 @@ KERNEL_FILE ?= "vmlinuz" KERNEL_FILE_mipsel ?= "vmlinux" KERNEL_FILE_riscv64 ?= "vmlinux" -OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable" +OVERRIDES = "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:forcevariable" FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}" +COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" # Setting default QEMU_ARCH variables for different DISTRO_ARCH: QEMU_ARCH_amd64 = "x86_64" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 7d681c49..582678f6 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -22,3 +22,6 @@ GRUB_BOOTLOADER_INSTALL_armhf = "grub-efi-arm-bin" GRUB_BOOTLOADER_INSTALL_arm64 = "grub-efi-arm64-bin" SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" + +COMPAT_DISTRO_ARCH_amd64 = "i386" +COMPAT_DISTRO_ARCH_arm64 = "armhf" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index da0d436b..fbfe669d 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -222,7 +222,7 @@ def get_host_release(): rel = platform.release() return rel -do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS" +do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS ISAR_ENABLE_COMPAT_ARCH" do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" do_bootstrap[depends] = "base-apt:do_cache" @@ -236,6 +236,14 @@ isar_bootstrap() { esac shift done + if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then + if [ -z "${COMPAT_DISTRO_ARCH}" ]; then + bbfatal "${DISTRO_ARCH} does not have a compat arch" + fi + if [ "${@get_distro_suite(d, True)}-${COMPAT_DISTRO_ARCH}" = "stretch-i386" ]; then + bbfatal "compat arch build for stretch-i386 not supported" + fi + fi debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" @@ -330,6 +338,10 @@ isar_bootstrap() { chroot "${ROOTFSDIR}" /usr/bin/dpkg --add-architecture ${DISTRO_ARCH} fi + if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then + chroot "${ROOTFSDIR}" /usr/bin/dpkg --add-architecture ${COMPAT_DISTRO_ARCH} + fi + chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y chroot "${ROOTFSDIR}" /usr/bin/apt-get install -y -f chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index b4d7b764..835968de 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -22,7 +22,12 @@ ROOTFS_CLEAN_FILES = "" ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" ROOTFS_FEATURES += "generate-manifest" +BUILDCHROOT_COMPAT_PREINSTALL_compat-arch = " \ + libc6:${COMPAT_DISTRO_ARCH} \ + crossbuild-essential-${COMPAT_DISTRO_ARCH}" + BUILDCHROOT_PREINSTALL_COMMON = " \ + ${BUILDCHROOT_COMPAT_PREINSTALL} \ make \ debhelper \ autotools-dev \ diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 82b430b3..c96cc772 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -22,6 +22,7 @@ DEPENDS += "${SDK_INSTALL}" TOOLCHAIN = "crossbuild-essential-${DISTRO_ARCH}" TOOLCHAIN_${HOST_ARCH} = "build-essential" TOOLCHAIN_i386 = "build-essential" +TOOLCHAIN_append_compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}" inherit rootfs ROOTFS_ARCH = "${HOST_ARCH}" From patchwork Tue Sep 22 07:28:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 70 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470940ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a7b:c387:: with SMTP id s7mr1560631wmj.171.1600788540743; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=BTj9jEFsr4Kp9ltccbX4l2738tv76TvfwkB/ITWTK8FgoaNVvrXGYvYIzZar2WIC9c lFlpmclCv7DVLodSHtz5P5AmNliSeqWG61CgPTUUD4kyXZ2a/Rp7qTBTHvBeqdkevQ7T VGUwM1Whf0hSPEPrkf3yiMMXo+uDvthElxJLcc/D8tF2OYYAQAxrdC/ReKpkkKGWRWzA HsGpcA2Te2+GxOGeYYYXcMimcuRa4lqkGKgzPx90VFXBxd9yII2iQnMcTyOqU11adeLc mazf0SB+9MRPgPWdPs77OrA7zyMYcNz3c8CRhF85cqayWfNVzUFtFKtDBBvLtYUccmP6 x5Fw== 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=UMg6+WASZf4Pz9f3VnaTC0PPI04YfXqoIi6uWZ//LFQ=; b=Vnjv2pEM6f+CGPd77JGBc5nEUv2JMbDARDjd8VEeyZS6LbmWaqVhY3g91LYLx6YQyT R0hPoisN8Wj1QfeVXg4J381hnG85IYt/22K092qGePc23t15luA/gVbE4c4N1ImSF30l 12fwyPG1wBz1ZI1T2tJ4QztuFELbolgeUdk+jGKem2sJf2YCJ9l5a0tPkn+K3EHNQ4qc u9xf1+PlP5CLuoEUssbtziMejYPLnsV1rAD7Bdd6MD32Yillxt1NpI865mugVfL+f/p0 Oq5vqVJhDh02XtQY+0axXaYQWUeo20+SrGRvPW9YQ0hNf7Ze2zD8TOMrugnlY6chmlK8 ccJw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Ws7cEJWu; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@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 g64sor2014463wma.23.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@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=Ws7cEJWu; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=Xr6ZuAPc4nHliSZd+qRToM0S5OluLF3PvoepmMkE2OzdKaJMzowe/LpHXKv4uXk0hz /pKRimLhTzft9JAWMKxtTliNQ6b1wOnE0izQncgSK9tyZt2kxNijEUlj6nEeHqkHxkMr duKs0sooscPIjfm1sAM0LL1AfNtbdBvbGf4QCokaL8QCL4oQP2zHkJuftCKmyOCaFwpp Yr4LgOXngJVJyC0/ufzI/Ac7MLrPxjoXgMCahFXW7dtqvmrFliu8NE55opRhGECdopCm lgjzWOQbCJfcjgceJZwyufCY+YMiC6F1JiI+RSANWOQuhSnVXrw2O5Yd05mif+MPmEvo trDQ== 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=UMg6+WASZf4Pz9f3VnaTC0PPI04YfXqoIi6uWZ//LFQ=; b=yvAx9iXQA4zRnvfC6ppukqBfmfgj18ONu1W3xfFXKlPKmsV6hG7Kp9zA3gCqK+87kL XhDojL/O4AH5OUspBY0TJz6SZVGqOHgfKSaTviWlwz2amZ0TfwKwsouYNyJzE6mTwE9Y mFnG0MK+IvRvswq1+u+VVJzN2Fw8fDm1B/3Bz4S1ocpC6wl4IHCXmKA7b1AJGAWG4hTG kHWQCbzPecFPat5JUtk4CcGU4xNSYIj5hglEHrbn8S/F/v6JsmfI/zy2BYB92TEOg6wA /S3Q3PHaeF973Prq5bl7rW7dZOUbFbu8HZViofFrNKCKx4eYVoayRIXJWmWVaSAZwx+Z S4zw== 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=UMg6+WASZf4Pz9f3VnaTC0PPI04YfXqoIi6uWZ//LFQ=; b=Ws7cEJWuO/v0M5PmzwC2J2Wsc5hshREo0pXzaHcWmGhMW7C4FPd2ISIZWD5OjBRoR8 ASb6ccuNREjkSXmBoM0tXcs0aracyGxWZX7D5Ghv0lKnwFs5ui19tIoD+In0v15D6vhV TXu7g9vpMwQIbSomltXHFvvdfMB2qgGluanftZyXd/MsoFeGFRhg3jMqqsEVE5N2qR85 +mb++4LCu6r+S6/TfMm2auybOfHIsPX+mirmuFFuVwJ9bP5+SCwdhwBkkCRnoAV7uNB1 miQHKrYDrvKHSal2q9zIiFJkwmqwUo+tsBTJ1Wzot4nr5sf0wHCLRc4Zw8Z+MgVzA6zt joVA== 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=UMg6+WASZf4Pz9f3VnaTC0PPI04YfXqoIi6uWZ//LFQ=; b=U8fFhZAWvKy09l5p/8kYxe2uEWzfRHutMvWkpHXiCEzsidzCuR37bcdznEx9seyTlN fpT+huMlYl4KvAwlvjsc1DCcM+K0lJ10O7MTps2JgO0xOyZ4qh2YJZ7PJtMU2qixBPw0 8LimxrN9mhP/f15wcgXNBNAH86i1ysD5QDQ3OTT/dLrXBkCm3aPGqUvnXbVC84XndvX+ XmjvLqXzpsxBYkWR/71W4nEuRvJrp5sy251WDJMMQvYK6Cx68Cns0wGpz0e+OCHmaLUv Qx1/L/8guVUxB0ArD6cyhDBEu4BapjOh3pNrrpFdk2/L84YQH2aC6L+CIV8SN6QHXkq/ HnpQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530ziXPsefeCxWvyRltyxe5ReFp1QNc64IKC3TBHUzcoKa1RFISd 6Gsfh+SlVMN8mWGu3CGhs6c= X-Google-Smtp-Source: ABdhPJzrFE6tqG09S802vKedGW2GzxTyyYcGSGim4vy6N5RwkyPIwivQgUE6IIwBhs7xNQm+YnU03w== X-Received: by 2002:a7b:c141:: with SMTP id z1mr1625580wmi.79.1600788540455; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd0a:: with SMTP id a10ls4724521wrm.2.gmail; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Received: by 2002:a5d:522d:: with SMTP id i13mr6316870wra.296.1600788539628; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788539; cv=none; d=google.com; s=arc-20160816; b=aT7VytSx9mTs7kS8q83EhO57NtGkb7QOKHPvt2S0tlyi27eWjHCmApUKTFNQjrBUVz AyG2EnBYOXYcfsBsoeRh7qlycec03zSUmWVl9U40eZDLLaMCWCGiwx7QSt4kK9M4nYK8 dcmMy4qszdwDShjHWtSfdLfW5kyPh7MiHb5Bz6ZDEdRawDm15gok9+KdQrYh5X6t4sWd jyFIKTFC9gEDCW5li/BZgbKiKD2vxVOZ2qWu6QDf7gvQ8H39QnLJgfXLyA1sWaHH0lsj G2vobQxU+RJKLK9HdoPFaRyEXo0wqwo3AqEAYhiPojhELxEvTIRQD8jkY0kev0ezZtC4 /Ljw== 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=uz/KzSr0nfqWebINdAjSz4KFtKCCvDOesaA+3FWHYrE=; b=tqro7TF+gTsxUuNvE3/GTgqYCWqRv1QWe4+oVqXchbs9WrIkrZnEYng2WJK82WtI// O0gqUoZyDCPKfimzltFXh45VAdY+MudzNzCfRcoO0n/BuGY/fTW3SdXrV7EOYJlVfhwC MSgot1n0dufsD/sZ0gCX1FNPD1uHdHWGhCtjAxWQFqCzHBySup/YwgaMmiG3JwBibrZe AkXFeyN5tauxn9xy8i+C5KLxvww/zYCNyz4vXla5jtdG1ceEDZiCkV2Ig0C08IJB7gBH F+f4z/IcoqT0zzXJrUD57Dtwkbt146R36Kdm8JiYmgG6Eq0g1aXK/d2DL2Xe3TXC2Gos 5AuA== 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 w10si88367wma.1.2020.09.22.08.28.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:59 -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 08MFSxQ0008513 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:59 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVG031723 for ; Tue, 22 Sep 2020 17:28:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 13/16] ci: Add compat arch support Date: Tue, 22 Sep 2020 17:28:51 +0200 Message-Id: <037da8927c218b9f8b1886b8629e07e4dd40d422.1600788534.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?1678548444651672035?= X-GMAIL-MSGID: =?utf-8?q?1678548444651672035?= From: Jan Kiszka Build hello-isar and libisar for the compat arch if that is enabled. Set ISAR_ENABLE_COMPAT_ARCH for all supported combinations in CI. Signed-off-by: Jan Kiszka --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 3 +++ meta-isar/recipes-app/libhello/libhello.bb | 3 +++ scripts/ci_build.sh | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index 144a433e..8c3ba8b2 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -20,4 +20,7 @@ SRC_URI = " \ file://yet-another-change.txt;apply=yes;striplevel=0" SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" +# NOTE: This is just to test 32-bit building on 64-bit archs. +PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" + inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index ab271b58..5c44de50 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -13,4 +13,7 @@ PV = "0.1-98f2e41" SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;destsuffix=${P}" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" +# NOTE: This is just to test 32-bit building on 64-bit archs. +PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" + inherit dpkg diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index af996d19..a5eee82b 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -139,6 +139,12 @@ if [ ! -d "$BUILD_DIR" ]; then fi source isar-init-build-env "$BUILD_DIR" +cat >>conf/local.conf < X-Patchwork-Id: 72 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470949ooj; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-Received: by 2002:adf:ea01:: with SMTP id q1mr5717345wrm.97.1600788541379; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=FJu2XvMlG/NhmSApj5r4NdEjgleYv0zKsEPsnSQFROUoNNNMxjH88czW0sjbdxDk6X WpWIKli/3XumXl1RLWqMCK7YmoeZ8JdSCPYhJgaGII+Hp0vFYgDIcKAhhKpejKDLZatK oW3WPLexzwJ1e4eV9Gu3Lk9NvThS03vQt7fW3XxDYdJFPbX3S9SzBT4KNEPJ7+l6OMjU M3pPfilv5FSfzStulEGuIxvBG7pbkQV3y01TKJvM2TtIV0Uh6NYts56X22iAue8g2h+E End/Qkee8h8fXIbbe/uuTtiAvAyfZCfPFxrRHNXTXLsDrCg0oKVMQNcNcxfwMjk7MoaR nnNA== 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=hIr5SYPkgOkTxeFG1IIzt4yjxIbmZ0kH2bIoG1aH+wQ=; b=T4UlevD3PL0enu6xEO3ywF2L3j6+fixXblTs4g7LAlT7rH3z3rt04cSTiciCINummA jPrrDYcuHgL2hNpeMUX/ESACI+EmWmpdM/X3mCSL2KnZtZvMxQZpBdVhWj/ZT8OOGPu9 +t3gARNvG5cY9WDhScVDzF/OFX20PtkHO/MGUaEcdd+VBDZtMzbKcb06kPGgTlezmHY+ 2qkzIOkvDZVLNT6wWJpVniHUryK4Ognr++lTk3lDhVD80VpSSyA/V55KiLkBgViTHeGM YT7ZdTbrOpMue0B4edlf+ddC6UKvsC0kGF+WIGek7xtibF5N9FSbz+YkaOB00BpNpsYt S2xA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jLRt6JB3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@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 v189sor2024863wme.12.2020.09.22.08.29.01 (Google Transport Security); Tue, 22 Sep 2020 08:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@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=jLRt6JB3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpfqvd5qkgqexb7ppfa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPFQVD5QKGQEXB7PPFA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=XjY3mZSwjnNMxcx4wkPs9bIV7mpD2oosCXN5GHrHyHQ5C+On4fuE+HBWleN6HIdErU jo3aNr0Ar9MMfI73iNx231KKJ8RUUF60t5wqmXXcTU9+eQANZjGBE741NzwfjsF3sKLV rfDDIBpmcUfZaqIsCvQ9vfJkxgtjhoNQcwx+cvLM/ykv1KnnGyUZfzYtr6ot5hk+fn9m +XhoNoJ6u6T7Mb9+saXzIX8OM/KFpdIFLpPdG0Ja7+OgnvAIp0ql1da1XWEnTBdZkoKu WL3GFtKl3AO77yE2lsUHVPG5oOYPgOUW34sVFsnI80ycW0HUl43qdybZLMz6/z8u+qJk bLcw== 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=hIr5SYPkgOkTxeFG1IIzt4yjxIbmZ0kH2bIoG1aH+wQ=; b=pb8jWCh3HiwLnnIStZT7Fx7EknmbdQaRLXdcNnXikPpnuAqOY8QZftz3qE0rtLsEba 4aA1T4HW72mLayLx8PbMvwpnwRA20ykOCeNOBKo4Y/UbroGTyGk+7hrXCSUZpALV4jdT iNMB+GcbqQ3GqI81dHRtokaBvnBdNUI2v/bc4jvTaZXreke2QnG3zSotWUlTytzCb5jY 6DgR74GwZVhF+5XFJzjw3NPBhAkSw/GsSd15zVifLwPyyVCAvUpj9i1ZXQQ2mCu8tb0e jW1LlqsciFZ4Q2C50rmKnj3JxDlfmINmAqg4S6uM7UITys5A/bIfSgCvzw/w12hgTUsW KC0g== 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=hIr5SYPkgOkTxeFG1IIzt4yjxIbmZ0kH2bIoG1aH+wQ=; b=jLRt6JB3pqeXS8UB+rvwMfsFEDK7QUZqQfNnaUaWlL2A2IgMZMbJpC36Ctt1wxvNLa Ic/Pdb10PGSOghu/bKiRwXq8BlhQMdhsyygMpf4s1Qngaz4zIIO79GGSTx33LgfGLLop TzUzfCVbHYIBhxX2xxY9g7h/mObLK7V3A/a/UPmcNGAv+jUgssupUdvgrNimXK+on7pe VJmM2uszPszM2uNN0aCcPYujRCYkc12+UonP+n568HlPHC6bq26RYs9VtfKzPfv27EvT i3mHtiSUpV9519e0034bpZ/bvXTUbDbukihuHP/NSsy/rIebrSevXBZDijfiV6Pg02pr ZgZQ== 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=hIr5SYPkgOkTxeFG1IIzt4yjxIbmZ0kH2bIoG1aH+wQ=; b=CdoOPb+hX+w87KUrGSC6K7hhiXOapdADqKMkvl7/O1cfu8SYgqrVUL9XcjsdE/jXt4 SlchhHiPBHfzHxiiVkJXSusMTb1DErSxJ0xo9sdlZtUPgLaAzcgeS8cKDeC4JPKE7Lf5 UJa/ALHufvIAN9eTVqJQfQjR3qGbLmBvSBo7IDfHO4JQ0+bs/hmt0qJ1wQ04xuw2laeJ oq3CpTvrwJAPYa/rmhykjlHbAl7wjszrh735FFwm+IgMVTjfoGVuy1w3kkKZpIMpxDSp CwXe+OWu8odRKOL2KfZItrl0ic7G8tf1uqIF+AM2hBgb3PwAi4YmjCbpD6p1CNTFmTSq zkZg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532PAhGa53sqJk4dk5izhkhxmI+omAyyX31WGu5Y2Fk0+85PORvE MWw8m4O3qw6cs5HcwYh6CZw= X-Google-Smtp-Source: ABdhPJy7itSjGLUoAk9sPOXS02AKqwGdoAjreGp1A5ragGjtR1NpanX+OxpissXg4kui106IqrCMeQ== X-Received: by 2002:a1c:bbd7:: with SMTP id l206mr1656488wmf.185.1600788541008; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e3c3:: with SMTP id k3ls4729967wrm.1.gmail; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a5d:5486:: with SMTP id h6mr6058932wrv.415.1600788540190; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788540; cv=none; d=google.com; s=arc-20160816; b=aNsVRSPmDcABTRSAjfFJ5EuzNQ2B6CS/G7HjOtKsY/OvKQrmZ+eib/o3I8C7wd4dL4 Y30Dwe9KTZuf4vJR6VVhS8HsyjdZ65YrnK6nPwdHw5cJeUHFoFNdPUAYyRAglJyoj3Ke MwAQVQEMEhE875n8LDBLarDrWlpaD8Ht4oeH4yeA1sa38AC/Tf8OUbg3NXXo/lBlVfTq Gr10k0MF8GvxaqMhkpaDlZiLmqFPMLa46Fh5ZOagGAHi78bkbj3/rgLrgo7VkK4qzpTa w1HE81c8Wfs2f5ESXDshInAPPzn+LczCFItKHSzF/SwgE/zZZTOEIQVPjZhMHRRuaWFw TJ0g== 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=pHpBblsBE4zVJjaH4IbRAf5qmCnwvHF20zRl3n55jvg=; b=n2Ljg6RpsnTbRk0QE+HK8uePs9Tt735qN3rRLDotYBFdup/xb4R+//ghJLJHOpw/Dq EcJnuGDgxRg8X4mMxpvJrSrpGf1IHvHvST8xR9YHIKdI6VAf17+PUCgjXEFEmW/ue6X0 gxSTxZv7AjSFo1Rd3ix9Lg8uj2UwTUp+c3cB+ry36bb4bheyqB3bpUbNhsMWtYdftgiY EjG/t3tdOJralqh5+8CVwKAsg0nbKdYQV7caUwuTqCOpL25QoN5JeY6b5ITnSmXfnNLw 1IQZooHtCL1TKB2Gfx2jZzTBSwQwwU8ehL+Ju2Oegglh3pwy+hX/3h6x0lGlcnpOwjN/ 9m1g== 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 h2si113699wml.4.2020.09.22.08.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:29:00 -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 08MFSxs7017599 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:59 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVH031723 for ; Tue, 22 Sep 2020 17:28:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 14/16] doc: Enhance list of supported cross-archs, drop QEMU reference Date: Tue, 22 Sep 2020 17:28:52 +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.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?1678548445366959401?= X-GMAIL-MSGID: =?utf-8?q?1678548445366959401?= From: Jan Kiszka We also test mipsel in cross-builds. RISC-V 64-bit is available but experimental. Furthermore, remove the reference to qemu because Isar also supports building cross for physical targets. This might be confusing. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index fb6574bb..5c3996d7 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -714,10 +714,14 @@ put into Isar apt. Debian cross-compilation works out of the box starting from Debian stretch distribution. Currently the following build configurations are supported in Isar: - - qemuarm-stretch - - qemuarm-buster - - qemuarm64-stretch - - qemuarm64-buster (for host >= buster) + - stretch armhf + - stretch arm64 + - stretch mipsel + - buster armhf + - buster arm64 (for host >= buster) + - buster mipsel (for host >= buster) + +Experimental support for riscv64 is available as well. ## Examining and debugging package generation inside their buildchroot From patchwork Tue Sep 22 07:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 73 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470955ooj; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-Received: by 2002:adf:ec87:: with SMTP id z7mr6450079wrn.57.1600788541714; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=lIA7k01WA7Z2+k+9tDilwMl95UYxnrDjp1wyZwA8K9kMK/xctMKCiNSS6DK5761LoX 0/xhF2SgqU6vrEHeFABLsWvME8tgwLNJUovOhXDQ5XD5IGPfLgUBGVDZJHQiXdwIFyri FjdBtQTEixc269kZpBpaFYuI33TPU8PtbzmgUPRIU0HuLcnAeQQYLfxvNATh5SP/BCBj 2xm2804aeFaiditgRonDIfgRgJqHkOMrFH2RpQXswPtSrh2e/9YIn03hFv0l+fTclaOD 6611KJxYxHggH43xaNO5hV2PzQCGYdDRs/LR4JY4N8+8oFvxaq9fNB/DvlisG4+oVu8a j3Pw== 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=63my7AtODP8SMsUQMNtjAN9grkPu/rJrYfa50IXvab0=; b=uS66/r//uUsVqCARDsAWuS/hTAgTeXW5X3VN8ucc17n4VSrFMgsnKnNRUDmcZOZi3Y YGaK5QjDlrRA9gH0XMvS8RJpwvQAL+3HIflDVxZYP/vRS4xB2HV7wEyq3peAJvpFqAdB hxhPtdECxCwE1r+j1wfN8a8CsrVdcaHG2SStVrQ0l5C1H9pOmPjsgdfwYoYxRQmQzLtD hr+r2EAHsXdP8Swq+1/0j9pWym3PY0jI3xndUO8GFyF35/Slm4oCS2H3RT9ozEIo2o0t 1Nl6opMqEET0uJ526JIj0N9+PJr3jNpHOPDNXjpfLEcgYN1NotUWXZQEe6JfOcz978CZ vYdQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=WT3Lry64; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@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 s11sor2079614wmh.16.2020.09.22.08.29.01 (Google Transport Security); Tue, 22 Sep 2020 08:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@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=WT3Lry64; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=QzXuZuE6wJZD1famxHDXfEKF+BcBWVVYX4F3duQqAXReVMJ/2W3d2n+XWDseu/i8zo Z/CaRBmjPSrlWymotTjJ2bbNaebErATgrkCkorvveot4C78HTT5RXvWjfyVdfmUA1PdA IzutlQx2wHMmsozN5uE2o291c2CGyraGzoL6SJ2t6bjiluKymmBD9zdqpJ0FpSA0SAPV 67eZ/KGfgeqvgcAUIDPkiHngfUpGPieCgESYsRelte35E15q0XjavD+uUVb0vgzb2mHT dVTlpo+2iSy41msCIxO1nKob4O7711QeiIl9hoozA0fn3H8yktWMPygdPTJSHPNVUHL0 UHfg== 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=63my7AtODP8SMsUQMNtjAN9grkPu/rJrYfa50IXvab0=; b=IwctjVLSmkl/+GHEmJBf5ritZ8mW4gUga1Z+UU/fS586DD1MC8kGP1nF3iwsIz5bie XEDWkCtecOev9AcwyfGbbJC6EKiBZd4zCzyc433p+JmDAeQ9eqwEQda0Xv4G5QhFkg/S nri+kPH49TGvAXhTNdLvxhWHktCNOiQWBwRTUj9pUklE/Nip1R056h81PTU1bw1K64c0 hsYif4xF+XyKu2ApXyTtKAgWB7g2NR9gJpD6CmEjatvJMu3hgcaHtQBKNmiqU/+xb2fD qnoXAaDqwyNUOnjIND/KEQj10fB28NiXRN2J/OX6XJLBnEbOA6aZwNeVa9/DsXhA9/K7 /H4Q== 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=63my7AtODP8SMsUQMNtjAN9grkPu/rJrYfa50IXvab0=; b=WT3Lry64LllkYvPK+3BGecheDMwthaBHIrR7RTkI7GeeqpgQo4w5Jz9BzLy16u3T2/ qGeOlqs2sk/HKghge4h4xceE22hTifK+CV59Yf+bdGF3uT0BFkZkNoDE0Ufbp7wZPST9 O3wjecWDuzKTUTInPVDbsC+i72l/MyttH4QJu1Q9sGJSeIFNdEkFkNhKVUW5AAImYBBo zVpeQlReKpWO9GWbq6EBt9Z2RX3F1GLgZ4wOqFEPikdjPoeAS+CPJX0sAJe6vX+Fr5Pg Egtbr1MFuUfMwuNf+l9zHZLn6QI9ZsRv3YwITVtDD9HqbbHpd8XdZ2lLS9BLfdjxW7zX h8jg== 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=63my7AtODP8SMsUQMNtjAN9grkPu/rJrYfa50IXvab0=; b=MGP+V/6oW9Dj9YfDpVipd8jQD7bBMhYRJEDz/7EEkSwkXGJVRJ7Ko5fd87LLlwljYo eumedzdajoEKWkIcwrnrXS+vcLzZ7MfEGHAr2OqbH2lwO2MbzIe89OnFCFeCZsQ6l5zY eQ3eG7vb+48JJ0CssNKOx3fcZky/Nbby0Dl3gUewBwVzGfnH03dgnATbGpIu4TfLY3d9 sOEEeXZNJOB2RiKSe+v9r0R4rBVPW7t4dp5zNAgG7bLfoIwYKRDJPv0ehX7rOmIwQn/g uZgqylHDZ8WXCN6Q2f4LvsBOHBIJJf0KGm5jkh/355chLGS807j7fWFZmXu+nvB1QZYK Kgfw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531cAuK+PRUUOilhAQBFkrfmRAJ4gMqNnyLfebjfiA7tNPNcheBl WF6wMfA85mOBEhQVMZpFr0k= X-Google-Smtp-Source: ABdhPJx9lZycW1ZUyYmemdS97Xv6+KwtTeWuD7foydg/ddqB/LZQh7N3cI6/WidGXO8eKr1dOB9uMw== X-Received: by 2002:a1c:bb88:: with SMTP id l130mr1604984wmf.143.1600788541344; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a58a:: with SMTP id o132ls1746139wme.3.gmail; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a1c:7907:: with SMTP id l7mr1570437wme.89.1600788540393; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788540; cv=none; d=google.com; s=arc-20160816; b=l1YL1SVwjw5H6eIM8jQlmz+wWdP9hhzNOK+rDXx2NHVadVmKNVorU6zJV3gOF7YhAi LcyB/snVR/pNlTO9Pu3XV5KbNcdXu1PTmpsbP8dxHSzBWsHyQECV5Q+ggYQK1T6kkZwt 5/TwqNsRk4dDgypxvEFDWPC7v+HUl54IvG5uIjfewpa2B/+VnIbMtctUfTRFCUTHAA4Z GnrXGmEbBf2gah2IFei+prbaFDO8KCw41ej8iHk794ddbNd3pEMB/PM+BTAwoXcR3tif TbMmbiGWMnOPRjxZb6MXYNKC1BC0g2JFjnDyMrgK4ilZs8VjI83iW2Bb942OT3x1IdQ4 rfAg== 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=UdZJfDWA5EYrNWEusu/gsoO7cJR8zNzQwvOyfE1aQZ0=; b=O95Ma+EOq3rkVB8Zv7jeLXI+KW8yNi660gU7yb7/AEg2zQ4O3SSKmDwHdulOGe7Y8g ZV67Ff5WFyiBBKmVuNkDHFxrpq+ua41LzZoXEH6PffOCffMYC9oVLtL899VWzC5fclxc mmCggM7h+G1RV0eA37s0PR9lYS/2UYOM/TcHyuaIZDU8OG1m6o1CRIwfxkSVwZXdeubV ICA2/96IaFx8pbi5XF/AfFLRRAnEB07BW6tK/Y9vUPL68bK8U6CxaL/+H4ocqCS+iOJ/ kSDjExtBVqNry6YOWZRs/jiIBevi9/p7wfxXE3C7gLTmfdx5p1JG2ixNNxxRsJigBA4g B8Eg== 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 z11si446316wrp.4.2020.09.22.08.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:29:00 -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 08MFSxce027325 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:29:00 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVI031723 for ; Tue, 22 Sep 2020 17:28:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 15/16] doc: Describe new compat arch support Date: Tue, 22 Sep 2020 17:28:53 +0200 Message-Id: <091e352d55ddced2b63914b238b1777f15131823.1600788534.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?1678548446011201161?= X-GMAIL-MSGID: =?utf-8?q?1678548446011201161?= From: Jan Kiszka Signed-off-by: Jan Kiszka --- doc/user_manual.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/user_manual.md b/doc/user_manual.md index 5c3996d7..dd6fc344 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -723,6 +723,19 @@ Debian cross-compilation works out of the box starting from Debian stretch distr Experimental support for riscv64 is available as well. +### Cross-building for a compat architecture + +Some architectures, under Isar amd64 and arm64 so far, support running 32-bit +legacy applications on 64-bit kernels. Debian supports this via the multiarch +concept. + +Isar can build 32-bit packages as part of a 64-bit image build and also enable +the image with the necessary packages. To activate the compat mode of a build, +set `ISAR_ENABLE_COMPAT_ARCH = "1"` in `local.conf`. Packages that shall be +built for the compat arch need to be tagged individually by setting +`PACKAGE_ARCH = "${COMPAT_DISTRO_ARCH}"` in the package recipe. Non-tagged +packages will continue to be built for the primary target architecture. + ## Examining and debugging package generation inside their buildchroot From patchwork Tue Sep 22 07:28:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 74 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470962ooj; Tue, 22 Sep 2020 08:29:02 -0700 (PDT) X-Received: by 2002:a17:906:2b4f:: with SMTP id b15mr5714035ejg.477.1600788541951; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=Kgb+RWnhzXXXGqfaPLobcXMkIorbidhjejpe8sesPGhuYBVfZPLac3jaPcm2b4BBYz IeueAyG3PKM42z5hfy2uRNPm0FmOlDo6mdoJ/dWFMYPwn5Px9AjaqH2C9xqB5xKyE/z3 hKdiNArZvtnRSSFaVNwL7zMlGVwKt2IVx/aWUve+LCkOs6xkQ/ei3fpCH7KSVHgeOXB0 sKnW+ozZxu0JjNOvXtInZX7PnTdmMfZpeN3g8pS2DrX1D5llQo0fzY9Vs7uPwmNPmYvN Y9e6NNMU+3KSpgrEG7UXwejCb9XOs4/do3Czkb67cOEsfMAVDWbnfTF344pdtXTzW8wE YF4w== 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=hi2wDTq2eNwMRNDmIh3Y9DvIlaMlBxKzgis6C78isR4=; b=xeWHxh9FToURe+hRFRMw0xQRj80waR3OOJfYyGWlnV8606O2dBv0x41IlH1b7cEUkj HVx0pYYdjClWBEsvEkJ7Gx1mRyFm1aLGfKZzEACrLubV3r84W3103zfxjRtfWJp3XZ+O npb1OER95ZVwm8zZjqTG55dC6ltlAA7LnUZEfy33OFSipGh/Vw3WZmQVieUsEeyP/ugC Py7/Ax2aDMOm04r0mCkHHpGoX+Plfa3d2W2cyM7ofrmb5TIM5EkrmGxORRCJenHrJq9N V4YtnDKcCQtu/KHp8JI4/dK0E+Vk6iJGt9qA2+OT4PGLJO4WEFvhoysrG9lBgb0fCCEs FTKw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=VAqkbJnZ; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@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 g23sor7946417ejf.87.2020.09.22.08.29.01 (Google Transport Security); Tue, 22 Sep 2020 08:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@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=VAqkbJnZ; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbpnqvd5qkgqed3u43dy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBPNQVD5QKGQED3U43DY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788541; cv=pass; d=google.com; s=arc-20160816; b=xxexNLhOQCjqktbZpF1jgC2dvt7pODOWRW4TCm0dn1wGLrgBfVdc9MVo/umSNTx6Lx CJ0+FOaZOkvxk88BjFhs+TlWDsiMwH/A6FEAPr8gaJDvdGtynFUShgQGzx96KzW4brqQ tYMpJ7EUGx7AB1MUkM1sAH1RT51mlRiOT6N3oO8eWkAOxF8wLJIVeWlDN5eIRZQLIeKe XXkSkEHr1GGmOizDCtLc6EIlC5S4MXKAmXDIZDI5LRxjUNbzSUltbQDRIHNJrqEYO9UJ Mdf+aFWsJZaboecoSDDoh+vSL5IwRSmelshL6skyPjgmE4PY9c9mBXM/mGg3o9WKdIex 6CRg== 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=hi2wDTq2eNwMRNDmIh3Y9DvIlaMlBxKzgis6C78isR4=; b=lrlSgPfZpDcDyd4mqYd1h6bqMirYWTzRlhxiP3hIuaUTR6GAVzkEgE7F014jaZTv9R 4wfAD5mrwNC02vr5g2hlF1Rn0YXZvLjKpKBjHzNC0PH+mbV10Y5eryQz7a5hEFBrsBzx n7K15k2AC+cemGy/uHWvEBK9qk2VS/iKj7zo8QQpjqLReSaaN6miUjdPMbILLFe+cNnK EH42h6Fw81ka9S6GQ8aI60G6baiwq3aUs1j996arQHJRVxKHj9uGjW3x0gGRuqI5FfUi NAhDyV4iiO69zCCDNXPs/jlaMhWytIG9Y0krPGkr3mnUbWXcTnwgC0gVVWMuW3kbXNVg 7GNw== 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=hi2wDTq2eNwMRNDmIh3Y9DvIlaMlBxKzgis6C78isR4=; b=VAqkbJnZ5jGyvHGScwSkM6xV4K8MkOXfXr0VgPIDcAefAWyQfLjeNoqOZLd/WYfiFy 7RmnWL0vIJqrCAiV1BeCtb9d6cfdu0Ywwasu6qEkVkU9jI+JdvAH9oY8MUHNiy3KBvOL TzVOUsQVycTylV8PU5Pi96zH4cTx7T/EVp8v7Nbk56d0k1cbg/5NkBGKmKliV/slTPdu 92x5JZcgXskfFUuM8uPmyM2e45AvjbnRQjLJBFFkcba/S5mrkmfn4sEkOsBnZD5DnMKb zZgOX4q5iA9VwUj7ESJ/+lOhEw3m1+Lc42llaKKaRq8TxcCZb4+16K1f71k9pnnqKNjl 1ESA== 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=hi2wDTq2eNwMRNDmIh3Y9DvIlaMlBxKzgis6C78isR4=; b=C48kK0ut5HuV+Cn46XySjSQ4Mq/x/2FzsjNsMcSRgLMPE5A0LTFbDlVZ+dfnND+pe5 nFzXBU60X5n8QUiglY+zLfyYJL1Ld9VZImqX94Oi6FhmqYyESAqY8kGH2bTFYhRPRStA eruhxxaFeQiliKrPi2AdiHTNOEMngHPd6RQRTip/4cZMS7gMrLwWQxudfpbJBpAB54ny HWRXk+/FaZhul/jigSK95H+uJ4jvNrDgR9K5d7DZ0t68elnELKt0uRjoF4H6WgbI95DZ 5mXORQEWiarI3rhqzLUH3gOS/seaItipxSHlMU/M2SkT+D53VvQnYFw97eSbNM+y3Ij5 EteQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531cQ6CGw2SBWVwUVh2nq69VceqnuPr4sixLGgED60yBJ+Q81hV8 IGhU5KQ9mpU13NQ7Rmx7OF8= X-Google-Smtp-Source: ABdhPJx+OZ0bXQZ3FFdFWUbGwFAQKjJzVtvXoWnkS09CT6MRFgKLPZZzxvYx/fg/UcVyWzh2V95cUg== X-Received: by 2002:a17:906:3957:: with SMTP id g23mr5875095eje.24.1600788541616; Tue, 22 Sep 2020 08:29:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:8a96:: with SMTP id j22ls2945066edj.0.gmail; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a50:fb15:: with SMTP id d21mr4659554edq.150.1600788540668; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788540; cv=none; d=google.com; s=arc-20160816; b=bUDeN8B1DrhupfH/1yTLh1S6m4YptOsK62/ghFJJ0RY6DsUrv+0dEL//YenOapq/Vd FLR5HJhXJmsYkkwjTAmICjoJCqoWlYE+LO2hvbjpc9ENbvJTLpudOQOY7wnI87dxFsdP ucJZgYznBthnrOxFx8AXSDX68/YwI3BQZCpQna1gHk9rQ6W2aAuGfQVhYVsFtw/fVbLA LVAFk/lBMU3De7DKbIw6o2rWmnI2cHsjgmPCLJbfJwPy+/6i2L4KN+crXBY0uUjc22sV KLAdLxfE2+IC9WZ6QCvVvLwxJZPTigQrfEGXuPZp59SXYVlWCw5KjdMvGDQUWK51oTWT Zq5g== 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=vbMUKbxZZjiDzkDfm7DPARTMq1tdzcr08sPbhwJdwJs=; b=L+ygx2yayWc7T5Lu4tZTfG/P5QTuPrNyruxwoIH7CI4mbKy/WPxnfQtcYf0jHh1WeM GudeUPnOWdFhErNhfCpmPWz5VJy/SYlafNCvS4cJvYOsp5XSnSgGK/he/6zjkgdc/ByB n8SFWlXjI8l9jY/DmDxE1SG0L/f9/xB+8NQfs1+OQeG0NE1HKiJXMZw8cwlNdloerIjS Ey3lgw4BsxWQZAFa+4a0f6uQZlvMP7JvI28YAKpTt5dW8A25s3UboKpNk9lrdchPP5Du C7LjbaUsouDVkSNhVKYeir0A8lOf6AqN8+uTOeURO0WoYWn+2/xrmRz/SE9P+DakFIDf 17Rg== 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 r5si376886eda.1.2020.09.22.08.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:29:00 -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 08MFT01T017609 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:29:00 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVJ031723 for ; Tue, 22 Sep 2020 17:28:59 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 16/16] isar-bootstrap: Connect to gpg-agent before adding keys Date: Tue, 22 Sep 2020 17:28:54 +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.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?1678548445637502621?= X-GMAIL-MSGID: =?utf-8?q?1678548445637502621?= 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index fbfe669d..957dfd6a 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -303,6 +303,10 @@ isar_bootstrap() { "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" find ${APT_KEYS_DIR}/ -type f | while read keyfile do + for i in $(seq 10); do + gpg-connect-agent && break + sleep 1 + done kfn="$(basename $keyfile)" cp $keyfile "${ROOTFSDIR}/tmp/$kfn" chroot "${ROOTFSDIR}" /usr/bin/apt-key \