From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231094895937585152 X-Received: by 2002:a05:620a:2804:b0:74e:437f:e942 with SMTP id f4-20020a05620a280400b0074e437fe942mr4053700qkp.8.1683620483632; Tue, 09 May 2023 01:21:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:6f09:0:b0:3ef:3784:2c24 with SMTP id bs9-20020ac86f09000000b003ef37842c24ls27129850qtb.2.-pod-prod-gmail; Tue, 09 May 2023 01:21:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ocVlIm6MRv4vgJPCC5Gkbd9vqldlUluXjkDJ75wYjBhCjFzBshELhQACc+NrNFU4zaoIi X-Received: by 2002:ac8:5c81:0:b0:3ef:3c3e:ab45 with SMTP id r1-20020ac85c81000000b003ef3c3eab45mr19352308qta.20.1683620483147; Tue, 09 May 2023 01:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683620483; cv=none; d=google.com; s=arc-20160816; b=v4xBchdtq4vx1WCw/qjKIm/1NrxwNRZkfYuaOLacPhFX4IWwICDfdc0WS4FQFTg44h 0lPk70D1LFqkMh2qsUp2EaWV9Y3bIonKK/ela+FDdivkFHCdEle89XoWEQ8W55rjP2KB 7+n2Guh0mqnfge+xJopCkoAnSz31jRA6P7d01WLFFb/6ygVgPW7wXMGTdrr6tlEKiX4K aUrZpVaC61SEVp0eLytCMllyv9362ibJ7pzjxFX8CqGMiTSW838j5IKUGkhBkYdRj0Yy 8vdqvEqn4ilHEwZI7JRbXARdPv0nvISaz/0NaGuhGeljW7+ZAfRLvlyqWABpA+RMEePC vqww== 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=ZYj5asDvse2R/Nd55WFxzQU5TzPhO/6VP6US+z+X8sc=; b=Kq8HUMoxoDTCUTVGJw88EKSBBz8ECujnrBN0Rnn4oMivI1n9qRSSHoym3xeWYd9EgZ /NV/Ws29fObG4QH31ZRJUEh/509EJWqASrtlw7CPiXj9BU+/xyaKdA9ArhSQ5vekET97 j6icG3O29+NBawybh+3HONYnc15vJP84BnUOE124VFPp3s1Mh709RJYQM7zXqsXQF89s +QBzZpnSU9SAtJNivVYMG9KIMsukfZYv4VeydLKxsjBMiijDhn1RmkKck8Y9E1PxEVbP LrTGolSYeP1y233+nR9mTuMa1kWJ139hZ8D4DZ7//w2XK/Mr/lDkNtoNxV1wVixtmCB0 rklA== 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 fv19-20020a05622a4a1300b003f38b9d45besi84375qtb.1.2023.05.09.01.21.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 May 2023 01:21:23 -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.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3498LA0l030838 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 May 2023 10:21:17 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 5/6] isar-bootstrap: Remove unused code Date: Tue, 9 May 2023 11:21:06 +0300 Message-Id: <20230509082107.1657595-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230509082107.1657595-1-amikan@ilbers.de> References: <20230509082107.1657595-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: RPtETKDIBowg 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 f9f75695..ca4dc64a 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')}" @@ -176,30 +174,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