From patchwork Wed Sep 27 04:33:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3136 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 27 Sep 2023 06:33:33 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38R4XWBS022027 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:32 +0200 Received: by mail-wm1-f62.google.com with SMTP id 5b1f17b1804b1-40554735995sf74480045e9.1 for ; Tue, 26 Sep 2023 21:33:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695789206; cv=pass; d=google.com; s=arc-20160816; b=eFbT6VKTc2w/+ti6bxciyVqSsCv/pA21aa0GMUOR+fOfdlRr4shJ77HOwU38+90ie5 fbgERLC/jdlmQW4o5UvG/k7pZdYOAjODVoLYv1BDQ4Nbh9A+68PCmJho+W1IYAEqHwEq FlPlffh/F+4nSapaVUxA2jDOAemtMhefdgavdCA4rIGaI78ZBuZGLQy3CuOKWfe58uy/ hXpS06HQe9H3XGfe1m5DRVcO50mva7OOEnQ0PHvyVriAwIeXwXgAXfA/vEwHno+Jp+3t lkO4VZ41AL3ota5rQ39SRxWq01ve1e+KdlgSWvmtQ4yhpS34KVxtpXWYm0rjoOfpGvKX vbEQ== 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=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=pwO1J/IGFAoBAozw2Fe2qoIeJx21Uxf8RzEiPOnd8ILed1YYJHRIZjT04lRfIK6Pf3 2K6YXeScRvEGxijYhoJXWTrPW1jJsc4PN7U80sDYdyGoFFWsQaviF638JWyLZTAIm3fl iikYZeHBAWBiupQI5T1Zm2UbwNJU9e/xUiqyPYV/EnFw0M88YppjLvrlixSDDS1WHoWT qNshabt9iJBkfnAQEWFLk170R17KDqE7BTqH0+pSA+N808l0XfHmnXWXpMy0Cd8hSTJf Ocu/4Cbvb1O5jXAagL47sq0fZdtcItztn+0FabgHYGdYekvTydc5UGafzjfu6xSsRlUT nEeQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1695789206; x=1696394006; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; b=HM5RZH/h3POqh75fhWCCLWXlP/TsOAssli/fGDyw2s1v8dO8YI0rO6nJxcxVaJQoyD sl3FLq32veqABygQg4SvAT6lzktgyUfd8kF2t5Uy0p7uywOiTYLhN5EOfkrAPiodlNPd EFxgttkUDm2kB9Dpdkeg+k1xw7q/OSbR30PURNQSHkmYss7yNLSL/3Hb7lT7UERqFOUD A1gcCNWpggMxSujqUvSJ71d5CgudDvjmAzzbjCXEFB9O/GwqGO8X5DFxTMTk76KE5IlX JObbpjPovbP9UQisZI30wxnzIqZFgexSahrHkdmIo1PZeI/lTOJ2A86S4O91XfL7akA+ CtpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695789206; x=1696394006; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=v9xp1JR9S1/RmJGYVbQtiu0CcfRkOQAd3Z3onzGbEec=; b=Z27EMj6qjFnC/noWoyJPsSPtOktMr/k+TGFZzBjcpGsB34C2Yd7n6Tpdhy2GxeS3uk IJ80yn09zFrvQlCHjhk9No2ZSQKWMg2Hzp35oghWY78lQrmEXqJz5y0Dg1r6rd3mB9hD SmC8nV63JgfTalb6ltAMsyTke9AKRatVpsnQhylMe0zW54oLrwaiQZBgAEtYqBvS147V Po8uno6F2u4uPvMOQFZJY4dBbg88WSzt8QvHnEMT/3W4UIZZ+BAPWJPO6UXd2vuXH2VO 1cxbab6lMtlAuCn1MpiU4J4q4+F7nnYd21bFk2FhwLEBPdE9ZvobMehXR4jnEt7HI00G Om3w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YzfWoHCMkhJtlbLR95gF6LoVPt9QgfT/7bLIHlS6sSv6XDp0kP0 VkXGb4kqGU+uXszCH0sM6Ec= X-Google-Smtp-Source: AGHT+IFe0bWuFUF7oReZjTpmUng5Bja/4c5qULkMCuIqWdWPfghFXVryS8Ya7l7VWLp3+m7c8laeeA== X-Received: by 2002:a1c:4c11:0:b0:406:4242:e7df with SMTP id z17-20020a1c4c11000000b004064242e7dfmr719719wmf.35.1695789205702; Tue, 26 Sep 2023 21:33:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:a0f:b0:404:75cc:62de with SMTP id z15-20020a05600c0a0f00b0040475cc62dels1895003wmp.0.-pod-prod-03-eu; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) X-Received: by 2002:a5d:43ca:0:b0:321:6fe4:d4eb with SMTP id v10-20020a5d43ca000000b003216fe4d4ebmr610330wrr.2.1695789203764; Tue, 26 Sep 2023 21:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695789203; cv=none; d=google.com; s=arc-20160816; b=Lj8fgFOGTP9NfEp8Rok6jxKRMZrmmoe4bW4OJXxydyyQcYJftVh1R33pHs45Ri/SIe QAfHUWHkrZ7N/olaS6S3g984flqmxru6lqbs2kNfZ7inRXOKZN8ym5bewA4YfGaAZ0nM JU3rJe43aRVEQiWRdAK6ZPHMViaKqBVBSV3M8fnFjLyF4nsXMOU4/GzbJv44mAEsER/n v8EddfaSG2zncqc8g157QE+1ArxXGAMPU+fqN4mVEjOiw1O1MVjglXgqweYmpfaxnUl6 UZMwGrDySiAcgaD4ZvyDLdr/yJl0EknR8Z/wmWb6IIp0HrLOjDxpmJNEBYBIZHPvDztC 3+vw== 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=fqXph//72FJgprrQdC/3nqFR+mu5BM6+jJqDCICetcA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=h1uOBix9VGytqfm6Sy+o4m+YZDiuQHfFHkOF7yQOq31mjQlPo5zlopuazYP5hDcx6A 45EjJXiZwjIE/buUytqVsBwtV4SwrR7uJCGt0kdNzOUqR9yYmdXeCtewbQMTCKimWx47 rOtZZd8E5efRKAV7+50jLFKPpMbeg0i4FY2KB9zjMlI9JxHLQoRowTeVEH3+9CnKYIjB 83lx9xZlixuBco1e3elSpYu4INOwk3n5p9m+OVUPtmTueo3S9nc6CSBO+8x3+RNMeNKi JhBF9QV0KNT5+IawSFV0FTwNwQk68iHG5SOB/Gl7/cbjo8KdAhDoii/rCDOnYBuEersO Y32Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bx30-20020a5d5b1e000000b0031fe51902bdsi989944wrb.0.2023.09.26.21.33.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2023 21:33:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38R4XKXq021959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Sep 2023 06:33:23 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 6/6] isar-bootstrap: Remove unused code Date: Wed, 27 Sep 2023 06:33:20 +0200 Message-Id: <20230927043320.6264-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230927043320.6264-1-ubely@ilbers.de> References: <20230927043320.6264-1-ubely@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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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: =?utf-8?q?INBOX?= From: Anton Mikanovich Some external logic like installing gpg and ca-certificates is now doing by mmdebstrap inself. So remove duplications. Signed-off-by: Anton Mikanovich --- .../isar-bootstrap/isar-bootstrap.inc | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index cb1fc91a..885428f5 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -23,8 +23,6 @@ DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,usrmerge" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}" @@ -176,30 +174,6 @@ def get_distro_primary_source_entry(d): return source[2:] bb.fatal('Invalid apt sources list') -def get_distro_have_https_source(d): - return any(source[2].startswith("https://") for source in generate_distro_sources(d)) - -def get_distro_needs_https_support(d): - if get_distro_have_https_source(d): - return "https-support" - else: - return "" - -OVERRIDES:append = ":${@get_distro_needs_https_support(d)}" - -def get_distro_needs_gpg_support(d): - if d.getVar("DISTRO_BOOTSTRAP_KEYS") or \ - d.getVar("THIRD_PARTY_APT_KEYS") or \ - d.getVar("BASE_REPO_KEY"): - return "gnupg" - else: - return "" - -OVERRIDES:append = ":${@get_distro_needs_gpg_support(d)}" - -def get_distro_source(d): - return get_distro_primary_source_entry(d)[0] - def get_distro_suite(d): return get_distro_primary_source_entry(d)[1]