From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231094895937585152 X-Received: by 2002:a05:622a:46:b0:3f5:16af:17dd with SMTP id y6-20020a05622a004600b003f516af17ddmr1063372qtw.8.1684403255419; Thu, 18 May 2023 02:47:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:1910:b0:623:8bf3:d76b with SMTP id er16-20020a056214191000b006238bf3d76bls1153279qvb.0.-pod-prod-02-us; Thu, 18 May 2023 02:47:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71VkFCs+UP56sYe50kDCWkaXlcvjkK1W9iPSCQk2F1HYqJEJRQjr8J6D1cSKhPmjW9VMFk X-Received: by 2002:a05:6214:1314:b0:5ee:e4f8:c7e5 with SMTP id pn20-20020a056214131400b005eee4f8c7e5mr4546666qvb.41.1684403254854; Thu, 18 May 2023 02:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684403254; cv=none; d=google.com; s=arc-20160816; b=NOqcHPNdfT5a/a30Clmu+GTe0MnNI05wZuvwbJwQzRM8IeO2IJ8Sfgmr2Wgi21U4Nt 77feaTKVvJzm9dUbJcU6CVln3wZUf0Bu+HJ47v5ttzeYDMnUHIjEO58mlup2nDfJXaFS 4pu6g41bX/9i2Hsd0K2Qjl18du7QEiCA2UCRGNNEt+Rv1ee9LavJKrSmQAF6KEFzuKlZ e4Xfn+gRkogG6G4ciRWyFVi+7uOzO5UxpZMKk0drWdt4rwPQZBUsmEGqwu9CGeW9qzHS o7JYudMLBU2S57tcpkus4H8Ni4jsPCayS7GsaQ570A6SC5h581bC9fWYpzbVJMciJhJB 8Mnw== 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=BCPeWSHgeVMKx6oi2S0XzMtGloekLP6/o9kRRvTEWdqPjkUMHNmuWkpwHWVO95vMBm ZvN8bKT5KrjoKaDWxqmLFlOlZOf9kIurz6m2Yi1Bd9x2L8DAwSNhf7gSUnBRdYrPGYnK +r4Eol3LVJJr/iTox++TBiM9+0AdtuyPRDJbtN/aDYVzutkEJefpp/AmSfSDFDfYPTaP 7MwXblHvG87Hrgfl0qyNowQDz/tNRP3cf4EqRfAgDoCD1SQpWK1SCqnIIUx/7rqBPxuK 4mD40ff7dfFig+GRc4To/gNwsd0apP5l5d39Un91oaJB2/BryGhhdOKMC8pJ5AjFgklh OomQ== 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 ez10-20020ad4590a000000b005ef42464657si79132qvb.3.2023.05.18.02.47.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 May 2023 02:47:34 -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.. ([85.254.74.3]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34I9lM4V020451 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 11:47:28 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 5/6] isar-bootstrap: Remove unused code Date: Thu, 18 May 2023 12:47:15 +0300 Message-Id: <20230518094716.117770-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518094716.117770-1-amikan@ilbers.de> References: <20230518094716.117770-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: tISyf696rpzh 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