From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128378901610364928 X-Received: by 2002:a67:7282:0:b0:356:da1:6876 with SMTP id n124-20020a677282000000b003560da16876mr2943244vsc.29.1659705051600; Fri, 05 Aug 2022 06:10:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:238d:b0:357:5666:c73e with SMTP id v13-20020a056102238d00b003575666c73els1079128vsr.0.-pod-prod-gmail; Fri, 05 Aug 2022 06:10:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR5vdQ5AYxBRQPE95JrVtpFXyC3sleRdkTxyU0BbX8TVwcBL7cvO8EJaMg8TslSUAr8LEeHe X-Received: by 2002:a67:ae09:0:b0:357:4b92:a8be with SMTP id x9-20020a67ae09000000b003574b92a8bemr2920833vse.75.1659705050967; Fri, 05 Aug 2022 06:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659705050; cv=none; d=google.com; s=arc-20160816; b=HKlOCyaGGBi9t8N9EdeHcys9j5NUfQV7KfbN1ipjgw8qiXba0x5Oh5vPZeNMXDF7B/ JHyDmtMbHM7Vut6alzCoLH+EVvUV7wUwg7485nOVKhhjgytiEhccyHHBom8cMOcBh98Y V0yR3WrXUxDacny4LYkNIQ33loGy7es5dwbZ4WkRy2sDOPkMBBg/c5WGa0lDzNMZTXPH R6vFOXutUvSUApD7SMNyzdlpio04tweliRyQyQUFg2jKn4X29GCd6BLtgTmsr7LqheoG lJFkHiPJodDTCL1BR4DcL/Bhv79H5CEwEYc1hP0GlzVLP0V2N+y8lXdR6ai2lpv7H2LO Ww3w== 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=EnhNESlFqjo2Tr4RQYAOJSSIMu1o5P6kVFxSee5ZqIs=; b=TNPuoqFABQoD6iFXzCDFiod10bTSQTWIDJ7hTAOIK3E6rSdAFoRJLqVU5nEyogQb2T bFyfsTl3NDNt9fJamlbgYAoDSqM7KHGY+/UXZl/bw+OWq5UwnHFg2HC5gBVIGLot4jB1 jpJ4U6JWkYCfesP70hE4HI6l5rXXpA9z80y8KMmPRKObVNalieKfrmyZgt3OQKXWBC9R nTGXj716plUDxBhPDanL2zHuEj2YxFj9wUU3U3G6Huqqyr0/X43vuCYdBLFA1T4i4wbL GwYadsBGKaqw7lpmtij0NXi5VGeSf/qxKGbPL4lfAQs7lh92eg/rsusjBRzd0hZ8yWPh Z1AQ== 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 y24-20020a05610207d800b003882da6dea8si167678vsg.0.2022.08.05.06.10.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Aug 2022 06:10:50 -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-183-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 275DAhHn009685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Aug 2022 15:10:48 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 03/21] scripts/contrib: configure override conversion script Date: Fri, 5 Aug 2022 16:10:17 +0300 Message-Id: <20220805131035.22844-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220805131035.22844-1-amikan@ilbers.de> References: <20220805131035.22844-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: m3wZMKCH5yd3 Adopt override conversion script to the variables used in Isar. Signed-off-by: Anton Mikanovich --- scripts/contrib/convert-overrides.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 4d41a4c..2752fd3 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,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