From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7111687409920638976 X-Received: by 2002:a6b:c5:0:b0:669:c74e:748c with SMTP id 188-20020a6b00c5000000b00669c74e748cmr14397850ioa.168.1655818761957; Tue, 21 Jun 2022 06:39:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6638:3816:b0:339:bc15:d225 with SMTP id i22-20020a056638381600b00339bc15d225ls647728jav.6.gmail; Tue, 21 Jun 2022 06:39:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uxSg3vJkmCpGKl3PERPQ3grb1wP8WvfLgr5ew1ysV1rgbo00+v/AkmjZLFWdWtoPPIdedP X-Received: by 2002:a05:6638:2105:b0:332:24e6:b98e with SMTP id n5-20020a056638210500b0033224e6b98emr16573320jaj.281.1655818761433; Tue, 21 Jun 2022 06:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655818761; cv=none; d=google.com; s=arc-20160816; b=C9jC0HCd8wyzGs2N6iYQbNvgQcHKm3obcyHp8CLeNMt6yx9JPVAA9WgT6NZSkvrcuj c+cQc+Kb+JCo019EOgWn2MPXk6KoSqIvHkleOf73n5WpY26/OKJGdjvUBFJ+StAWOjnN p7lbl68Ah/C0avoXhZqxdvW0VdQhV0A1iFD7StG7zbshaqRgiYH2g5F/kOI9UlpgPh9+ 6uyFA0T7JsxEAbS75zK+i6bGJc6414N3fNfkfIDIn2XuPl2+NIXmFXT8Agnn+S2cfpQn Y9rb75g8bUeYg6qU297E/VpAe0JNjClZj+XO8Ug9VBdX+q+CZ6P78vu4mdOxbRuYpPZP W2GA== 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=oLw9M0t46mMEyoXFGTdm4Hcx1mRKO4+yhklCR3ytqhA=; b=lP4rvMk3R5CNyOkU6gyxh4B087h3QYiat1kdqhqgR6aiBCSWAnWLtNjEre6/p0ZCq7 rGFhTuCS3Wz0omKXtuThXOIsdCzgwsbJLEEzs9AB/IZ51XZEpP8LujONpP/E3nWHJdad rdBYY2SG0OIiedKU36nTlGR24ScRkG7i+jIoq/z5sYro8D4slfOUxqg2RxKzDnPMZ9/z BimODwp08TWO+xvWWqPxMuaoOUWO1M3KN9AtBSK1WpyCx8MfkKAzwvTkburYnr5+Zp/P XjBgzo4lckh5g7btCErqc4b07fWCFBvE2EqOKV7LBfyu/7lDxyIJjdr9tqVTNUBH3z4t sEhQ== 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 y17-20020a05663824d100b00331b2ef714bsi682745jat.7.2022.06.21.06.39.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jun 2022 06:39:21 -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 localhost.localdomain (mm-222-67-120-178.brest.dynamic.pppoe.byfly.by [178.120.67.222]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25LDd50f031134 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Jun 2022 15:39:15 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v1 03/11] scripts/contrib: configure override conversion script Date: Tue, 21 Jun 2022 16:38:48 +0300 Message-Id: <20220621133856.4673-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220621133856.4673-1-amikan@ilbers.de> References: <20220621133856.4673-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: 4co82nZ28A0j Adopt override conversion script to the variables used in Isar. Signed-off-by: Anton Mikanovich --- 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