From patchwork Fri Feb 20 09:28:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4881 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 20 Feb 2026 10:28:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f192.google.com (mail-qk1-f192.google.com [209.85.222.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61K9SO0f003604 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 20 Feb 2026 10:28:25 +0100 Received: by mail-qk1-f192.google.com with SMTP id af79cd13be357-8cb37db8b79sf2732828685a.3 for ; Fri, 20 Feb 2026 01:28:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1771579699; cv=pass; d=google.com; s=arc-20240605; b=CgVjT/vdqC0wv3e+YotCFT7qYLnvAdSrXJcZHvmUvxv3xERhAj35wv9edUIX6Uf2Gw RrrSQj7SOC2ZfcZxUxEuMam/tgzibNJpYbmkGZ4HK7SI7AMQvvX7Am380av6TKnCckWF E7nlGhgcE3a+z4wy3oBrkCYe3FN5ZraA5lCXCGg8H2uV/Hpm8PxWaqpfnvuXw1p6DFhN I401iIVtL/m/nz13/j7c+rocyG768VVAMSXtJ3jsW1boT8ArkxA/J92mKZMBnTusXpB/ XS55QI2+r1SY9JBfcHYPovh/ihkKiyc1hu9ErJc5y1wwhNP+USh5Z6lBDrGgt4LyJcrh 6/aQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=OX3Q8uQ0a8eBbBz3qKCKwe4ekA640wg3BO+OQJ21zrc=; fh=e7gweZl1JkL1yzN6uNz/FYlFo1qk/9U9NPrt7TghD7o=; b=Z/8/ETFIYX7LJfvpm6Z+R2XqJeuTmvdSGkTt1tUOY/7ZLHXeFJBaKRTZOSdFTA4gM6 VyprNGiulqDuovGrcOkCBzbbuhuHBnCgn3VijFuBVkK85kHgNg6jFKu0CcokkyO/gEUc Cc0PQ94lLb2xe/A5SQY4OrxJ8PveCa0Dr83SRaPfPjDpYalAVFngohTbYnz7XtU0B9Ka ryK4pIhQICWiGqPblnW1UNRyxNDyrw0Nn5PLn97InEX/yLZarw+IqCakslQJ8Me1SErV CFVZtz0SEo94/Se540NfNcsPWmiXQamEK8x9Qx+opkOvmr5n0qTyiUb0SbkY8okCKzue l0yg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1771579699; x=1772184499; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=OX3Q8uQ0a8eBbBz3qKCKwe4ekA640wg3BO+OQJ21zrc=; b=rUUQmmJjHeJe05Q0+ks8HH8pUiNF4KDhInT/6XJbPe6yL3bqEgUbhbR//PExF0oD1S CEeCwRCF2mZjr5AoooHcNUOvbSLrcjBlvPNNi20iWEvxeCLi/hEifa/NMFAmPw7HmoMQ RCT8zYJcHZf2TE6ydrtFuXpr0jhQGwDE1RIjX9DN9ALEO1utnlEbNjCtod2aDkSF09lE YbsY6WifuveVXQU2FsQBFXQRdJe0f8dWxXpf/vvPczHDKJxHCFDkjJlMOqKfweX6fpGd WY7NA5P2mjGHpRu8kPd5lR6rHjJSeyfWB5Jo+Brj0Obs5ngtjx2PztyOUqSs8mo8f0Xj jGHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771579699; x=1772184499; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=OX3Q8uQ0a8eBbBz3qKCKwe4ekA640wg3BO+OQJ21zrc=; b=UDu3yYiluBRJ5ro+xBGQ+5epztC2Tm2YuEnCQ1dfh3VYGLbs+DVP+Jpsqas/x6Kfh9 +VopSwsInSuHvg7IcIed9ydq3fCitMtMf3GXoJtV/QS8JZvY923efXw57vtIFnI+Znfp j0Qrc/zoTwHhW5JdDCfRq2yq0U6I244KV0m9/LnKKkRGMeGblUPNL8dIRXKuGVzzk4U+ NeWjS/8V/WZMHE8UyVudtcSzZnNoAz23DbicvR6CIHGMZcmY3q1No13bfcZqxltkSlFV Taq/onR8hfZNraZSstsNgVuwEHXno0bhRWIJtwqSOq1vq9QljmUMtINR0YbRdEp9k1oY md0Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXdzQN4Ho9oMJitZluDBdOKrg5ORVvnfYtykonrgXoKIXrg8j9a2API+VkP873hjZM4QQbuJSA=@isar-build.org X-Gm-Message-State: AOJu0YwI0ouHp/XMD6lo4NTTSbSuagMsyvoMY+8ervVOGnyH7mmNjIF/ YPnq0w32CsHbjUbYdTRnM1ktMCdpF797xTe5t5zIqn8GXzwCWPU3yqne X-Received: by 2002:a05:620a:199f:b0:8cb:3505:443c with SMTP id af79cd13be357-8cb4bff2a7fmr2532986385a.44.1771579699188; Fri, 20 Feb 2026 01:28:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+F4W7A1UhgHtcbxxFqCU3WLDjgAWGhGx0+dGZ+udUFp6g==" Received: by 2002:a05:6512:32c5:b0:59d:cdfe:64d0 with SMTP id 2adb3069b0e04-59f93200ccfls129555e87.0.-pod-prod-00-eu; Fri, 20 Feb 2026 01:28:16 -0800 (PST) X-Received: by 2002:a05:6512:308c:b0:59f:8e98:e6f8 with SMTP id 2adb3069b0e04-5a0063606efmr434629e87.0.1771579696215; Fri, 20 Feb 2026 01:28:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771579696; cv=none; d=google.com; s=arc-20240605; b=cchZiJo52Q98GohdAq6RB/+OVn3DmO6z1AQg8tRw/k5OKaomkRNP7V8VLGd1P3k2J0 T0j8tQ/iJk12LDOeiXvBCkG43LUz6u86Ne43Ypg3BqkCUgNEo9pSzDk7dW40rKaPtAzN aXhGY/erH9wKzR9lQuLE0lUO4w1Kp6uWLvKTiqSLk3W5M81w7S9FvU6J7/pQC22J725P lNgJ8JLSzRAfJ137pbJtaM9pBYp6IzVnnor4vi3QRWa2L/Ahe57VAQywXmZh2NA1nDKP Tuby1esghWpGg+YCMDROupMPUaFS0WCwLcjQmm8c2Bk7kmfvRlr+Dpe8UTsDgpxN/wg+ wu+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=FZbSbCZRlbAu5NYHkQwZRyuUCYIQEBy5tGGAjq8ONbk=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=GRBdXr+DBdGu/x3QQUNaQLQfRtH/NLbp2f7PVZ2xKmRDOEcP4eIzyV0pLMQ1QjdUUs XFMOg1Z1Qh1rPwdK1W6fMK275jVcMTb8g1oD3S8ayaAiAEn7D7+ZKXrk2jAzQMThOt+a opMcHlsG8/16YskTc+Tsk53cWwQJBlqsx1YSwm5QmF2CLMpTOxGRRTD7MGNHMOQB4LyE etNxPjCPlq0I3AUlG/X5DWCa0X5Vrz+RyVkuF9a/6YDJ0O/N37dwZcjoBXnXczN4x0Z5 qLuxv5KVpYMGNkhNEBLDmhxOXgYetOe0Xo4cnsKF6yHjNrovqMt9E8UveaqTOYvSR9hT xApw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-59e5f563bc0si728808e87.2.2026.02.20.01.28.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Feb 2026 01:28:16 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 61K9SEeR003595 for ; Fri, 20 Feb 2026 10:28:14 +0100 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH] meta: Remove imx6-sabrelite target Date: Fri, 20 Feb 2026 10:28:14 +0100 Message-Id: <20260220092814.377396-1-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= The imx6-sabrelite target and the associated custom ubi-ubifs-img.bbclass were marked as depracted since 8900dd133a. Now remove them. Signed-off-by: Zhihang Wei --- kas/machine/Kconfig | 8 -------- kas/machine/imx6-sabrelite.yaml | 7 ------- .../classes-recipe/ubi-ubifs-img.bbclass | 20 ------------------- meta-isar/conf/machine/imx6-sabrelite.conf | 18 ----------------- meta-isar/conf/mc.conf | 2 -- .../multiconfig/imx6-sabrelite-bullseye.conf | 5 ----- .../multiconfig/imx6-sabrelite-buster.conf | 7 ------- meta/classes-global/base.bbclass | 6 ------ scripts/contrib/convert-overrides.py | 2 +- testsuite/citest.py | 1 - testsuite/data/targets.yml | 4 ---- 11 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 kas/machine/imx6-sabrelite.yaml delete mode 100644 meta-isar/classes-recipe/ubi-ubifs-img.bbclass delete mode 100644 meta-isar/conf/machine/imx6-sabrelite.conf delete mode 100644 meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf delete mode 100644 meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index e09304c0..462af8e6 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -67,13 +67,6 @@ config MACHINE_HIKEY select CODENAME_BOOKWORM select ARCH_ARM64 -config MACHINE_IMX6_SABRELITE - bool "imx6-sabrelite" - select DISTRO_DEBIAN - select CODENAME_BUSTER - select CODENAME_BULLSEYE - select ARCH_ARMHF - config MACHINE_NANOPI_NEO bool "nanopi-neo" select DISTRO_DEBIAN @@ -258,7 +251,6 @@ config KAS_INCLUDE_MACHINE default "kas/machine/container-amd64.yaml" if MACHINE_CONTAINER_AMD64 default "kas/machine/de0-nano-soc.yaml" if MACHINE_DE0_NANO_SOC default "kas/machine/hikey.yaml" if MACHINE_HIKEY - default "kas/machine/imx6-sabrelite.yaml" if MACHINE_IMX6_SABRELITE default "kas/machine/nanopi-neo.yaml" if MACHINE_NANOPI_NEO default "kas/machine/nanopi-neo-efi.yaml" if MACHINE_NANOPI_NEO_EFI default "kas/machine/phyboard-mira.yaml" if MACHINE_PHYBOARD_MIRA diff --git a/kas/machine/imx6-sabrelite.yaml b/kas/machine/imx6-sabrelite.yaml deleted file mode 100644 index 466649d5..00000000 --- a/kas/machine/imx6-sabrelite.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH - -header: - version: 14 - -machine: imx6-sabrelite diff --git a/meta-isar/classes-recipe/ubi-ubifs-img.bbclass b/meta-isar/classes-recipe/ubi-ubifs-img.bbclass deleted file mode 100644 index 7e286e79..00000000 --- a/meta-isar/classes-recipe/ubi-ubifs-img.bbclass +++ /dev/null @@ -1,20 +0,0 @@ -# UBI with UBIFS image recipe -# -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -IMAGE_TYPEDEP:ubi_ubifs = "ubi" -IMAGE_TYPEDEP:ubi += "ubifs fit" - -IMAGE_CMD:ubi_ubifs() { - # we need to produce output (with extension .ubi-ubifs), - # so just create a symlink - ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs - - bbwarn "ubi-ubifs-img image type is deprecated, please use built-in image"\ - "classes instead:\n"\ - "IMAGE_TYPEDEP:ubi += \"ubifs fit\"\n"\ - "IMAGE_FSTYPES ?= \"ubi ubifs\"" -} diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf deleted file mode 100644 index e48823d6..00000000 --- a/meta-isar/conf/machine/imx6-sabrelite.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -DISTRO_ARCH ?= "armhf" - -KERNEL_NAME ?= "armmp" - -MACHINE_SERIAL ?= "ttymxc0" -BAUDRATE_TTY ?= "115200" - -IMAGE_CLASSES += "ubi-ubifs-img" -MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500" -UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000" -IMAGE_FSTYPES ?= "ubi-ubifs" - -DTB_FILES = "imx6q-sabrelite.dtb" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 493d5ae2..1bd926f6 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -41,8 +41,6 @@ BBMULTICONFIG = " \ de0-nano-soc-bookworm \ hikey-bullseye \ hikey-bookworm \ - imx6-sabrelite-buster \ - imx6-sabrelite-bullseye \ phyboard-mira-bullseye \ phyboard-mira-bookworm \ nanopi-neo-buster \ diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf deleted file mode 100644 index 9df2cd10..00000000 --- a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf +++ /dev/null @@ -1,5 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "imx6-sabrelite" -DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf deleted file mode 100644 index 262a6615..00000000 --- a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "imx6-sabrelite" -DISTRO ?= "debian-buster" diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 6c788adb..c7d60dcb 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -376,11 +376,5 @@ def deb_list_beautify(d, varname): var_list.append(stripped) return ', '.join(var_list) -# Deprecation checking -python deprecation_checking() { - if d.getVar('MACHINE') == 'imx6-sabrelite': - bb.warn("Target imx6-sabrelite is deprecated and will be removed soon") -} - deprecation_checking[vardepsexclude] += "MACHINE" do_unpack[prefuncs] += "deprecation_checking" diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 57f166ca..d10fde11 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -31,7 +31,7 @@ if len(sys.argv) < 2: vars = ["append", "prepend", "remove"] vars = vars + ["qemuamd64", "qemuarm", "qemuarm64", "qemui386", "qemumipsel", "qemuriscv64"] vars = vars + ["container-amd64", "virtualbox", "vmware"] -vars = vars + ["bananapi", "de0-nano-soc", "hikey", "imx6-sabrelite", "nanopi-neo", "phyboard-mira", "sifive-fu540", "stm32mp15x"] +vars = vars + ["bananapi", "de0-nano-soc", "hikey", "nanopi-neo", "phyboard-mira", "sifive-fu540", "stm32mp15x"] vars = vars + ["rpi-arm-v7", "rpi-arm-v7l", "rpi-arm", "rpi-arm64-v8", "rpi"] vars = vars + ["amd64", "armhf", "arm64", "i386", "mipsel", "riscv64"] vars = vars + ["debian-stretch", "debian-buster", "debian-bullseye", "debian-bookworm", "debian-sid", "debian-sid-ports"] diff --git a/testsuite/citest.py b/testsuite/citest.py index f11cd5af..aef2585a 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -696,7 +696,6 @@ class NoCrossTest(CIBaseTest): 'mc:qemuamd64-buster:isar-image-ci', 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-bullseye:isar-image-base', - 'mc:imx6-sabrelite-bullseye:isar-image-base', 'mc:phyboard-mira-bullseye:isar-image-base', 'mc:hikey-bullseye:isar-image-base', 'mc:virtualbox-bullseye:isar-image-base', diff --git a/testsuite/data/targets.yml b/testsuite/data/targets.yml index 5c9b5196..c95e97af 100644 --- a/testsuite/data/targets.yml +++ b/testsuite/data/targets.yml @@ -65,10 +65,6 @@ a: !mux name: hikey-bullseye hikey-bookworm: name: hikey-bookworm - imx6-sabrelite-buster: - name: imx6-sabrelite-buster - imx6-sabrelite-bullseye: - name: imx6-sabrelite-bullseye phyboard-mira-bullseye: name: phyboard-mira-bullseye phyboard-mira-bookworm: