From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a5d:40c8:0:b0:317:3f70:9dc4 with SMTP id b8-20020a5d40c8000000b003173f709dc4mr3776844wrq.31.1697619101942; Wed, 18 Oct 2023 01:51:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1e8:0:b0:329:22d9:9fe8 with SMTP id g8-20020adfd1e8000000b0032922d99fe8ls390154wrd.0.-pod-prod-08-eu; Wed, 18 Oct 2023 01:51:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2q41oGZOEhnnD0pJwRAzwikrxdvwL//6cuzHgwl1JOV34/ofE2hKXGCnZYdUE3OdMcA/O X-Received: by 2002:a5d:6087:0:b0:323:306e:65cf with SMTP id w7-20020a5d6087000000b00323306e65cfmr3721067wrt.10.1697619100085; Wed, 18 Oct 2023 01:51:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697619100; cv=none; d=google.com; s=arc-20160816; b=SeIgYh86PEaV9QZw1wOKKVLYxODdTviL/NEkUBfaUq8HTk9rrBj0G2QozdjA/Itfp9 a+y/3JhIvYnlx17TomEwU89HkJXUwiYFK+fkPEM00KgO+DfR4/4igpNSNsRFGOry8lzD kggU8EUwWKSb+pIvRMowvUcn7Ji956GX86arnSpvr3mav3QEiVQfIPAd3g4L+4+ExT+5 bChtTc5ETjr5niXXm0FFSI52by7yOOMfdVIMw8e9xFtOVkWaPbt/hdbghKuPSMooD+OF qwbx1egAM0ETIH1cTtpG8WG0/nfBK5Szf8K3fPeyroTFdAoWbA3hUTGVzJyctTeIwCIm Ivyg== 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=x0NreFMpEjLwjwEE2jPZEMc4qjPVUFtFhtATLtfbGEg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=rVjwWIkRDfXSTH7Jp8rV70FvfbICNhsdpIcX0cVrcdh+zilwklB+X262wy0SFE3Dco gP5ZQF4oX1aXAdw9UeoSmht1yRh2EtY1pE+zqTfRW2YKygtI4hzGfKB2iEKb2SkB/afH CKkZnyXFytyBdqs73MN5R/oTU56lEOrzgzkxQRdiIphTM8S7AQtjkzCzf1i/AuM4yzSf p6HZapaplcc/4cAm7Lw7o/Buz6rkCaEXXrJoIVGib7xDoO9gWaPmYXyU7x0bjWPoJh9H N33GHLomAvo8wl7TpVA+ynxecvv2BlKCPsTWdk1+PKhq5A/+QDXF+gfXJX3ljPL+dymN AXqQ== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bs30-20020a056000071e00b0032dc3fb0131si66855wrb.2.2023.10.18.01.51.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Oct 2023 01:51:40 -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; 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 Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 39I8pXU7024948 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Oct 2023 10:51:39 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 7/7] isar-bootstrap: Remove unused code Date: Wed, 18 Oct 2023 11:51:25 +0300 Message-Id: <20231018085125.378989-8-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231018085125.378989-1-amikan@ilbers.de> References: <20231018085125.378989-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: subMd8jQ7RL3 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 dee6cc31..33bdf6b9 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -22,8 +22,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_BOOTSTRAP_BASE_PACKAGES:append:ubuntu = ",apt" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios = ",apt" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios64 = ",apt" @@ -178,30 +176,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] -- 2.34.1