From patchwork Thu May 18 09:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2815 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 18 May 2023 11:47:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f61.google.com (mail-qv1-f61.google.com [209.85.219.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34I9leaB020502 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:41 +0200 Received: by mail-qv1-f61.google.com with SMTP id 6a1803df08f44-62381540ab8sf6704636d6.1; Thu, 18 May 2023 02:47:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684403255; cv=pass; d=google.com; s=arc-20160816; b=Y+PPN86PjCMshxqr+KuPcbqvGfxHh4xjgurf80jLtoHewBIjrsDneFP5kG8BdHX54E Nm9EVIpQy7t137ZMqYClGG7O7okEHhBErEd3MSmS4JoP7x9asm3ep0Ha4oiBffs1ojPG 1CWZJM/NCzelSmL7huEkoVvNM1n6MF206iAlf7Ip9Z/nqbS4Mmqz9GBQ/MLCPr/l4lvH 4bPUmLseDSlAf3DfTS7SVLgas1dlOWIJseiGDJbPnmTPekBncD9pR8jlVNBr6IZUsbvt O8LELmo/jcQSbd9Q/2JeX2jXbDbeHdrCKZeVnMn8NznkuVnwL6y55pav1+KX+RviKBWr 3NUQ== 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=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=ovQCj802S4GpulUN49188cN1XimnDfOJb2d+nCKERwB8W/NKKdv4vXSIVzbNjV9Zut Y3/Ee8BdS+pyHkCzenUDrKOS1C8dO8IE2c+9TkCTyQtAfxPpgQMJ/zqWq/kivEsMd5fv pw7UZltu9x1EKNY9SNt2m0KCDP6AOxXEQl4jP5qjhW8oikHesDb/G1cxOyMuH2oCqb0o RVYurgWK8uOKESHI1zNAyDNnjyX4joBEmgog+HuJUN56wpbRDkSIMsLNLiGoqzojq8mi xCT0sVeYePJcbfGMMS1joP+U6c+BVVHZsS4ZC22GjK7goKX0jfz6r9ZBgVBx9M4b+V0Y pIng== 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=20221208; t=1684403255; x=1686995255; 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:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=LR+woXbN8LnL+P3OrJs0pBrS1Dzr/ZaDRBJhTP3ZnA82DQh2wclWcjZYtSWuxL+641 ynbX3zoXdyTaeV3PL2jSFk5TjZCOIhAi+HtUuoNTWDZ9yDBHJ9MwjbaVkhk/Jlx7y+li 0qnWjteVFvFmF/iD3/dgPdlVp5WWAjYVrHB2AEIXlXmLdjhn9Ol66DEiLfsk25ppma3A L4wMH8etRu4rD3l3GhRu5OWGVy2yvg3TsIjixIJFsX8kq7yan8WPOwU9e9VivnGvcDTF Y/YXBLHVwoudznFJJGZ+xdW9M43DBPx4Tqxmc/fYlpkcZZw/qCKC6XA6A2QdrNqBNY3q Idcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684403255; x=1686995255; 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:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=z5uZj2bpgZYTxhLYbAQMBpMnRmSNcbSmmTLqj5jFhRg=; b=cHB2lryOy2yUP1hBJetopFmGH2jkN2BKh0dXWohf0FaDV3A2pOnVKJhW7iL5SuZJ8j u3K7+4Il9Q3tDm5zEf38vVPxC2Y8k3l4slg+UX3zJpNTW/As0X9ORkZWfd605rAsmh2l j31voEbHfpFKRnw+OIJtgXQ7GtutPFlM2//9PwYzOnvWyexoVVdRaevUwBpE3qlqTg3A LjHx4VKMQLvjxPHztvvPP5Nit71hFDf0N67d59tAwJynHOY+0cd2J98OD6aLCs/Ki8y2 J5/DAYDnTwH2S3DojWxzms8Y1w8BVbWk13aDoAzEI6LGJGfjEaSmF6PGRG/QzD5+rAry UTrA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDzNqvbonKBMRk8uonGwxOk3OHT3HZyU/EJk47eFFEu0eKprJBzn awf2MaL05qRIXi/KPflY4PY= X-Google-Smtp-Source: ACHHUZ41qz/0b0YpvYn/7Tgrbi0ZBpxcJClWv2LVsyjQFxUcZaaN32MrSDeSdEsccOVXI16tINlhOQ== X-Received: by 2002:ad4:5a14:0:b0:61b:68e0:53d6 with SMTP id ei20-20020ad45a14000000b0061b68e053d6mr486777qvb.1.1684403255353; Thu, 18 May 2023 02:47:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:1910:b0:623:8bf3:d76b with SMTP id er16-20020a056214191000b006238bf3d76bls1153279qvb.0.-pod-prod-02-us; Thu, 18 May 2023 02:47:34 -0700 (PDT) X-Received: by 2002:a05:6214:1314:b0:5ee:e4f8:c7e5 with SMTP id pn20-20020a056214131400b005eee4f8c7e5mr4546666qvb.41.1684403254854; Thu, 18 May 2023 02:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403254; cv=none; d=google.com; s=arc-20160816; b=NOqcHPNdfT5a/a30Clmu+GTe0MnNI05wZuvwbJwQzRM8IeO2IJ8Sfgmr2Wgi21U4Nt 77feaTKVvJzm9dUbJcU6CVln3wZUf0Bu+HJ47v5ttzeYDMnUHIjEO58mlup2nDfJXaFS 4pu6g41bX/9i2Hsd0K2Qjl18du7QEiCA2UCRGNNEt+Rv1ee9LavJKrSmQAF6KEFzuKlZ e4Xfn+gRkogG6G4ciRWyFVi+7uOzO5UxpZMKk0drWdt4rwPQZBUsmEGqwu9CGeW9qzHS o7JYudMLBU2S57tcpkus4H8Ni4jsPCayS7GsaQ570A6SC5h581bC9fWYpzbVJMciJhJB 8Mnw== 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=8wbL9Mz9B0cT9zb3CeNNsUetmHQ+0Wv+11MfcwfOCFs=; b=BCPeWSHgeVMKx6oi2S0XzMtGloekLP6/o9kRRvTEWdqPjkUMHNmuWkpwHWVO95vMBm ZvN8bKT5KrjoKaDWxqmLFlOlZOf9kIurz6m2Yi1Bd9x2L8DAwSNhf7gSUnBRdYrPGYnK +r4Eol3LVJJr/iTox++TBiM9+0AdtuyPRDJbtN/aDYVzutkEJefpp/AmSfSDFDfYPTaP 7MwXblHvG87Hrgfl0qyNowQDz/tNRP3cf4EqRfAgDoCD1SQpWK1SCqnIIUx/7rqBPxuK 4mD40ff7dfFig+GRc4To/gNwsd0apP5l5d39Un91oaJB2/BryGhhdOKMC8pJ5AjFgklh OomQ== 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 ez10-20020ad4590a000000b005ef42464657si79132qvb.3.2023.05.18.02.47.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:34 -0700 (PDT) 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 user-B660.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4V020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:28 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 5/6] isar-bootstrap: Remove unused code Date: Thu, 18 May 2023 12:47:15 +0300 Message-Id: <20230518094716.117770-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-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,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: =?utf-8?q?INBOX?= 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 2aeceb58..b52edc05 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')}" @@ -177,30 +175,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]