From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a2e:81d7:0:b0:2c5:3a9:7467 with SMTP id s23-20020a2e81d7000000b002c503a97467mr7831565ljg.8.1698128655639; Mon, 23 Oct 2023 23:24:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:215:b0:2bf:bbc4:45ed with SMTP id y21-20020a05651c021500b002bfbbc445edls240807ljn.2.-pod-prod-06-eu; Mon, 23 Oct 2023 23:24:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGjZOvyxeMOSUyXeUdB/5xr18n9Y/G8+0W8W7BTdtfTLvjqQz68XfgW+7TkwzwTsvtnG9q X-Received: by 2002:ac2:46f0:0:b0:507:968d:a301 with SMTP id q16-20020ac246f0000000b00507968da301mr6942994lfo.55.1698128653791; Mon, 23 Oct 2023 23:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698128653; cv=none; d=google.com; s=arc-20160816; b=PjgxdFpdG8wuhkxrrADHyaQCBWr6ZRHTHf1Mro5pJlz7pAYZC5/7BZUsEaJEHDZDAK Tnxfxh1tuKN5pOM6G28Usm8utCq+BeiF4tmIBrIans1HeXYwcPYlZyQ8ZrpPKJ7GpoEJ 2Fwpoz7BwHgPKZev3dw3i2ZybmvM+bgAWpCJsgvmtj6oq2eBaORYifqZTCEh36oQIRRy yI/E3lnuyvrbIAsA3B8R0nPbVTsNqDaYD9+35Xg+iHSERmgzkRmFAKB3MfezkqG6Z3Tp GKuCzsiSenoul/ZgYR/seV/CM03B7OFtx+3gEIoTip6zggVlGLAG3IMBtgw99iKdOUtV 3+aA== 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=jdaBswNlU0/33Mlj6nuaOmpTZ9YqvYBJ28fc3kalHtc=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=OtU5gQJYCEEZjg7hSBHhWAjyemNg5wMm2Vvvc56p+2stiwtBSc+SPa7qaHsOXZSWwn 8SZYtCeIoke4w5qEmrp/ReX2M6OSViPOtPGpyqlhViZedaAg+57wQVyz7kw1Yn6izhQs Dcm7/VjPJ8TB87oP62iN7xe80uDgktJRUGq06KEcYZyeQqxmtuuFSC8Nu2GgoHA079dj CnPu1K1+L6wwIjNhIPjlWwtzM90Ab/kmoiZAfgug+i2lZJaQGeXZzt5El0wKVPCstuPH GmzDAxCpwpH0xw/DCjA6yIyV20kNl7fawA+ugU3Ndr3qtt+uqgKBMcTzsh0J5wAq7GTC MaQg== 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 d29-20020a0565123d1d00b005008765a16fsi369269lfv.13.2023.10.23.23.24.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2023 23:24:13 -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 localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 39O6O5WE024986 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 08:24:12 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 7/8] isar-bootstrap: Remove unused code Date: Tue, 24 Oct 2023 09:23:57 +0300 Message-Id: <20231024062358.252053-8-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024062358.252053-1-amikan@ilbers.de> References: <20231024062358.252053-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: moHet0ix/qyS 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 0cc8ee7f..98345755 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