From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a05:6512:3096:b0:507:a8cd:6c90 with SMTP id z22-20020a056512309600b00507a8cd6c90mr14916256lfd.51.1698836353336; Wed, 01 Nov 2023 03:59:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3082:b0:507:979a:7f48 with SMTP id z2-20020a056512308200b00507979a7f48ls1623624lfd.1.-pod-prod-04-eu; Wed, 01 Nov 2023 03:59:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd3RdB7Zde3l3g7mEIQE8T4FRASz6rtELQb4eyqytNEZu/58dtWaSsduzaiLnugRfd5H9j X-Received: by 2002:a05:651c:c97:b0:2bc:e330:660b with SMTP id bz23-20020a05651c0c9700b002bce330660bmr16540568ljb.9.1698836351544; Wed, 01 Nov 2023 03:59:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698836351; cv=none; d=google.com; s=arc-20160816; b=oaO2rb25L/ddD1+QtoAsSBov6DNITxxjvnYrJ+hyS4fqzRKK4i4WnhRA4qHGx/JYK9 LrifbMo0/993SHskro500dxd5i2SgNrpoo5cffVL+Vve7NMqCNGQopKp/2webIAZokqW tqYe3wWT5VZn3uQzU7cyexdZOCDSKQr29qZpgVmIZoKCn5bjl17TG+UaS0bsxp4dVbdh kYV1VxEV+qhnTUOyI3dKOUQ7cgedimnBV2LdWRCXY/kSvkImxx+WbipEe3IVKJvNNttB IHYLJJf4DHsTl2BN03kD+boqaquEuBsVKo0whWHYxzdOsh6heDrJL0/fYnSGDNqjc8I3 ST0Q== 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=vRe/8aIjueEeT8/O8IXls1D9fZKQp64JYyc9XbXErk4=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=EXkVovrUInoCc94uhqmETe3BBfINGi6sGIl/aDANJyiL5R6Xx6bLC8mcQbGz32vGXc 6so6zP2a28ERZo7GDKVQwzzOVAwwpWaETaf+8kJF3paC9KxJgdu2zQ9tacLwhGK097hu vdhAWkrMk6P1Nt++Jy6lGMgvvrJL82CGTo6Km+TzRZlOFbLIJVIgJecga0DIfvcLoD87 ezmiTyqACjOcca9PhhkFKnGq69d8sSC1+5ehiZtzUsIrUlADHkLu023cMgGWfBQvTYzK nXMsImYOvn2R1wiEhqbCPOHWjRDt12o3ocfSMaHbSor+1FCfyf6aEQGk6GVQBi4JLVk3 bymg== 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 x8-20020a2ea7c8000000b002bced4ef910si80060ljp.3.2023.11.01.03.59.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Nov 2023 03:59:11 -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 3A1Aw4cC010660 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 1 Nov 2023 11:59:03 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 8/8] isar-bootstrap: Remove unused code Date: Wed, 1 Nov 2023 12:57:57 +0200 Message-Id: <20231101105757.1988498-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231101105757.1988498-1-amikan@ilbers.de> References: <20231101105757.1988498-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: akevl7HS5Lr8 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 3048e0e0..03237c6c 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