From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7346151944290828288 X-Received: by 2002:a05:600c:1d82:b0:413:12e8:ef31 with SMTP id p2-20020a05600c1d8200b0041312e8ef31mr1053132wms.2.1710409287071; Thu, 14 Mar 2024 02:41:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b13:b0:413:f272:1100 with SMTP id m19-20020a05600c3b1300b00413f2721100ls224117wms.2.-pod-prod-01-eu; Thu, 14 Mar 2024 02:41:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkleONC8FNxTClJaCVxGgmzk+72y1zLWoEuD16JnQQIfw8yvKdfLMead0vBiovFIsg5Wa3 X-Received: by 2002:a05:600c:474e:b0:413:ee67:f7b7 with SMTP id w14-20020a05600c474e00b00413ee67f7b7mr951157wmo.28.1710409285353; Thu, 14 Mar 2024 02:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710409285; cv=none; d=google.com; s=arc-20160816; b=v6k0u7bh1/aZR2lDjahbqbXjVPH6kxcuKyHn5coDPp+8FoUkpBmTKVnJaqT1EjSPZD f0EPuhiYecxc1ZvftXxO1ez+tgvQdNJy/lVrqr+HCOLMBv7jDNVu2qf6FVyp2WDg71RT P1DPJuMy8nRG7uJyJdS1xJ2p4I2Sump3g9Gnk16nwdwrRPPTFTJ9iOTrs+x82OQCmnLr 9Uf9Ibg7j8A0kxpCyv/yHwPlwRXj9AipEYIOel0SSChUcshjw6o3eVet0pO5l3p5sJyj zExA81tIDtJugHZPbF7bq0sNreje8YPHSp6G2WxiwDl7bh2rYLP7MMbEE7/Z4QrcnBbo /4/g== 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=4ipvBXXjD2vHh8I91gAlD8QrarOigWun7axwV8O6Wdw=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=0XU4z4235ESyOVN8AXPPRc2xhEVgSr/g6+MJzQBMjcgSJ3OXFvIAAL7/FzrObV1L3Z 1E0Oi3Kz//V521gx/TYCrvMzkEQislImZVO2rTheiKQbZZ37sHl8s3XHAyqI0TbkTb+N qjPYBG8D/wlInTDUPcHlSeHKjU0LH3RoCKx4j5M7JBvxU0mCE29PVk053I+k4Y1J0HBx NbsSx8MYdFeCCqylY6clocUNw4NPFNuSxNN9DGJGUhzy+icVg4YgUVKTmT/9h6B/84On AcGetxU/PJU8LKeQwS3GlDidKVYemj8qtLRgleOTxKiKJhYiVQ8pBx3i9/UKeiMJpCJs PDyw==; 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 j13-20020a05600c190d00b00413ebf7640dsi171679wmq.1.2024.03.14.02.41.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2024 02:41: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 42E9fLqK023146 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Mar 2024 10:41:24 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/4] image: Remove backward compatibility with IMAGE_TYPE Date: Thu, 14 Mar 2024 11:41:13 +0200 Message-Id: <20240314094114.3867735-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240314094114.3867735-1-amikan@ilbers.de> References: <20240314094114.3867735-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: uopMjMy7xKVs We've fully migrated from IMAGE_TYPE = "*-img" naming scheme to the newer IMAGE_FSTYPES = "*" since v0.9. Now we can remove warnings and backward compatibility with the older variables. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 1e0691be..067987a1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -12,7 +12,7 @@ SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH} SSTATETASKS += "do_copy_boot_files" IMAGE_INSTALL ?= "" -IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE") if d.getVar("IMAGE_TYPE") else "ext4"}" +IMAGE_FSTYPES ?= "ext4" IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" @@ -36,9 +36,6 @@ PP_ROOTFS = "${PP}/rootfs" PP_WORK = "${PP}/work" python(){ - if (d.getVar('IMAGE_TYPE')): - bb.warn("IMAGE_TYPE is deprecated, please switch to IMAGE_FSTYPES") - # Debian Sid-Ports stores deb and deb-src in separate repos, which fails # sometimes on fetching sources if repos are not in sync during packages # version update. It makes Isar to fail on cache-deb-src, so disable it. @@ -121,10 +118,6 @@ def get_base_type(t, d): def get_image_basetypes(d): def recurse(t): bt = get_base_type(t, d) - if bt.endswith('-img'): - # be backwards-compatible - bt = bt[:-len('-img')] - bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) deps = (d.getVar('IMAGE_TYPEDEP:' + bt.replace('-', '_').replace('.', '_')) or '').split() ret = set([bt]) for dep in deps: @@ -159,10 +152,6 @@ python() { def collect_image_type(t): bt = get_base_type(t, d) - if bt.endswith('-img'): - # be backwards-compatible - bt = bt[:-len('-img')] - bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) if bt not in basetypes: basetypes[bt] = [] @@ -211,7 +200,7 @@ python() { # check if required args are set required_args = (localdata.getVar('IMAGE_CMD_REQUIRED_ARGS') or '').split() if any([d.getVar(arg) is None for arg in required_args]): - bb.fatal("IMAGE_TYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) + bb.fatal("IMAGE_FSTYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) # imager install for dep in (d.getVar('IMAGER_INSTALL:' + bt_clean) or '').split(): -- 2.34.1