From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a05:6808:eca:b0:339:f655:81cc with SMTP id q10-20020a0568080eca00b00339f65581ccmr9516448oiv.244.1657865105363; Thu, 14 Jul 2022 23:05:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6871:7a7:b0:10c:45cc:c65a with SMTP id o39-20020a05687107a700b0010c45ccc65als49680oap.6.-pod-prod-gmail; Thu, 14 Jul 2022 23:05:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vrm/gHqz5xz37va5VT+3tsIqh742P6Xqe1yEEX1vPTfHH8Ta73mdHrhUdJ/p3nwil0jSdI X-Received: by 2002:a05:6870:3292:b0:10c:d1fa:2e70 with SMTP id q18-20020a056870329200b0010cd1fa2e70mr6288880oac.281.1657865104913; Thu, 14 Jul 2022 23:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657865104; cv=none; d=google.com; s=arc-20160816; b=ui1YgMozrRNCMVUaupCOfNHVqkpVEmckmgGvblZAS4YarozT9y2ydKfxuuH8gW1Qqt f8odXQBgyK6m0DHASgtukt5yca5nhLO1vzMDI/Dj++QguvLPNvEItrMwlenG+s/sno2R OLXmwfH79fgGejMoRcslC0vdPSBjd7fFRKpWy4mYEH98U+EYHtuqD6dAlWhUHRwlAvY2 9HYydl7+r8An6m8e54djPlCT8q2ePOAr5TTjKrekuNPmJQq5+GYh6uMevKiTPR6XUXq/ k6FnX3AxudZULvWFhxTPJjPDHh6BN7YwfB0LQsWcB73dak7TcTfZapp/h5/C9VGnT2v6 jejQ== 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=8vz5QSa+SzLzfb8USl9VtWG+SOohy9fSa5r7tAaZFiU=; b=Jw5QR7v9YKZxutjtAeuD8A5qRRm9aAUCLYt+fMl2Uy9+xiWkaiNzcr6O5Sj1fsDlva 7SjgiwArRQofsq309w41El3SUnh5Z4bXzpnh+ktYN61oDALJxOhAhf1aQv/o8s0ytkrF 08xRpTvnROYmRUVYwidZATRhuc/5aCLyxPJPF53qIIFzE9PJX2Ly9GnJOCDbmUWxvL1J AvK+jtQe57bmOnfIh/jIhl1ily/YxhcneXYjym9Ny/md/3OJ4nKgHc2pgdOFHEIj2qMo WFcLI1fxjBQsmuh/N5HhOjn1+ugF/9A+xSpmTd9ADI1XiYw1VMmDvGbYjNXhgpy5XRJV aDGQ== 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 l125-20020acabb83000000b0032b08d1cffbsi181923oif.1.2022.07.14.23.05.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 23:05:04 -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 alena-nb.promwad.com (mm-137-75-214-37.mgts.dynamic.pppoe.byfly.by [37.214.75.137] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26F64pL4026837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Jul 2022 08:05:02 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 03/18] scripts/contrib: configure override conversion script Date: Fri, 15 Jul 2022 09:04:27 +0300 Message-Id: <20220715060442.18063-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220715060442.18063-1-amikan@ilbers.de> References: <20220715060442.18063-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: 8MqmCiPGTv8j Adopt override conversion script to the variables used in Isar. Signed-off-by: Anton Mikanovich --- scripts/contrib/convert-overrides.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 4d41a4c..bbb6873 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,8 +60,10 @@ 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"] packagevars = packagevars + imagevars vars_re = {} -- 2.17.1