From patchwork Thu Feb 24 21:40:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 1530 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 25 Feb 2022 08:40:58 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 21P7evPi001575 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Feb 2022 08:40:57 +0100 Received: by mail-lj1-f189.google.com with SMTP id 185-20020a2e05c2000000b002463aff775asf2207641ljf.17 for ; Thu, 24 Feb 2022 23:40:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645774852; cv=pass; d=google.com; s=arc-20160816; b=FxLUTeuq9BB4rMkE20grFxCODcpI2eFVKyiyTTXNzXeDNoA55wtEeUzHz6XRfwlT2I tz+o8nRfMKXdy+DwbfDj514999ssNgU0F+87leinJitm7gx/LNfWalXCg8uyShTR+vrY Vrk6iklUpXCasAVTNv9hsracv9Tn8BBMdQlA513bFxSLShtQFBecrKWOYm5papff8ykx DG94Y+7fs7gqumdA4ukoavx7A47azCvc5XNmFAShLtqFiY6KdnG7SkaDLZd/TQf3cFQe U9F95eP8cQospZzEdA6CzYg4eeM4Q6bybhO9Jw9vV12JPAJ/6ePb5X+mQT0MbBp4PUe9 MkQA== 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:cc:to:from:sender:dkim-signature; bh=Ew0ShTDgxpPzu740gbUo1wWHajC17I7Qqs5zMnTogZw=; b=cfG7ohjoyfr5Yp1MTq0Ve5VGeoZo9wSGP4S2Je9IqYBs+/jtQbw0yEsOZaTGPTD939 zsUpun9ADKJmgrjpUIgsyi37MldObfpb+frQYnlKtoH/ccGs54eKggCvvhmeK51aaAEx f6jI7BvjykXoVq/BD+mTMhoVFuNfUFnstAaz2R74sbm3FduX7yQRcJdDWETz9g8ucQbP ttuloyAHZRGrnu3jvKNWL9uhgS/mZeQI+z4BthWjXQMuLU/pVh+G/y5l2OeepHIAwRV3 rabVEDEUppXern3Tvqkhox1fP60Fe16JAb6PAoLCtZxVdD2xRlIneF5eRCv9C9ooVj+v s2sA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc: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=Ew0ShTDgxpPzu740gbUo1wWHajC17I7Qqs5zMnTogZw=; b=cnTnKWXFUwEKi3/Gy+GrLDNrZIfgAakOUkwMVC33WOYJMp/Trc7cvXc9k8PEelQynr dURCFoE3035/gUP04ZFp7LamtECEK4GuKBxNB9gQYxmpZ/GIokZ5O8t5l639ppyBq4uN wN/133kA3rGPD3tdMjxh/s+Z2k/oEVivdF0Xrb1HzgbYF1tOnkL0cBlbn0ZGMotlKzER m8m9BQExFc3sKBqGtM9M+wKHCLEekcEcctjCxSsFoGBNCUN5BlvWPrs68UiO/3pIaD5b tfI5mtL7JnMHpLxUnGVbaqLI6Kcf3C0hcIq9XnaidDasOysew7vS9xLfeDNAjlMH7p6H 0DPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc: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=Ew0ShTDgxpPzu740gbUo1wWHajC17I7Qqs5zMnTogZw=; b=mOTXtFP3Oifk9R2Xe8DvUHskAzO1sNxOTmQ2VSZMSQBQs/Qn22mqpmNDnAZNq/r7Jj K07JT1YssiPLMWGdoQwSY4HutJeLMz+p7XjIQTuTPlfbW/WEBtKjk0pVYujsTRNl2X4M aSYucTpiDsAAIGH0DUn9dzw6EPYIlWsrRF7GAZ0ee3TnSZaxOdDrZ9BOUYPEyDf8OncO 1ofMLVYalnW2VXeELnc3CupwdlYxNeoh8eVGIINEaHheusDYCzc6yLEM5iobCc8Lp63c K39KEN83rKA0tjyamHD+Jc8gzBLq1mS0iTIm4U/3PJY7ULFs7l3S912dQULQ2P+zNNZK gIOQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532rOU6kn+KdV1bqhHQoruFn+gwCGHZvvTcLEvWa2dkK44DSCA7l DYVfaWpQFawqvS/355Hbvjo= X-Google-Smtp-Source: ABdhPJzrKZG7ylfpMQKeW2Ba/WvxPpwAh3YH7fdqxqdwue5v3vpTcpSbmzJEMVYYEMSh8PcrgvMM9w== X-Received: by 2002:a05:6512:3602:b0:443:739e:a3e7 with SMTP id f2-20020a056512360200b00443739ea3e7mr4034639lfs.516.1645774851949; Thu, 24 Feb 2022 23:40:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b8e:b0:443:9610:6a0c with SMTP id g14-20020a0565123b8e00b0044396106a0cls1819778lfv.1.gmail; Thu, 24 Feb 2022 23:40:51 -0800 (PST) X-Received: by 2002:a05:6512:3147:b0:443:323d:179d with SMTP id s7-20020a056512314700b00443323d179dmr4295510lfi.98.1645774851026; Thu, 24 Feb 2022 23:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645774851; cv=none; d=google.com; s=arc-20160816; b=KA5qun0uKh2ch9Z9JkduDAJZyf8Kq9PuS99zOljaMt3n87XHN7GwP3tPWTPHmg+C6D /lV97AThZiBUqoDpilCujXI/fyFyWizUfnAeQKLe9ij1ydJMdWIc4VXVNdeqxA2X8y1y PQHoOdRACZucfH/qJwJ4mV32hocO+Go6eYS86ruoOVUpIAoj2hkYmzNQ/XzkOT6Kl3lN lQUL2i0SS5rZ2udsxVerCVb3vpyvaNoWs+M0RIcmQwLi62cNnD2WNXLp/G5XN4/7+Xf6 lqcu+zdvo0rXwnrBBAdtDa1k2+NMG2jvWIhXrM6J4ba9TyN9Bh6DfHPRpuYuR8hxj94K vYww== 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:cc:to:from; bh=nFcZJwCduE4Wk+sYDd/SAy5Mpp6iw8ho5zU2he7x17c=; b=svvgq58JsLnQzMPpVU4eToxzG3suN3gxiur3ESdKYr6PlUY7BlK2oiBQy0OkEnjItG o6Tg4iRro5WdNG1Q1PiCK2DadXoJNzhPYwiWOINvfWjbsbiH8ht9oXJwgfzuvelZHUp+ 1GbfR0+T86+anoAm25M5upZqtBnmJeeBoH1/+aLE+ds1hoZ+qXuMlGjcdRuIG3fot3TH OJT2nIvQ1hA1UmXjzKDttXq0NcfsnYpGIm4vQuSTqJI0pAKsmwIRrSV37tRQs72E+iKX e5CG0Q5LL7vy25YHrX1SHr7ZU8+gEYvP+M4hGTfEiV/R3AFldb4UYRgSf/L3y9Go3fRs e2rQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id v12-20020a2e9f4c000000b002463b896be4si87239ljk.7.2022.02.24.23.40.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 23:40:50 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21P7emqp001558 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Feb 2022 08:40:50 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 1/5] dpkg-base: Cover do_apt_unpack task by lock Date: Fri, 25 Feb 2022 10:40:36 +0300 Message-Id: <20220225074040.20975-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225074040.20975-1-amikan@ilbers.de> References: <20220225074040.20975-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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 After moving apt-get call from lock-protected do_apt_fetch to the do_apt_unpack it should be also covered by isar.lock to avoid conflict. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 928856a..e3ec133 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -142,6 +142,8 @@ do_apt_unpack() { dpkg_undo_mounts } +do_apt_unpack[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" + addtask apt_unpack after do_apt_fetch before do_patch addtask cleanall_apt before do_cleanall From patchwork Thu Feb 24 21:40:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 1531 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 25 Feb 2022 08:40:59 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f192.google.com (mail-lj1-f192.google.com [209.85.208.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 21P7eweS001580 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Feb 2022 08:40:58 +0100 Received: by mail-lj1-f192.google.com with SMTP id h21-20020a05651c125500b002464536cf4esf2190203ljh.23 for ; Thu, 24 Feb 2022 23:40:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645774853; cv=pass; d=google.com; s=arc-20160816; b=qs/Q+tv6HHN48NvDj9QqY4DG4kPoBwCf9jO+BN2Fv2RU/ddRdE64Rm9qOA/gQl88ze OOImZu7SsRvoyKJ39p0BrqfWpjy1vp2Xba33d7gMZ2wH04C/Dq3UR25SSxCSMysvA/i/ ac4DE2a3LOXb/mjmh0QzOHn+bqMKD3cBVgs6tc1FoPPu+L+UMdKRB2mloBiaOFg5rCvr lKasN5x+uKi9IYdRA9huC+BvetA/V42CNN+JLFd7YjXUxKRMeTO2TL8vXS1OlQAN0p2n jojzPpOyoNlg1DDmHIqeZtdPKlTaciwRxN2CPxusgnlzquCypuf3N7IT9JwxBUOsMu2Z Up6Q== 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:cc:to:from:sender:dkim-signature; bh=owJYtCs27qeSBwhbe/X8pHJK7rmjzosUia+KmC1Z4gw=; b=ep0aHzrOz5yTD/GWTF6479LIGyogKPfMbS5MFohl33Ho9yQniLHZdAQn0CpVFoIrk6 DY8i9oEMnP5uKB0E2YA2zfZxwSFQH6kRFzbsdpwUoDYaLPbz9OSCY0hHhFHtPbtoeQiG fRuHzCgtiaCNZT9eVPluhn+JSAukhb9SdS4IjfhYq2Zee6h6psDSCE5y/znALHoX44pL okoPItwF6l8tN9x0AgP5OrLi45QeZKwGD29cWjsABWs36koF/EKf80pAJXrY+f85hd3y Zg/iYSG1kX+lBhdbjpvrXa6O73EUc2AsliSuEfA8EtjHFteXugbRvcejoYGUu/CpwtsM bl+g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc: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=owJYtCs27qeSBwhbe/X8pHJK7rmjzosUia+KmC1Z4gw=; b=oj2czKdWaBlKHITEsvA2CGSQyiBOcjjh4lt8PGXSHY0nBGiNQ87Eonu9pUmtCLFpxj UjyuxmIx4qh9ECGUyycNUP91U2KzEfnPPjk9lDY3oBaWe5jvdj6xgvCCHqmNljqrgyhg GfoNirM7/sTRim/NonFOMe84cfg2AarmjdabNVGPAQn/9NVj0Kopdl4Y05zYBaTsWWL2 nhHoL7SqijSp2FvCg4koDsyRv7N0rR/KZl95AV6iL3tejlce87ZqnDIXQA7TnHCaeOw3 EC6ynyaFFM4hnrUGOLhYJWmnw6h37w7JMexr1JgRd0vUtnTPTiOVyWOwspkm2r0AwdYd en9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc: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=owJYtCs27qeSBwhbe/X8pHJK7rmjzosUia+KmC1Z4gw=; b=fIMOwIiLLtOwN1RhyjD+UORNZTbfeSYTCQuMB3tRAsFlc3dySKPk7AaDBzT4U7IaJC NtFkkLyzRXinvI5oKWJHhRVLn1hTj6I0ehMjAYWLJDCRPGdV/5h6VanRO/nLWlLWE7Dm gQEiTCNPyt8PW3fTHe9+XNwcQclVDuZ7xA/De/f25XpCIM4wwFQBfhiuSjArBhCT8tRd amLF4K56xHcGWfZpslU9xUEbR6A72IMORy4e6SNpI8Ls2NHxijh+lD5kj/1nTAj9HbLi 5V4yeSP0eFvWts9LxZVVFRDWu43+PPkuuR4SabdG6UHddSQcbRIaqVFX8iv+jOIUX+BL 5TOg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532eT8Dv1KkKdrWay/6XJBmBRsIjkMl/PFPRdNYLXNm9Dg+PPHqn n7SuYJHsjtT/wSEKqqiAKzw= X-Google-Smtp-Source: ABdhPJzNVRIPUlmO6JWAG6Z4BpASEJzWherT3j/rx5qh3mu8+V9wf+5ZLZKp7ZVb9R+dk2rNBBmf4w== X-Received: by 2002:a05:6512:ac3:b0:443:d3e3:db0a with SMTP id n3-20020a0565120ac300b00443d3e3db0amr4259671lfu.298.1645774853104; Thu, 24 Feb 2022 23:40:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15a3:b0:443:7b15:f451 with SMTP id bp35-20020a05651215a300b004437b15f451ls146537lfb.0.gmail; Thu, 24 Feb 2022 23:40:52 -0800 (PST) X-Received: by 2002:ac2:5963:0:b0:442:eff6:4219 with SMTP id h3-20020ac25963000000b00442eff64219mr4192029lfp.56.1645774852188; Thu, 24 Feb 2022 23:40:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645774852; cv=none; d=google.com; s=arc-20160816; b=z0B+3ykBsPz0mqRFGjGBOBxKZWyJQEfHL1JWBT6KStQVnXdmtXJq+E6vB8NjxhU99H XIWodA8e1M4CMNCi5wGzAZqdIGFbCXYqOMyVpqZlElFWppTyJZF6ZiuZ1hC2yM062ioD XdTrT61hALey52tSeV/8C8SZo3L+43DqNByIFroBycGtPn4iKpzA/tXp2slZ2yw63UTa hVi/4cl9BhW3WpO4vRk3Au5I8z0ld4oYEQumulmHk3dyWNTD5g0mn6Sajw2QIT6AU9OL eIfMBU/8ucs3Gl36pYpBxUuDtf9voIPEUMmj9GjiBrwdztmZ/sdp4+SGFapaIfkzW/NL X8vA== 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:cc:to:from; bh=t5dJzx+egQ1wtk667RJp5DbnFahR/p2vyY4v7NQjgXE=; b=IQWteqj001FAFyjpDzk0VsY59GUszECyWS24dEGOIKX5NVwGRcI+Wcz1rSC9/NXGxq GI/DoJBqy3g/9dLJvkFnPkYgljpSB/I3SJh7hxOzgfRw7oVx4D+ij7mn42cvrGluzzB1 dLnTTrfTJYaSPBMraDomck6gmQ2zGikCVOchGjKNi48MoVxjnXFZIM9zpdRUvPrPeHPB pdkPW4Fs6RsVezoRYEOz9t+RIcMvJD1koXen+4Y6iXy63D/CC65YM8j1xBw4jZ4VBY3x XYFIXxRESN5n0mvNHT33GaPTZia0reSSCtRViwFqpUMTo+prES5AvnC8YZbH5iezDawv ar4g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w24-20020a2e9598000000b002463b72fb7esi94355ljh.5.2022.02.24.23.40.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 23:40:52 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21P7emqq001558 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Feb 2022 08:40:51 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 2/5] meta: Implement two stage build Date: Fri, 25 Feb 2022 10:40:37 +0300 Message-Id: <20220225074040.20975-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225074040.20975-1-amikan@ilbers.de> References: <20220225074040.20975-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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 Split package build into two stages: building source package and building binary package. This allows to obtain Debian package dependencies before any build steps will actually start. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 34 +++++++++++++++++-- meta/classes/dpkg-gbp.bbclass | 6 +--- meta/classes/dpkg-prebuilt.bbclass | 7 ++++ meta/classes/dpkg.bbclass | 21 +++++++++--- meta/classes/rootfs.bbclass | 2 ++ .../buildchroot/buildchroot.inc | 2 ++ .../buildchroot/files/build-source.sh | 16 +++++++++ .../buildchroot/files/build.sh | 2 +- 8 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 meta/recipes-devtools/buildchroot/files/build-source.sh diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index e3ec133..916bae7 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -75,7 +75,7 @@ addtask adjust_git after do_unpack before do_patch do_adjust_git[lockfiles] += "${DL_DIR}/git/isar.lock" inherit patch -addtask patch after do_adjust_git before do_dpkg_build +addtask patch after do_adjust_git before do_dpkg_source SRC_APT ?= "" @@ -175,7 +175,7 @@ do_prepare_build() { true } -addtask prepare_build after do_patch do_transform_template before do_dpkg_build +addtask prepare_build after do_patch do_transform_template before do_dpkg_source # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt do_prepare_build[deptask] = "do_deploy_deb" @@ -238,6 +238,19 @@ python do_dpkg_build() { addtask dpkg_build +python do_dpkg_source() { + lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", + shared=True) + bb.build.exec_func("dpkg_do_mounts", d) + try: + bb.build.exec_func("dpkg_runbuild_source", d) + finally: + bb.build.exec_func("dpkg_undo_mounts", d) + bb.utils.unlockfile(lock) +} + +addtask dpkg_source before do_dpkg_build + SSTATETASKS += "do_dpkg_build" DPKG_SSTATE = "${WORKDIR}/dpkg-sstate" do_dpkg_build[dirs] += "${DPKG_SSTATE} ${S}/.." @@ -300,6 +313,21 @@ do_deploy_deb[depends] += "isar-apt:do_cache_config" do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[dirs] = "${S}" +do_deploy_source() { + #TODO: dsc_clean + find "${S}/../" -name '*\.dsc' | while read package; do + repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ + "${DEBDISTRONAME}" \ + "${package}" + done +} + +addtask deploy_source after do_dpkg_source before do_dpkg_build +do_deploy_source[depends] += "isar-apt:do_cache_config" +do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" +do_deploy_source[dirs] = "${S}" + python do_devshell() { bb.build.exec_func('dpkg_do_mounts', d) @@ -327,6 +355,6 @@ python do_devshell_nodeps() { # devshell may be placed after do_instell_builddeps in downstream classes. # devshell_nodeps will always stay right after do_prepare_build. -addtask devshell_nodeps after do_prepare_build +addtask devshell_nodeps after do_deploy_source do_devshell_nodeps[dirs] = "${DEVSHELL_STARTDIR}" do_devshell_nodeps[nostamp] = "1" diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index d956e8c..b02aed0 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,8 +12,7 @@ PATCHTOOL ?= "git" GBP_DEPENDS ?= "git-buildpackage pristine-tar" GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" -do_install_builddeps_append() { - dpkg_do_mounts +dpkg_runbuild_source_prepend() { distro="${DISTRO}" if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then distro="${HOST_DISTRO}" @@ -26,9 +25,6 @@ do_install_builddeps_append() { sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${GBP_DEPENDS} - dpkg_undo_mounts -} -dpkg_runbuild_prepend() { export GBP_PREFIX="gbp buildpackage --git-ignore-new ${GBP_EXTRA_OPTIONS} --git-builder=" } diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg-prebuilt.bbclass index c32224b..c5d645c 100644 --- a/meta/classes/dpkg-prebuilt.bbclass +++ b/meta/classes/dpkg-prebuilt.bbclass @@ -18,3 +18,10 @@ python do_unpack_prepend() { deltask dpkg_build addtask unpack before do_deploy_deb + +deltask deploy_source +# dummy task for 1st stage +do_deploy_source() { + true +} +addtask deploy_source after do_deploy_deb before do_build diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 320102b..e95420a 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -17,15 +17,17 @@ do_install_builddeps() { fi deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} --download-only + sudo -E chroot ${BUILDCHROOT_DIR} sh -c "apt-get update && apt-get \ + -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ + --allow-downgrades --download-only build-dep -a ${PACKAGE_ARCH} ${PN}" deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} + sudo -E chroot ${BUILDCHROOT_DIR} sh -c "apt-get update && apt-get \ + -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ + --allow-downgrades build-dep -a ${PACKAGE_ARCH} ${PN}" dpkg_undo_mounts } -addtask install_builddeps after do_prepare_build before do_dpkg_build +addtask install_builddeps after do_deploy_source before do_dpkg_build do_install_builddeps[depends] += "isar-apt:do_cache_config" # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" @@ -42,3 +44,12 @@ dpkg_runbuild() { sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} } + +dpkg_runbuild_source() { + E="${@ isar_export_proxies(d)}" + export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" + export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}" + export PARALLEL_MAKE="${PARALLEL_MAKE}" + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + /isar/build-source.sh ${PP}/${PPS} ${PACKAGE_ARCH} +} diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index d578dd3..c5ea748 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -88,6 +88,8 @@ rootfs_configure_isar_apt() { mkdir -p '${ROOTFSDIR}/etc/apt/sources.list.d' echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ '${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list' + echo 'deb-src [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' >> \ + '${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list' mkdir -p '${ROOTFSDIR}/etc/apt/preferences.d' cat << EOF > '${ROOTFSDIR}/etc/apt/preferences.d/isar-apt' diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index aa190e9..2872680 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 FILESPATH_prepend := "${THISDIR}/files:" SRC_URI = "file://configscript.sh \ file://build.sh \ + file://build-source.sh \ file://common.sh \ file://deps.sh" PV = "1.0" @@ -58,6 +59,7 @@ buildchroot_install_files() { sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder" sudo install -m 755 -d ${BUILDCHROOT_DIR}/isar sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR}/isar/ + sudo install -m 755 ${WORKDIR}/build-source.sh ${BUILDCHROOT_DIR}/isar/ sudo install -m 755 ${WORKDIR}/common.sh ${BUILDCHROOT_DIR}/isar/ sudo install -m 755 ${WORKDIR}/deps.sh ${BUILDCHROOT_DIR}/isar/ diff --git a/meta/recipes-devtools/buildchroot/files/build-source.sh b/meta/recipes-devtools/buildchroot/files/build-source.sh new file mode 100644 index 0000000..a327c9b --- /dev/null +++ b/meta/recipes-devtools/buildchroot/files/build-source.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# +# This software is a part of ISAR. +# Copyright (C) 2022 ilbers GmbH + +source /isar/common.sh + +# If autotools files have been created, update their timestamp to +# prevent them from being regenerated +for i in configure aclocal.m4 Makefile.am Makefile.in; do + if [ -f "${i}" ]; then + touch "${i}" + fi +done + +${GBP_PREFIX}dpkg-buildpackage -a$target_arch -d --source-option=-I -S diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh index d4709cf..c19221b 100644 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ b/meta/recipes-devtools/buildchroot/files/build.sh @@ -14,4 +14,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do fi done -${GBP_PREFIX}dpkg-buildpackage -a$target_arch --source-option=-I +${GBP_PREFIX}dpkg-buildpackage -a$target_arch --source-option=-I -b From patchwork Thu Feb 24 21:40:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 1532 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 25 Feb 2022 08:41:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 21P7f0jQ001585 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Feb 2022 08:41:00 +0100 Received: by mail-ej1-f58.google.com with SMTP id mp5-20020a1709071b0500b0069f2ba47b20sf2224263ejc.19 for ; Thu, 24 Feb 2022 23:41:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645774855; cv=pass; d=google.com; s=arc-20160816; b=GoB9S0HrwhKXkdYI0RtNe1nB3P1WZMoC3KI5TsOZxYucOIXw09nnoxc3WwY2lS3jtl sypu5zgRoabwn5N87GafAFE91/8Eh/+Oik7FRZajdUODjQvG/FmVNASPuxALeYX7qWFH 8vi3TVt2eYKlLGW7ipkYJJwWP8WoqpUDNdUZkgx17buOBP3lk2d+wLOfUGGPJZMDXRJq 6i/gQomMveGXmuUKvFs426NEp7uNlZLqqiv/5DjhaMSvicNpnjKu5Fl9n2Mrt9ZDyAL7 XqpEOG1oDi/hQcXRNwWMHyhjNsFjqw+WUjfinXFhmKD28ebGzcJ00VC9oY/GzxmW+LLb fk4Q== 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:cc:to:from:sender:dkim-signature; bh=Cjt4cZwk3+HY0+A+HJ7347tOU5F1s19EdCHUOhV1jOM=; b=JENDMKtzhEQOZX/7KxEtQd4pAWg4RtUGysBtk/WXF/mF5x8kC3JJ53M9z1ipXNJhCu rJF03MgrZcC05Cs8So+OupE8V28GglPNdG8bld1/gYfqqPJDgw9hrF6CXC9WAMMbtTo7 QNiqs/y5wISGjiyF90y0zoGLbSeLtEYRv5Q+baxmmA7pyiHKMz3XsR7Q4CTkdOnWmHaK 017tfCSTAEfOmFInwVJz0XKTLjZ6Q9/AvCEpi2/fWow6O4XB3wkcAYBpNc0N8HWClLT7 eI7HWvKE2MjmPlTDCa8/fsUyiv1/vQkyldTFLrpyHOEg3/XhlsRvK8ZPPyPzUZ6EUFbT LGFA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc: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=Cjt4cZwk3+HY0+A+HJ7347tOU5F1s19EdCHUOhV1jOM=; b=Wxc0Z4M7BmVdRs7LPdLxV3Mxh9t0YjW4OrZ9SNjHFrVsGaZX5Io1jIml5bcIcaNDyQ /WC31f1X8Woi5lhdksWS++YDS5m9zPjLiowW/XmNUwconY82eZWna5gEkId17EStw58c lLY8tZszkFUXoRkM/1os/atb7Trm+OpezMcmnuI/IscziUsWhudrovPKjwK/8q/jN3d2 fMHojh7GuEUamZMrgsnEH70t5TDFIUMaoEz/6MULN4l7/nlUfc2awL+Z51N+PHNQtz3o VwsfujO1v4xwh1FyRy4+wUQzucdLjvuwH1QfzV8njrLIT5bl4Ax1n/4tLxdVuA2p2lzR Fcdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc: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=Cjt4cZwk3+HY0+A+HJ7347tOU5F1s19EdCHUOhV1jOM=; b=G5gIa1zn/ThVVCfN2aU7sJ/fchqUC0zxeJ033i0AGdDdM4XzNRLHAzsFNjdf102om8 VgSFhwyjp41SiyVlLjb5tzTRkD3tR5mTwV3xpUSVeh3h2rz6LMa8XveDbkKycZeV1s2P zxr5Ni3VMuHrsBja72WJ57Gvp7dOz9CF+i0CIgLQv4y4TYVVgPfPkSAivbKQNpeJ5KjQ 8mwRdECPYJiph+5PNUFuA89Skn3JqgS9uJtuUaWyxj3uUxLG3z3d0Bp0Cq13i465rAQg 9SCweERgg479KOwWNXI7EjHAdcjR4/tws7m6V0dHks1S0SVaqr1b3LwrC+oZzxvu3oeo ONFQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530QOowhOG5tkzjI57+CGNuhy42Q5p0t/2WrsU/o1po9ucXtNr4Z xkXRXRKASBvrBlczI/XADpM= X-Google-Smtp-Source: ABdhPJw+JpssfgeH1klLkiTCXd2iSfE2DP0baWORuq8+f4eM1Nt+zFnxr9pasKfuTnGPf8hTg95rTA== X-Received: by 2002:a05:6402:1341:b0:407:cece:49f8 with SMTP id y1-20020a056402134100b00407cece49f8mr5777540edw.152.1645774855403; Thu, 24 Feb 2022 23:40:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:75fa:b0:6cb:c540:501 with SMTP id jz26-20020a17090775fa00b006cbc5400501ls1625365ejc.11.gmail; Thu, 24 Feb 2022 23:40:54 -0800 (PST) X-Received: by 2002:a17:906:c0d6:b0:6ca:457e:f1b7 with SMTP id bn22-20020a170906c0d600b006ca457ef1b7mr5077808ejb.399.1645774854635; Thu, 24 Feb 2022 23:40:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645774854; cv=none; d=google.com; s=arc-20160816; b=NRcnke6lBLu+8/zJGPjS0iEyFjpold6+47cbDUI2xc4rf0RWEjaEZByT7OMtbKXpho luzDy7MZPoGh49aJLQXBxZ2HENPp/EgqB+LzKhoE+j7vTyBRAdYFgegOuy1nL1pAtgUJ C1XW6NjqiIdxf1ZpwW+OUUpbnFbZEOZGeQXOSgmy8LMQlzOk7atrgQyz4mlG6bPr0HoL DBPB/izAjb/Lixtb0c4sNZbgvWuPqdioqLJIXRIgmZGIzz6ZAsMfgf0TAcC3HiWtiR/h kYaxYhxvtQePJTT/1I1kMlc22RU5OZDo506OymAwxvie8B9KLQcAg+rSbu4dgj8DN41g z9Kw== 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:cc:to:from; bh=ugJJjZJ3YlbaLPxdzV3CVAsZA97cBWOmwm7cK7VrTRQ=; b=0RFXejA0G35kJnu/VqJoLEcl0thOQPdpGYNepQndtb1mg5LrcmEiO9pfnqY/bd2v4F yLFCt8tIwj9x9pNjRP1XSrTuM4FixFih8dh2FHzWXjOLd6x3dhVu3fTYLD15T9gGMoPL GtwvIg+TtcMcPYVaP1lb+UyPzfVCuXwSXk53xIQIfdBgjJuTOS078uiNpPl6CuL4ylTM 5lgmQ9kNCo0SV5s80tBzWhJFVYtlLdvNVeybwS/av7Pzb/BPby/pNADxrP5i6+8/6wzZ avdgNL0+ol1hs1ub7MKOpFc6iwVLwPMdslFYYAzZiK0oQBtVqJRPGNOn0IJRRfm3OdXN IiGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a15-20020aa7d90f000000b00412982a1c3dsi117310edr.1.2022.02.24.23.40.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 23:40:54 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21P7emqr001558 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Feb 2022 08:40:53 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 3/5] libhello: Declare provided packages Date: Fri, 25 Feb 2022 10:40:38 +0300 Message-Id: <20220225074040.20975-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225074040.20975-1-amikan@ilbers.de> References: <20220225074040.20975-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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 To make bitbake know about libhello-dev package provided by libhello.bb recipe we need to add PROVIDES variable. This allow running 'bitbake libhello-dev' without care about actual recipe. Signed-off-by: Anton Mikanovich --- meta-isar/recipes-app/libhello/libhello.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index 5c44de5..c7f1fe4 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "0.1-98f2e41" +PROVIDES = "libhello-dev" + SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;destsuffix=${P}" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" From patchwork Thu Feb 24 21:40:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 1533 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 25 Feb 2022 08:41:02 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 21P7f2D1001614 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Feb 2022 08:41:02 +0100 Received: by mail-wm1-f57.google.com with SMTP id 7-20020a1c1907000000b003471d9bbe8dsf2243691wmz.0 for ; Thu, 24 Feb 2022 23:41:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645774857; cv=pass; d=google.com; s=arc-20160816; b=k2i7S8uzTRzVIrKQPfTiBJPrtRCYPRCgvgxy/Wnw59qgvPKNZO23JRWbeha4G0w27I B+7ePaNGebaGyscbcTveAXEVXsBeibKrYOC1EqblxadWcx5IqSVOj7TvGAQCgpejjilO gft57wGXlZy486AQikTFzgjXITAhJ0iAE8CWa7+f0vB7AjeGO76FZUL3vPss9AfrdhD9 T5WhW6UdS/wbbf0nheoBIFpJH07jeIVuiJdCo+gtmrolpyaDnHddXCJ9xuBRf5UeY3rq hV8dJIxfYMEY0SItYOFz+AX5PhhRIwGJkHYLA3FfUwl3RbgieHjFF5bO3MdcdVs0LqR3 SkhA== 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:cc:to:from:sender:dkim-signature; bh=St2aptMHar5fFvJg6OY0/NAzVRQvcWsdbG99jQE9Huc=; b=S2zXUTP3BaEIa8NLKyZPz++2CKKRZdD9dP7lFDf9jMtFJhRb6rJdd2jM7sw3wNbFLX /Rwla9Azpp8IwITTSVoXQ7u7AFE/6Km9wFY9Let54FD6/eHwdoZ1lI9DubFOl1WZGGPd QDd6bOB0dQcfevy7H4aohtnqKpznjXhApUsMWc88BzjWRHne+n8maA8AySDPBzYzIKcW NQW+YGI2bpFmX/oa5JbUdM4CK7qqUg9k5K2xcl5AH+hFqBQRW1LwUWf7yuTW1trhUyYv c3PkQtwBzYaxgZqZLb66RA/liImcrxQx8jVr5FExWBw6acv3XKEO0CO878NxYpnsS6lO ZZcg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc: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=St2aptMHar5fFvJg6OY0/NAzVRQvcWsdbG99jQE9Huc=; b=GXHg8vA3ifXZ8Ii/gt2FVLlG2QtDAFISGPH4VEt/tJDuQzvp+o+X2QA7KLYyBmNsGC u5Roo8E/+pYzrfTqjPPFBtGY3/tQYz1H3b2TE2pKoFKem2167EIpZhnCNl95qVQx9DkC cfAIqB7Pd+pd6VbN+kIB69KTEvNWxNmP75vB0QRWpWmHDkqsYblxoQ6XSZv64iH94isV UVcT0qQnz4TSTcSSVxNyhC92i5WjgBAtCa0n2niauZVnJmPjTggxAB9DqGcfu5/arLX2 0QI+oVD4Dov5f4ozAeeJfCWbFNjU9cHarxbTfIVpEfaXKhujMZXLcP6kO1PSdum0C+Fz diXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc: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=St2aptMHar5fFvJg6OY0/NAzVRQvcWsdbG99jQE9Huc=; b=023Mv8vXlL2GuV7eWmV+SwBCiw6iQ7bVsOi15QT5tS23W1P3Q8aUbDeyZHKpnuebFX 0z6uxukFvXZmcoVJXgkqFlUPS09AxPO/r+P2ikrBrI0OUcEEACOQrqGpYMQhUf1oSukE 6E1jtlJ4vIOzhY3gkHJXYN+AkRjd9Yqd9Xtl3YQqo26jSFgMRscHNJHqa7KhyvnIFIDi WSh5G3qeP54AKOBywecfHj2rS34P7JOlW1ZCiYEInKO/rE9RFMjD8j2N+zNEoMDiGNuh l5EY8Hx6EwiV+jFf8XltSKjwHrnI7V1ZSUN/CRo7w+3sp3+GPImL1UxiIx8jX4IBxPlw Q7wQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532YAQn7sZujNxVC+1Bmeq8Rk8pNdmVhz0rlxJyxU1nEDOL9gGjP ZLxG0iWJkBzRQ1RRr1Svjd8= X-Google-Smtp-Source: ABdhPJzXlDT2RwI0vBUNz2GZ3vKsL4GesOZm/S06cq5GmKUgAbZAVh0GimJKkSZM5/7wvZj4VFWEUQ== X-Received: by 2002:a05:6000:114b:b0:1ed:c1d5:95a8 with SMTP id d11-20020a056000114b00b001edc1d595a8mr4927849wrx.539.1645774856812; Thu, 24 Feb 2022 23:40:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a593:0:b0:381:12f1:eccc with SMTP id o141-20020a1ca593000000b0038112f1ecccls35484wme.0.gmail; Thu, 24 Feb 2022 23:40:56 -0800 (PST) X-Received: by 2002:a5d:6da2:0:b0:1e6:98f:3400 with SMTP id u2-20020a5d6da2000000b001e6098f3400mr4972596wrs.302.1645774856052; Thu, 24 Feb 2022 23:40:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645774856; cv=none; d=google.com; s=arc-20160816; b=sYc61ePeORVKuEU91/GDI3KV4R5m4GZLqCW1VonYhqAcEllXPr/1cZXtjHbkBRGoGY BZAYMAy54uxlnRj40I9HqzIrrbZ/yJ/ke9ho+OUSTNcD9FKgKITA444pQrOu2WD08FNI Mt77p8/lf3ZOUFxNvdks9DEppdwETMA83T4qQCe0M9zt6kwDTOay+KWONdfTieurmwGA 2UyV0uEAesKG0T5P9aAZucsnMkMoQD1h2R87pfSUwHx6BEV3MtA2fMtJFnQx/I76AxAY ZSLzxcMkVpN0bi3XoyVXi3ycDivBXyXF2pzTJPFaCNGnyO6CDIYvVbMXSKJSYcU4ooP7 RCuQ== 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:cc:to:from; bh=wyGot2cpJszX3w79N5GDNJ9M07wKNKjY2aOR2W2GPDU=; b=Y51wg4Pa4BniLDDI56l/QY9xNWlV7FVOaGYwYtB56lzopCMlxoXU5ytwSuLZFLJYIb pS2iziMya6Mun+odFdXTleP5Vy4ctgT6ioVuM7MukeBwuQ5AN/Pv7BWAOW8Ah+c2l8R7 O8c6U7kgajRLkUPohbKVBnMzhnTZB4VnA+cA241rEaV1t2PdEAbB+uF/0WMc+c+f0gGN 8LWj23HIOVoBHVH/ZcTm1rSDHoRDKf96OKWUdmc4BkMYRdNFQLNbIYXBXoFujgtQcx6F 5cvNaTZuL07I8BIlK0t9eTAGONLpeiBaR8JCVWaxAY7Q0eoDfp81w6JC22cYRyFUdHGt Ekdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 185-20020a1c19c2000000b00380d3e513d0si85307wmz.1.2022.02.24.23.40.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 23:40:56 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21P7emqs001558 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Feb 2022 08:40:55 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 4/5] hello-isar: Remove duplicated dependency Date: Fri, 25 Feb 2022 10:40:39 +0300 Message-Id: <20220225074040.20975-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225074040.20975-1-amikan@ilbers.de> References: <20220225074040.20975-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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 Remove build dependency already mentioned in debian/control. We will parse all the deps automatically without need in manual dependency duplication. Warning! Normal Isar build will fail after that! Signed-off-by: Anton Mikanovich --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index 8c3ba8b..20794c2 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -10,10 +10,6 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "0.3-a18c14c" -# NOTE: the following line duplicates the content in 'debian/control', but -# for now it's the only way to correctly build bitbake pipeline. -DEPENDS += "libhello" - SRC_URI = " \ git://github.com/ilbers/hello.git;protocol=https;destsuffix=${P} \ file://subdir/0001-Add-some-help.patch \ From patchwork Thu Feb 24 21:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 1534 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 25 Feb 2022 08:41:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 21P7f3es001633 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Feb 2022 08:41:03 +0100 Received: by mail-wm1-f56.google.com with SMTP id v125-20020a1cac83000000b0037e3d70e7e1sf1186700wme.1 for ; Thu, 24 Feb 2022 23:41:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645774858; cv=pass; d=google.com; s=arc-20160816; b=To0JNR+6YCIgauCh7/SP2S/6JSy/bXrbfBV37JqRexqU3r7kb+bSy52es42fEKcCkc T/ZVLqoGwD8Ex7lA5sI6dxjuhlqL44UzV7R8unnIQ1NNg7HXz4/lkZDWobjzdkfzM0Wu F3gEc9bp34cRmmPHENkC8T7LTTymDFGUx++PfMgQrT1BFMnJc6SPqm+p1j7nHCYe4Hsb hGEhx/D3kVPDvi3ukRk4Ir76WSKSLawEuauehqPg1rVH9R8vrwnbfJLdxh/QfW+Nl/5J 11m/+j3cE+6kG+BGqNvwESv3hgYJF6vx7bTMrO6reFNz6tVANlVoH7G9+ZPX0tU/kK3L 3fXw== 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:cc:to:from:sender:dkim-signature; bh=SO1IRaZREGL4jDLx2nDwyt0pvyzmkPawpM9LLZLilXE=; b=nLXG79c+FxPFTFM5W1wl3PulP4uNEDt5ITkH1t+K4GC5BJpkMW5lEE11KySevJhpUu NbBl9ked5wkbjB0sH5UY3qTxLU77ilMcDD0AacYbe6APLGVKcA1QxxUH25MV6ifDvD1m 01LdbVg95tSxj5FWi8o3/g6Z0zCK4HXVhzMSNiDc0/oZhD8rfcRI0b1xhnLYmOINjiPW bz8kkT+2CaYX9RJFlOCWJ3YDvJPrgTayuE6Z1g61Z9JKHMnDs2u1+xMfiQSF7VxTwcu7 sXR3LodUHhS2PlIqQ4jSYlI0ieoKbg+4OX1qCsry+aH5vKzup3dhWjfwi4nsMzA2DONM xzSQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc: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=SO1IRaZREGL4jDLx2nDwyt0pvyzmkPawpM9LLZLilXE=; b=FLd3vVZM0QhEf+Kq7grJqMFJilNNTGBJtximAwc9lTWoVnm7hAYATur2BlyV70lcQ1 5QAP14F2s467Hq2LjdR52mPYErTvrQHIk2707mBkahqngRBoNFllRvCmc2UnAG9kCjyG javiaoo/dr2MB7q/fXRzI7EQEU/vzNNxPHkL/+q6Isvw7UGi0DZTfgJO1ohBBwJV0OZp Xz9ZReptNd6kmGeboKRstYMPI5RX5eI8jBJgkDcSz0u/InJw8Tl1Hw93onmRi7Y+Vsg+ DODmpVM0pG/ZATN83f6H/4jhV4yecgHqnV/je0DwFHj0bUKWVst3WiG6gPzvHqac5dhR 5VRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc: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=SO1IRaZREGL4jDLx2nDwyt0pvyzmkPawpM9LLZLilXE=; b=VKO/FBBz6A3SuTs6KadQ6/hIDrqOB/uPIiIAJjCHRiqXG2VDMa7mV490aZSWaLuRPW iwa8iRWUz6cBK91y1rFsPwUumUwPJHCMirLmA/VFoVzcYVDIF9IcgaIn7M+/R/6tkq+3 O3iw972widhneZNDlRNkh7/ZzTEaMxbj3f4KHxPFeBfQSfl/ppJI+J2oEApKd/jrlWm8 T0eo8himK7FMrqjBjjxoxA98+lwKloFmTIYgekgFtIHnBHz7x8cVZZTAdfZinSnJlp9F 32ro+ldoUryHgm0gsZ7EjGiI4KoSruAegfNnNK5tfANZ8/GhlSrQ1lbqDiLLQCAlX7qS m5+g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532YAj2WdtpU12IHqS/MNJ1ikVHWJPCE7FM2AZsAVGWD7V23nK6L g8UF3kxs1Uv71eqoJGEzn6Y= X-Google-Smtp-Source: ABdhPJwqhtgGyZxIwzav2XDl722AO9b1bHNYyov1oK3NfLgl7fZ48o9gUVOjVQsvJ9qmg5YJxnp2JQ== X-Received: by 2002:adf:e94a:0:b0:1ea:9bdf:d2c4 with SMTP id m10-20020adfe94a000000b001ea9bdfd2c4mr5089102wrn.176.1645774858537; Thu, 24 Feb 2022 23:40:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1554:b0:37c:d848:5b20 with SMTP id f20-20020a05600c155400b0037cd8485b20ls34865wmg.1.gmail; Thu, 24 Feb 2022 23:40:57 -0800 (PST) X-Received: by 2002:a5d:440c:0:b0:1ee:1c9a:193e with SMTP id z12-20020a5d440c000000b001ee1c9a193emr4252883wrq.523.1645774857643; Thu, 24 Feb 2022 23:40:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645774857; cv=none; d=google.com; s=arc-20160816; b=SgwxfDQ68vg6QKVsC+nKQuFg6XEpaRdfkmgW4zms7+edX7ZH4NKrNEDUN9OJF1d+Vu Cf3DFDIOu0MrHqKBPITS24HkyNe25q9bkwUPYxQ23yuzgwl+WQ5nMn0fX77ccxB03pAd +LU2uAPxkIY6+a2o0XK1eXK7AmEJ4/vciNWpSF5qhHanS7Ij/pjzJqI9ec2bBsdG68l1 N/uQdwA81EWY2bLlCOTXA9Gu/spDkaiBBKm6d4aFWQloBSPRy/MUyKkr94Hb3xflyUy8 vOV8lXjBly3l4topsG993yI0GovN3o2L1b2/aUrvhGWHixkALs7dJcr4AOX7jKYQrNXn tqZw== 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:cc:to:from; bh=qR7otDF91wcDWnrpPms9Ewmm1uYiJtuKtFkbpC7nz/0=; b=kI+cFSGrEif8jQhMJYuDSLFlUC1IBZ/HoooUctLa/4MO/464jlCbenhctA4I6fzUbZ 1VWlC2ug8Qd9rEnoBjdSRcMLRAT8lnfAhcnAxCeVjhesD1CCjfxOUv93sYXjefS/jVxo WB3hVzAeWJhb+J7xmTl4lp9e9Uv/QHxmyBRTh1AJqV9R5z1daf1uF3g7SMhhhmAo+Z6+ FLQycBTBXzoIi8VlA0tEyo+PvuNg28hofPoFJ6m/e+lie8UClLU+pax9AzX+PdooOTKY aDuHZEaW74IcmFHPO0HObEazfrZYktXwqEmrNm0mHZWUkRdF6Q1U/9zOgAklvuH2r/xk 15mw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bg3-20020a05600c3c8300b0037e391f947bsi474809wmb.4.2022.02.24.23.40.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 23:40:57 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21P7emqt001558 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Feb 2022 08:40:56 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 5/5] isar: Add external builder Date: Fri, 25 Feb 2022 10:40:40 +0300 Message-Id: <20220225074040.20975-6-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220225074040.20975-1-amikan@ilbers.de> References: <20220225074040.20975-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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 Build Isar with external tool to parce all Debian package dependencies. Support only one target build for now, mc:qemuamd64-bullseye:isar-image-base is used by default. Usage (inside build dir): $ ../isar_builder.py Signed-off-by: Anton Mikanovich --- isar_builder.py | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100755 isar_builder.py diff --git a/isar_builder.py b/isar_builder.py new file mode 100755 index 0000000..cf99c52 --- /dev/null +++ b/isar_builder.py @@ -0,0 +1,142 @@ +#!/usr/bin/env python3 + +import os +import sys +import apt_pkg +import apt.progress.base + +sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) + '/bitbake/lib') + +import bb.tinfoil + +class IsarBuilder: + def __init__(self): + self.tinfoil = bb.tinfoil.Tinfoil() + self.tinfoil.prepare() + + def create_apt_rootfs(self, rootfs): + repo_isar_dir = '%s/tmp/deploy/isar-apt/%s-%s/apt' % (os.path.abspath(os.getcwd()), self.distro, self.arch) + mirror = 'file://%s/%s' % (repo_isar_dir, self.distro) + codename = 'isar' + + if not os.path.exists(rootfs + '/var/lib/dpkg'): + os.makedirs(rootfs + '/var/lib/dpkg') + open(rootfs + '/var/lib/dpkg/status', 'w').close() + + if not os.path.exists(rootfs + '/etc/apt/preferences.d'): + os.makedirs(rootfs + '/etc/apt/preferences.d') + with open(rootfs + '/etc/apt/sources.list', 'w') as f: + f.write('deb [arch=%s] %s %s main\n' % (self.arch, mirror, codename)) + f.write('deb-src [arch=%s] %s %s main\n' % (self.arch, mirror, codename)) + + if not os.path.exists(rootfs + '/var/cache/apt/archives/partial'): + os.makedirs(rootfs + '/var/cache/apt/archives/partial') + + def apt_config(self): + apt_pkg.init() + + rootfs = os.path.abspath(os.getcwd()) + '/tmp/deps_poc_rootfs/%s-%s' % (self.distro, self.arch) + + if not os.path.isdir(rootfs): + self.create_apt_rootfs(rootfs) + + apt_pkg.config.set('APT::Architecture', self.arch) + apt_pkg.config.set('Dir', rootfs) + apt_pkg.config.set('Dir::Cache', rootfs + '/var/cache/apt') + apt_pkg.config.set('Dir::State::status', rootfs + '/var/lib/dpkg/status') + + apt_pkg.config.set("Acquire::AllowInsecureRepositories", "1") + + def isar_apt_update(self): + sources = apt_pkg.SourceList() + sources.read_main_list() + + progress = apt.progress.text.AcquireProgress() + + self.cache = apt_pkg.Cache() + self.cache.update(progress, sources) + self.cache = apt_pkg.Cache() + + def srcpackage_lookup(self, pkg): + if pkg in self.cache: + return + if self.tinfoil.find_best_provider(pkg)[3] is None: + return + if pkg not in self.target_deps: + self.need_deb.append(pkg) + self.sr.restart() + if self.sr.lookup(pkg) is None: + self.need_source.append(pkg) + return + if 'Build-Depends' not in self.sr.build_depends: + return + for dep in self.sr.build_depends['Build-Depends']: + child = str(dep[0][0]) + if child not in self.checkdeps: + self.checkdeps.append(child) + self.srcpackage_lookup(child) + + def bitbake(self, mc, targets, task='', justbuild=[]): + targets = [targets] if isinstance(targets, str) else targets + target_str = '' + for pn in targets: + target_str += 'mc:%s:%s ' % (mc, pn if not task else ':'.join([pn, task])) + targets.clear() + for pn in justbuild: + target_str += 'mc:%s:%s ' % (mc, pn) + justbuild.clear() + if target_str != '': + print('Building %s' % target_str) + self.tinfoil.build_targets(target_str) + + def build(self, mc, target): + d = self.tinfoil.parse_recipe('multiconfig:%s:%s' % (mc, target)) + self.distro = d.getVar('DISTRO', expand=True) + self.arch = d.getVar('DISTRO_ARCH', expand=True) + + recipecache = self.tinfoil.cooker.recipecaches[mc] + provider = self.tinfoil.find_best_provider('multiconfig:%s:%s' % (mc, target)) + self.target_deps = recipecache.deps[provider[3]] + + kernel_image = d.getVar('KERNEL_IMAGE_PKG', expand=True) or '' + if kernel_image in self.target_deps: + kernel = self.tinfoil.find_best_provider('multiconfig:%s:%s' % (mc, kernel_image)) + if kernel[3].endswith('linux-distro.bb'): + self.target_deps.remove(kernel_image) + print('Remove %s from checking' % kernel_image) + + self.need_source = self.target_deps.copy() + self.need_deb = [] + + self.apt_config() + + maxdepth = 3 + while maxdepth > 0: + maxdepth -= 1 + + self.bitbake(mc, self.need_source, 'do_deploy_source', self.need_deb) + + self.isar_apt_update() + self.sr = apt_pkg.SourceRecords() + + self.checkdeps = [] + for dep in self.target_deps: + if dep not in self.checkdeps: + self.checkdeps.append(dep) + self.srcpackage_lookup(dep) + + if not self.need_source: + break + + if self.need_source: + print('Following packages still left unchecked: ' + str(self.need_source)) + + if self.need_deb: + print('Additional Debian dependencies found:' + str(self.need_deb)) + self.bitbake(mc, self.need_deb) + + # start final build + self.bitbake(mc, target) + +ib = IsarBuilder() +ib.build('qemuamd64-bullseye', 'isar-image-base')