From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a05:6870:ac8f:b0:132:7f8a:66e7 with SMTP id ns15-20020a056870ac8f00b001327f8a66e7mr185544oab.146.1670936011267; Tue, 13 Dec 2022 04:53:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:5aa6:b0:13b:6766:edd8 with SMTP id dt38-20020a0568705aa600b0013b6766edd8ls5380875oab.3.-pod-prod-gmail; Tue, 13 Dec 2022 04:53:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf57Ex9NHsA51Tnw8V+bRUVZ8sE+qFD0Td+v2k6brcRUbCtVoSMUbsQFqKqG2NqnEc+agEHZ X-Received: by 2002:a05:6871:4504:b0:144:aeb8:39a9 with SMTP id nj4-20020a056871450400b00144aeb839a9mr13488331oab.17.1670936010799; Tue, 13 Dec 2022 04:53:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670936010; cv=none; d=google.com; s=arc-20160816; b=K9Ewr4fOeC2U+JYvuFNvyMsguvGkxicjoY8s9Y8WMsBxGh4z06NREW6qFjsUooTrDR diSGscOCefzhJmFZmMQ38xjINqCgU5ffM2qvbsJ/dXPnDMIY3AfdAl3lh7KBwDPU80A6 4POgtocjyTM/zBA6qDxDq2tCuw8/lRyiLAav9j3snWXJGncTFf8hLejgLysbQYJyrkuy 3M1eIF64tsmaKd6vs9Tt/la5XmcpE/wFloejdPjpdOAMjeb9WT87F47RzjgarpL5wDNS eKhvNaYIoSkSXiXIMqa6+UsTsG1avdOK0t2c3sMpwNqsAuOzVFzFt0jeFo9P3cmif1df TwGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=s/UxzL+9rlZpBm89g0AtRldMORPqfz45Ltjd6MI0vDQ=; b=V3HyfGD69NpZw9Fm3hONxtP4KFSEmieeleiYpUQ1MJjyh1gVflxIyTuvaLY5x7PqfL 55abmUT6g/Z6eqgVfJv+gv2jVx0oMv/bOQ3zbXy0qWQl5O+O5ZuzjGgV8WKle2e7f3Nv zUIHb+zUOBPaXNDK1himaFrTlfZwGC8bjguypoLobIIpD9R59536K7G7zvgfccVElmQJ PVMWN/h1cHM0xlUgQch12/OxwkhcOjN5v1/KJ9UIKwOPyY6BGIfmzVVExWid271qWfJ8 6174dPDNQ3MVcIG0Q1Z6gmU14gI7XNKtWuokJ2GY0WcgdDURKDD6sO6RElLlEGlSENMF auMw== 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 u19-20020a056871009300b001480308ea6csi376615oaa.0.2022.12.13.04.53.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:53:30 -0800 (PST) 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 alena-nb.promwad.com ([194.49.52.147]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BDCrDuV001200 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 13:53:28 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 03/21] scripts/contrib: configure override conversion script Date: Tue, 13 Dec 2022 15:52:47 +0300 Message-Id: <20221213125305.10984-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221213125305.10984-1-amikan@ilbers.de> References: <20221213125305.10984-1-amikan@ilbers.de> 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: AZBhFWKfSjEi Adopt override conversion script to the variables used in Isar. Signed-off-by: Anton Mikanovich --- scripts/contrib/convert-overrides.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 4d41a4c4..6551aaa8 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -29,18 +29,16 @@ 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 + ["stretch", "buster", "bullseye", "bookworm", "sid", "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,8 +61,11 @@ 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"] +imagevars = imagevars + ["TOOLCHAIN", "BOOTSTRAP_SRC", "IMAGE_FSTYPES", "IMAGE_SRC_URI", "IMAGE_TEMPLATE_FILES", "IMAGE_TEMPLATE_VARS", "IMAGE_CMD_REQUIRED_ARGS"] +imagevars = imagevars + ["IMAGE_FULLNAME", "CONVERSION_DEPS", "BUILDCHROOT_PREINSTALL", "IMAGER_BUILD_DEPS", "IMAGER_INSTALL"] packagevars = packagevars + imagevars vars_re = {} -- 2.17.1