From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7345128867348086784 X-Received: by 2002:ac2:490c:0:b0:513:3faf:a2aa with SMTP id n12-20020ac2490c000000b005133fafa2aamr4562975lfi.29.1710171087094; Mon, 11 Mar 2024 08:31:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b99:b0:413:1688:25c5 with SMTP id n25-20020a05600c3b9900b00413168825c5ls1026747wms.0.-pod-prod-08-eu; Mon, 11 Mar 2024 08:31:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGEfEe0WJC6KKq1j8oWfimWmrZRC/bPWrIrNlYADwTM3vetGziOzpX/nGtXRGwUHZo3JUG X-Received: by 2002:a05:600c:4f47:b0:413:812:ce7b with SMTP id m7-20020a05600c4f4700b004130812ce7bmr5315523wmq.24.1710171085198; Mon, 11 Mar 2024 08:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710171085; cv=none; d=google.com; s=arc-20160816; b=W1085FK0RFxZSdcHYDqC2U+Ync0tPj8upJIh7/bPvfA/mbkb9bJMEY55iLYrr2HN+B s+Fipq3YIn+e+omowisYIZYcKAnu0MpFls0uU15LsE0BypSX635Lf/xzaQasq6xGRbcs NlOQwa20lOfXdBDvktk9fXG82B42MQM7HnVNq3xHfxxgEXvtwV89S0BbBCkYNAlkQnrJ DB/rF6MBBgYhW4LGukVWjPGgY3+vK1ITF661PjjBS7re8JL7vhdyuMihxJ+ZAToLN6U0 hK+bA6YD8F2scwRTt0FtiWNPIlmfJJ1qB31rXoxxzIaNXzyzS5gIf1+oNVaAt4V7P0HI D1Sw== 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=bpuQr2h5fV/n3iY47rQ93dUk5WU8hMQhwnjqU+0XlVg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=NnVyx6tilDg8qz/lVvVe1QZ8iomVLd3J7cEywg3dXvcwf0+p6ZFMIrpNpv6+S7GWEN Ubrip8yoMs76uSc8r1oT7foX5l7Q2zx3ZkpS5NrygW+ZOHdfxoq2SQn1+3yHX/HeT4nj kCFqjOyim+9nYkV5XKn4ho/Eh6G1MVQ5P4YqIeN5oGRyyuh4SAapWaoO5CpkEXv4H+ZC QcZOzU2DO9p30v97GEOWOZHvSFg14GbE7MHlaCCTbB+DplZ5Zz3IZxC0Gsp61eK8T5hX dmjs6wmz0dkIZEN2aFZsZcDuOAhJOu+kbSl2MVxUlA0kfQmvatD6zNpJibUeN5q33M+i +tOQ==; dara=google.com 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 f12-20020a05600c4e8c00b004131c29b224si362019wmq.2.2024.03.11.08.31.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2024 08:31:25 -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 42BFVHas007311 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Mar 2024 16:31:24 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v8 8/8] isar-bootstrap: Remove unused code Date: Mon, 11 Mar 2024 17:31:11 +0200 Message-Id: <20240311153111.3772144-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240311153111.3772144-1-amikan@ilbers.de> References: <20240311153111.3772144-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: OBAUvzOfMd3f 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 a9a0cf1b..4670427a 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" @@ -189,30 +187,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