From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: adriaan.schmidt@siemens.com, Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v1 03/11] scripts/contrib: configure override conversion script
Date: Tue, 21 Jun 2022 16:38:48 +0300 [thread overview]
Message-ID: <20220621133856.4673-4-amikan@ilbers.de> (raw)
In-Reply-To: <20220621133856.4673-1-amikan@ilbers.de>
Adopt override conversion script to the variables used in Isar.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
scripts/contrib/convert-overrides.py | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py
index 4d41a4c..2463df9 100644
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -29,18 +29,15 @@ if len(sys.argv) < 2:
# List of strings to treat as overrides
vars = ["append", "prepend", "remove"]
-vars = vars + ["qemuarm", "qemux86", "qemumips", "qemuppc", "qemuriscv", "qemuall"]
-vars = vars + ["genericx86", "edgerouter", "beaglebone-yocto"]
-vars = vars + ["armeb", "arm", "armv5", "armv6", "armv4", "powerpc64", "aarch64", "riscv32", "riscv64", "x86", "mips64", "powerpc"]
-vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mipsisa32", "mipsisa64"]
-vars = vars + ["class-native", "class-target", "class-cross-canadian", "class-cross", "class-devupstream"]
-vars = vars + ["tune-", "pn-", "forcevariable"]
-vars = vars + ["libc-musl", "libc-glibc", "libc-newlib","libc-baremetal"]
-vars = vars + ["task-configure", "task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
-vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32", "overrideone", "overridetwo"]
-vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32", "mingw32", "poky", "darwin", "linuxstdbase"]
-vars = vars + ["linux-gnueabi", "eabi"]
-vars = vars + ["virtclass-multilib", "virtclass-mcextend"]
+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 + ["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"]
+vars = vars + ["raspbian-stretch", "raspios-bullseye", "ubuntu-focal"]
+vars = vars + ["oci", "oci-archive", "docker-archive", "docker-daemon", "containers-storage"]
+vars = vars + ["compat-arch", "class-sdk", "gnupg", "https-support", "forcevariable"]
# List of strings to treat as overrides but only with whitespace following or another override (more restricted matching).
# Handles issues with arc matching arch.
@@ -63,6 +60,7 @@ skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky
skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"]
skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"]
skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"]
+skips = skips + ["self._removePatch", "self._removePatchFile", "self._appendPatchFile", "script_prepend"]
imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"]
packagevars = packagevars + imagevars
--
2.17.1
next prev parent reply other threads:[~2022-06-21 13:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 13:38 [PATCH v1 00/11] Migrate to Bitbake 2.0 Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 01/11] meta: change deprecated parse calls Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 02/11] scripts/contrib: Add override conversion script Anton Mikanovich
2022-06-21 13:38 ` Anton Mikanovich [this message]
2022-06-21 13:38 ` [PATCH v1 04/11] dpkg-base: fix conflicting variable names Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 05/11] meta-isar: set default branch names Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 06/11] meta: remove non recommended syntax Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 07/11] bitbake: Update to Bitbake 2.0.1 Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 08/11] doc: require zstd tool Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 09/11] meta: update bitbake variables Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 10/11] meta: mark network access required tasks Anton Mikanovich
2022-06-21 13:38 ` [PATCH v1 11/11] meta: update overrides syntax Anton Mikanovich
2022-06-21 14:49 ` [PATCH v1 00/11] Migrate to Bitbake 2.0 Schmidt, Adriaan
2022-06-21 15:07 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621133856.4673-4-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox