[PATCH 0/4] Remove deprecated variables and classes

[PATCH 0/4] Remove deprecated variables and classes

[Anton Mikanovich]

All of them were deprecated since v0.8 or v0.9 and now we can remove
backward compatibility and deprecation warnings.

Anton Mikanovich (4):
  rpi: Remove deprecated rpi-sdimg.bbclass
  image: Remove IMAGE_TRANSIENT_PACKAGES deprecation warning
  image: Remove backward compatibility with IMAGE_TYPE
  u-boot: Remove BUILD_DEPENDS backward compatibility

 meta-isar/classes/rpi-sdimg.bbclass       | 24 -----------------------
 meta/classes/image.bbclass                | 17 ++--------------
 meta/recipes-bsp/u-boot/u-boot-custom.inc |  6 ------
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 meta-isar/classes/rpi-sdimg.bbclass

-- 
2.34.1

[PATCH 1/4] rpi: Remove deprecated rpi-sdimg.bbclass

[Anton Mikanovich]

It has been deprecated since v0.9 and now being removed.
Use IMAGE_FSTYPES = "wic-img" and WKS_FILE = "rpi-sdimg" instead.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/classes/rpi-sdimg.bbclass | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 meta-isar/classes/rpi-sdimg.bbclass

diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass
deleted file mode 100644
index fc63f7f9..00000000
--- a/meta-isar/classes/rpi-sdimg.bbclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
-#
-# Based on SD class from meta-raspberrypi
-
-IMAGE_TYPEDEP:rpi_sdimg = "wic"
-
-WKS_FILE ?= "rpi-sdimg"
-
-IMAGER_INSTALL:wic += "parted \
-                       dosfstools \
-                       mtools \
-                       e2fsprogs \
-                       python3-distutils \
-                       bmap-tools"
-
-IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
-                     ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
-
-IMAGE_INSTALL += "bootconfig-${MACHINE}"
-
-python do_wic_image:prepend() {
-    bb.warn("rpi-sdimg image type is deprecated, please change to wic.")
-}
-- 
2.34.1

[PATCH 2/4] image: Remove IMAGE_TRANSIENT_PACKAGES deprecation warning

[Anton Mikanovich]

IMAGE_TRANSIENT_PACKAGES has been deprecated and ignored since v0.8
and now we can remove warning message.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/image.bbclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 73f1d52c..1e0691be 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -36,8 +36,6 @@ PP_ROOTFS = "${PP}/rootfs"
 PP_WORK = "${PP}/work"
 
 python(){
-    if (d.getVar('IMAGE_TRANSIENT_PACKAGES')):
-        bb.warn("IMAGE_TRANSIENT_PACKAGES is set and no longer supported")
     if (d.getVar('IMAGE_TYPE')):
         bb.warn("IMAGE_TYPE is deprecated, please switch to IMAGE_FSTYPES")
 
-- 
2.34.1

[PATCH 3/4] image: Remove backward compatibility with IMAGE_TYPE

[Anton Mikanovich]

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 <amikan@ilbers.de>
---
 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

[PATCH 4/4] u-boot: Remove BUILD_DEPENDS backward compatibility

[Anton Mikanovich]

BUILD_DEPENDS usage in u-boot-custom.inc has been deprecated since v0.8
and now we can remove backward compatibility and warning message.
DEBIAN_BUILD_DEPENDS should be used instead.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/recipes-bsp/u-boot/u-boot-custom.inc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 25f0e1ef..8aea773d 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -18,12 +18,6 @@ inherit dpkg
 
 SRC_URI += "file://debian/"
 
-python() {
-    if d.getVar('BUILD_DEPENDS'):
-        bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS")
-        d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
-}
-
 DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
 
 TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
-- 
2.34.1

Re: [PATCH 0/4] Remove deprecated variables and classes

[Uladzimir Bely]

On Thu, 2024-03-14 at 11:41 +0200, Anton Mikanovich wrote:
> All of them were deprecated since v0.8 or v0.9 and now we can remove
> backward compatibility and deprecation warnings.
> 
> Anton Mikanovich (4):
>   rpi: Remove deprecated rpi-sdimg.bbclass
>   image: Remove IMAGE_TRANSIENT_PACKAGES deprecation warning
>   image: Remove backward compatibility with IMAGE_TYPE
>   u-boot: Remove BUILD_DEPENDS backward compatibility
> 
>  meta-isar/classes/rpi-sdimg.bbclass       | 24 ---------------------
> --
>  meta/classes/image.bbclass                | 17 ++--------------
>  meta/recipes-bsp/u-boot/u-boot-custom.inc |  6 ------
>  3 files changed, 2 insertions(+), 45 deletions(-)
>  delete mode 100644 meta-isar/classes/rpi-sdimg.bbclass
> 
> -- 
> 2.34.1
> 

Applied to next.