From patchwork Mon Nov 29 04:52:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1109 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 29 Nov 2021 15:53:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1ATErPFk003293 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Nov 2021 15:53:25 +0100 Received: by mail-wm1-f59.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3sf10979028wms.8 for ; Mon, 29 Nov 2021 06:53:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1638197600; cv=pass; d=google.com; s=arc-20160816; b=r41HVtuLk34jm5qiDg7qCtZAvScxAFlKVpzUyse6TalQQ8EqXybnlNzigvFmQs7kny R5Hq+t4Qr4MYl2L5Oid4XIATdHg1GIW6MMoiHXWWZMmFROfD9LLxs6vt/C72AjrPtUD+ BwmilzFRNiKshh28C/Z025R7pCQmvbUrczh/sFX5kZVT/3WoOc+CSPwUADLe13L7HK8G QjL6aLg/I0nuAzpo4lT5/BKLwAoKDjQjIvnfCa8Q8ES+8MO58PBA3tv6m/tQNwn/pADK Np2pzmil9s5DcwvWGtwtpGJkZCn7OMFKh8wQbpOdL5LpXNfPylwDtsSj8xNcOqPp9who JrWg== 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:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=W9DSeEGZJXV7sZDbxeV4JsoRjC2T+TC5AoZ/FhxdWAg=; b=W6UjoUV1oGUbZTK43OqZkR5sphAChbyEfgPDBCyePrgBs+V3uXbyAHV+e0CFHIoX6o X2ijPXz8LmeaTJXrxVF6QCAgARPA2mKgylkgrGrvC3otavbIgFmMzik0gZVsbFMSU4t9 2nUtu3uYChZWGlerGztCk1NDZ0eMRRqtyBQkGsi59p5paoR5+Ohm3tYvZTz1qTMoYmu9 rvGVMCXB6SH2hSREZqLBh4+e7OGRKOrVL6a5bVq/DoeYFtMjE26GkyYbjUZv8oS3agt1 6JPLk0hxGxRXwed5bCqWc+Yy0G6hBleWSMLWDWmicIsljZAu96PTjVaH6e+8d5k4va7U v6CQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:ironport-sdr: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=W9DSeEGZJXV7sZDbxeV4JsoRjC2T+TC5AoZ/FhxdWAg=; b=rD+HvPQMDf3HYKDZUAW8JXdqSVoVyJ6yxTUMOxehuvNwRPWijSQ+aF8tCSkOYyJrUk Tq8hf2MvTS373IaOwUNiAnCgYeyieTEwWQSlKjNY6C1Pi6KuNFBy3tmqa90Ah4uAPiAd 6uMcS6HWIBYIqAxoMYwf4m3jR+6Qhux+TO/q5SNfa9cPnWmOjC3OC206KGtvorVfRxcE R+pVsQ61BE9LBdg9eL81vF0B7WcJZ15bb/7LRbLEJygOZcwss0fqLiZOEZG26gpDIRig q99Sdy9jExfw/OmXrhZrEteuRIIxCjYj71LkFQgmbmeGbmT3ZTBSgKK20f8Kzwv+qNx4 BXYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr: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=W9DSeEGZJXV7sZDbxeV4JsoRjC2T+TC5AoZ/FhxdWAg=; b=kOZcJAv2rQ2ZESpRE0V7ghIcghojapq75UOJRRgsJouMFD2aoGj94KwlgK7EOy+9do ufnwJaA5yeDZE+45Rk4EWCuU6M5g4spKbzqez14wbW4QQZmmacRpD+eARDVpV4YsIs0H FtuYh/7Yg9g1bfwwqEkTzYWflpOPXOExXAZcOWm7zyKLU7z7NX6ilESXPnRJVV7XoetR 47C9qAJaX93HoJgOtVLtSTRaILK9+4w0idMEqho3p8aPioJMVMxo3zu9m6sWrge4jLE3 FXd7brlja22hjVHeSqNgmAdCTDHXro24wXhjUzAp3Fn66UnimfXa1qBj0ZA3qdoF3wzY MIvg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531ZtgDgOIaqeiJ2mTbU/GxmWALbVW1qVaKwhKCmWDe6Jk1hZ0MR W3smTJocR8e3sFMta+lvm2w= X-Google-Smtp-Source: ABdhPJwrHthhtEV5MCF3aZyoIy/pOWIcpGCQGZnmS6dRrjkpJ5oqriXMhUiJ2h5Y4eiOaZSe5UUwEQ== X-Received: by 2002:a7b:c119:: with SMTP id w25mr36909628wmi.70.1638197600651; Mon, 29 Nov 2021 06:53:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:80c3:: with SMTP id b186ls6698759wmd.2.gmail; Mon, 29 Nov 2021 06:53:19 -0800 (PST) X-Received: by 2002:a05:600c:1993:: with SMTP id t19mr37886899wmq.21.1638197599745; Mon, 29 Nov 2021 06:53:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638197599; cv=none; d=google.com; s=arc-20160816; b=WxAxC3cVxZduLFoGCtnIwgsIYbxqnronamot+lIbzhonf00fBkAdj02V4yccMpJ1cA NO2lYua2aV915bXbcenED/LDvz3PIy0mNXYQFOQwnqDvQM8iiU1E3lubAJvgzumwsyAn gRTEVWGaquIeOEqJZDOBmaTJFV15xg4N1L2XqjVs7cXAS/auxGLFB8i7EptfIAdZU0m7 aQriMFL4OVWpAOcJC9Mu0K9HgSp2tolzSMISmQbnJN2/tiU1ZgPubJ92SvIjHcBaav+l 9odrVAMIcy2ogB69J+tygB7pbRYLt7Q3Y02viR2oON/i/M6EoGPf79DdV6raHJ/GntJt ySNA== 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:ironport-sdr:ironport-sdr; bh=fGBJLrc9blmrfd6GE3rmZiAHECFu1kDuFTyKPB3qjds=; b=DoFE6JagmEOf7LAgine9tuIFTcADd753Ga5S3S/KSKSF/Oc5zHn/RuZ1O9YZ2G2TOd A3aA9/J+boV0nBRJQ10T+JwCoKq4wyO9AMvi7obrx0+FnnBsaxDu0qb21HcpQboPO8MM i6BfnJjZYm7Ng3vtTmolkGyefp7nvRVhkEgQYzG3j6BSbkd0TkISLgihuLmr93o2PMlO ZzFDoYRw/GkQVmyOgooPc+OxxbkRC+5/efq03SoSRBhRo5VlSfMxdAjac8HT5gMxVJuZ gvkZH/lhcBh/ibUKvT0/BAzXFKRHRUMn+gRBBY8BTiYoY9STVjAgxZ7O4DDfEF16DkPf MIMQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id 125si1841390wmc.1.2021.11.29.06.53.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Nov 2021 06:53:19 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: WhSy9RCPPTM1ioP/5TbAu/6BH1r0Yoib52e51dXWSpOuz5LVv1Efg+LWUTTECnCEjijRLbUNsx a17dxdk49DAjjY8GJg3qsM54vwfsDDJA4+BUP7FMmUYrc8L4oyjf0xEqc1h5GTWELowwi1fziW v8qOC5EgTNu+/YPq/JEn70jRYQ4zDM59SI4Dbn4GOfA0Y7IjnSQ8gGF7Hmr6gPJeHzJyHMO5TG ZnXn1bpq+0Yf38mj+7LLC8ohGGW7V4kp86UR2b1gpIuSa1IcuGTAtc/4OF7a9uQbN9nybrmXAS VNtdwx9WrWWA4qUMnsDFgFqv X-IronPort-AV: E=Sophos;i="5.87,273,1631606400"; d="scan'208";a="69034266" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 29 Nov 2021 06:53:18 -0800 IronPort-SDR: R5I7/meWaQK5XOctBcggrD/ZqEPnBKVw6toI6CsJE7uRAEFAvmasxPEFtHpNYuqaJNgmTqmqY7 m7UKNJqn4MZ2faZ6Buei8ZQErcr8kbrHdWXiNTIs4FNzpoUR2MvamQGPs8e5Rf/1xRo9nNLYaF eYhy6ArAuP3UTnudmVkElajt4rv+zYjuVk5y1kMglfr7Dhe1foUDoBTcFuvY+ZcJGo7YZdSFff c4VSTZBlS5niu0xOSs0980eEAirnjudKoYbRf+l7FU6m9lg8bhvwctdvqPo15+8J16jVky3MzA bY8= From: Vijai Kumar K To: , , CC: Vijai Kumar K Subject: [RFC PATCH 2/2] buildchroot: Add provision to specify apt preferences Date: Mon, 29 Nov 2021 20:22:41 +0530 Message-ID: <20211129145241.2932943-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129145241.2932943-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211129145241.2932943-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-14.mgc.mentorg.com (147.34.90.214) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.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-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-getmail-retrieved-from-mailbox: INBOX Add provision to set apt preferences for buildchroot-host and target. Signed-off-by: Vijai Kumar K --- .../buildchroot/buildchroot.inc | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index 726c7bb..fd06b80 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -50,6 +50,36 @@ rootfs_do_mounts_append() { EOSUDO } +BUILDCHROOT_VARS_PREFIX ?= "${@'BUILDCHROOT_HOST_' if d.getVar('BOOTSTRAP_VARIANT') == 'HOST' else 'BUILDCHROOT_TARGET_'}" +python() { + distro_apt_preferences = d.getVar(d.getVar("BUILDCHROOT_VARS_PREFIX") + "APT_PREFERENCES", True) or "" + for file in distro_apt_preferences.split(): + d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) +} + +APTPREFS = "${WORKDIR}/apt-preferences" + +do_buildchroot_prepare[vardeps] += " \ + APTPREFS \ + ${BUILDCHROOT_VARS_PREFIX}_APT_PREFERENCES \ + " + +python do_buildchroot_prepare() { + apt_preferences_out = d.getVar("APTPREFS", True) + apt_preferences_list = ( + d.getVar(d.getVar("BUILDCHROOT_VARS_PREFIX") + "APT_PREFERENCES", True) or "" + ).split() + aggregate_files(d, apt_preferences_list, apt_preferences_out) +} +addtask buildchroot_prepare before do_rootfs_install after do_unpack + +ROOTFS_CONFIGURE_COMMAND += "buildchroot_configure_preferences" +buildchroot_configure_preferences() { + sudo install -v -m644 "${APTPREFS}" \ + "${BUILDCHROOT_DIR}/etc/apt/preferences.d/buildchroot" +} + + ROOTFS_POSTPROCESS_COMMAND =+ "buildchroot_install_files" buildchroot_install_files() { sudo mkdir -p "${BUILDCHROOT_DIR}/home/builder"