From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231094895937585152 X-Received: by 2002:a92:d34a:0:b0:32b:50d1:3403 with SMTP id a10-20020a92d34a000000b0032b50d13403mr1976018ilh.7.1685527880033; Wed, 31 May 2023 03:11:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1945:b0:32e:2d9d:f290 with SMTP id x5-20020a056e02194500b0032e2d9df290ls941597ilu.1.-pod-prod-07-us; Wed, 31 May 2023 03:11:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ZINZG2iUzFKI8OFXgv3vo7FWhKbl5ICxK72YiblDPOxvHnrq+/rt+b3Q7n1qjG83E/mLY X-Received: by 2002:a6b:e818:0:b0:774:9a92:f1c9 with SMTP id f24-20020a6be818000000b007749a92f1c9mr2851539ioh.19.1685527879430; Wed, 31 May 2023 03:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685527879; cv=none; d=google.com; s=arc-20160816; b=PVOhR0uIYPH8/++yGHhxemDaL33z1lalW3EBIRJYEXDAG/9RbkDen/2CHPEjZBGT38 f1D9jLylxNj2ic2cyIUbFmvyNGypPjsl3Hq8iyDo9sDOBgngZADVcKdATUMs/RS4/RHm 5Aeuu4PGbftvUB4aD2W5fLN6mbzFaMgIx1G3zw9fVq0udjkO8y//wsxzsWOVC/RJ1Zb6 XwiKJV/qlwIFRJc4OBV+Yj2euRWrjc0xDdSSzhpoNE215+sCGv3CR2MlYvy/5du7vK2Y yO6tUwdY5pbP5G+Vlev+9OIQV4z9JPlh15p7up068Pqyxfhbx3oymIb9ojZfmqe2s+r8 k/1Q== 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=ep4OnwgI0ucXpt8g54KaD0EB7h+5V7T9eDf5iOrd1jGHuNxd02twrndBqfYN5fo/Z5 Nkr+Dw5drEbeXEzHn84oo+9+xfT8BnaC/lZeXVhUCMOKD5F/fVAjVOmh+/b6G48GKuzh w7Ajb2v4Q/kVIMoLytlJkrwxH19aNq+vkJAtRwtVRjka6uEhcoam2vX+8yXSfcT1YFsS 2ycigStUoJ14dXJcvNGyFntIeplZQaY3sWL2nQ4I4ZnJyskjoYwakygLrRJcAOVw/IqL KcqDV0ro3TCf8Mbqgs9I7gHt7Yq2FVr7ok4fclXoxQ4sj+JLjCtyUKip0RLi6twtyEBh hGsg== 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 o9-20020a05660213c900b0077515a13c2dsi1475589iov.1.2023.05.31.03.11.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 May 2023 03:11:19 -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.. (IN-213-226-141-203.bitemobile.lv [213.226.141.203] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34VAB5C3026535 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 31 May 2023 12:11:13 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 6/7] isar-bootstrap: Remove unused code Date: Wed, 31 May 2023 13:11:01 +0300 Message-Id: <20230531101102.101755-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230531101102.101755-1-amikan@ilbers.de> References: <20230531101102.101755-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: nIH4oGLVlN77 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] -- 2.34.1