From patchwork Thu Sep 7 16:48:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 30173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C67CEEC873E for ; Thu, 7 Sep 2023 16:48:53 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.18203.1694105329615028271 for ; Thu, 07 Sep 2023 09:48:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=fJ0rt2BE; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-31c479ede21so1161818f8f.2 for ; Thu, 07 Sep 2023 09:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1694105328; x=1694710128; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=D+4RqAW0i9iKX1+c4Hp8TcFnDT8TlI20SMe2WOklBO4=; b=fJ0rt2BE18Mcw6/nlksg7kh/JYqzUtUuyWMY6xtfDDEXOBaDTApJTDSPA/Sr6GFAOT XX+5thsAV0hb5lIZPaMCf3dOOHA+csAEzuEvuNEp128ApOZBnc02ayxJeXS/ks8vKOFW zeflwk3dMBd8CdL7GJ0rMQkO7N7WsA7Ivrihw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694105328; x=1694710128; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D+4RqAW0i9iKX1+c4Hp8TcFnDT8TlI20SMe2WOklBO4=; b=NkIvdd8AXeBlppjwF4AGrG8a8gYfTjvh5C1FPjZ8LLNUG36Kn03eqQW14xp/TRTDEV XZ/+LcRSWKgf+MuD/9wFXsGPh5Um/RUK2eMVuSMSYDu8QhboH4UpLNtB/4JNdrC2TXyD VT60mzpkpZv672GW8MljTCbDvnWpgk9n9jBP8PBNj3Om9sTbIocqcl4SVG43pjjhUhXE B5vi57dyGtx6LAF7IH3q+agkgcaqRhjrulEDncMS5C9mdG6HS1GRvpNHEvdwRHEiZ/VA 6NuWOYTnGQaYbvouEedD6Gw7fGjxVdq/u9rj3ywWIr5SsBGIYAldW28/hVnZAEg1XWsw X7Lg== X-Gm-Message-State: AOJu0YwyRiR3CeEDBZ95h2l8yuePUQyWd/CJieO7zLms0MpPViX4kybQ /EmvEB2hlXr6f96iD2I8QTQplXydNX501dbMmXk= X-Google-Smtp-Source: AGHT+IEHXE4ue6MKqeZGd4qdCa4IOqJYrWS61+erLD42KdWyIdQY9B25hwD8od/DdSCskHHAkWbA4A== X-Received: by 2002:a5d:58ca:0:b0:317:d048:8d87 with SMTP id o10-20020a5d58ca000000b00317d0488d87mr4999691wrf.61.1694105327721; Thu, 07 Sep 2023 09:48:47 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5f38:2f43:a165:5f10]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003fef6881350sm3026493wme.25.2023.09.07.09.48.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:48:47 -0700 (PDT) From: Richard Purdie To: yocto@lists.yoctoproject.org Subject: [yocto-autobuilder-helper] [PATCH 1/5] config.json: Set SDKMACHINE explicitly Date: Thu, 7 Sep 2023 17:48:42 +0100 Message-Id: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Sep 2023 16:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60935 SDKMACHINE defaults to i686 for historical reasons but it should no longer be the main thing we test. Start to improve things by setting things by everywhere explicitly so we can then rationalise to what makes sense. Signed-off-by: Richard Purdie --- config.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config.json b/config.json index ae5e4ea..6d1076b 100644 --- a/config.json +++ b/config.json @@ -85,6 +85,7 @@ "IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'" ], "step1" : { + "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk" }, @@ -172,6 +173,7 @@ "arch-hw" : { "BUILDINFO" : true, "step1" : { + "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -201,10 +203,12 @@ "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], "MACHINE" : "qemuarm64", "step1" : { + "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk" }, "step2" : { + "SDKMACHINE" : "i686", "MACHINE" : "qemux86-64", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" @@ -326,6 +330,7 @@ "SANITYTARGETS" : "core-image-sato:do_testimage" }, "step2" : { + "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, @@ -449,12 +454,14 @@ "step1": { "shortname": "Build for fvp-base", "MACHINE": "fvp-base", + "SDKMACHINE" : "i686", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step2": { "shortname": "Build for generic-arm64 (poky)", "MACHINE": "generic-arm64", + "SDKMACHINE" : "i686", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, @@ -462,6 +469,7 @@ "shortname": "Build for generic-arm64 (poky-altcfg)", "DISTRO": "poky-altcfg", "MACHINE": "generic-arm64", + "SDKMACHINE" : "i686", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -759,6 +767,7 @@ "shortname" : "mip64 n32", "description" : "qemumips64 image using n32 as default", "MACHINE" : "qemumips64", + "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-minimal core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-minimal:do_testsdk", "extravars" : [ @@ -773,6 +782,7 @@ "pkgman-non-rpm" : { "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-minimal:do_testsdk", + "SDKMACHINE" : "i686", "step1" : { "shortname" : "x86 ipk", "MACHINE" : "qemux86-64", From patchwork Thu Sep 7 16:48:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 30172 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C830AEC8748 for ; Thu, 7 Sep 2023 16:48:53 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.18204.1694105330212222262 for ; Thu, 07 Sep 2023 09:48:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Jckv5MZX; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.52, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-31adc5c899fso1252558f8f.2 for ; Thu, 07 Sep 2023 09:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1694105328; x=1694710128; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=01ddVK908YSXa/RAgrKhj1cmV/5UFwaWr+JPV0UMYVI=; b=Jckv5MZXkDJyipbN8GxDCNRaLzjvvWc1tmQO9UMjKjuwh6H/SxA/cCvzI2DhTowDsw SRgsLb7+9GcLSfBcO4W9RAJ+vrhLgjBmoGu4gv5QaudMbnBFinYply7Dwq8tdZXExpRx 1apKL21DKhm1GQf7UTGqZAKoWKLwUcrmHCr2g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694105328; x=1694710128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=01ddVK908YSXa/RAgrKhj1cmV/5UFwaWr+JPV0UMYVI=; b=DYNC/PqF7pulw3rYRogHT0VfWzrb57mqiNpu8QM20lWOfh7kHZdOvEshEnRP4C5lvi Rs7ZFIjq2G0/MQIYlYXTxrX7qH3LhfC2DDCw+Nxg5Xp48fRxMrY+dER3lqCSK7O9wE1c BawTwDaZ/hHw3GwgnqBJwS6heoiUcGoj8x6PfAWWkdCBaKVtznsVpi3/nYW58Kpq2vik NunN1d5GG1uspywc03Z/KVXoQuyfK3SfwcOdECJgvgphTFpxaZWlsgQ/u0zd3V/rXF9E GxZf+9VmRgurcBowYGwpWy6HnHxy6l6kDjRkSbOXlA1cgC8NmNndHS9NpmsqdzPR3upt uMIA== X-Gm-Message-State: AOJu0YzSpjK1NavbYms44Ks6EYpfkGZJN9bmPo+4t0ll38XO9oW513/r hlK+BqFJV6Ygg0f18NnGxHrvvQYHKGZ/MTPuxP0= X-Google-Smtp-Source: AGHT+IEuSbQ7PlIF48r2XDoQJQByn8ywn2ZBeYnbj9veg22/N+nhn1EJXvF/CtGHWcniz1h+/GkcFA== X-Received: by 2002:a5d:5611:0:b0:319:6f0e:fc0e with SMTP id l17-20020a5d5611000000b003196f0efc0emr1626wrv.30.1694105328290; Thu, 07 Sep 2023 09:48:48 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5f38:2f43:a165:5f10]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003fef6881350sm3026493wme.25.2023.09.07.09.48.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:48:47 -0700 (PDT) From: Richard Purdie To: yocto@lists.yoctoproject.org Subject: [yocto-autobuilder-helper] [PATCH 2/5] config.json: Prefer x86_64 SDKMACHINE to i686 Date: Thu, 7 Sep 2023 17:48:43 +0100 Message-Id: <20230907164846.3186078-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> References: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Sep 2023 16:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60936 The i686 SDKMACHINE target makes little sense now, reduce it's usage substantially to match use in reality and make x86_64 the default. Signed-off-by: Richard Purdie --- config.json | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/config.json b/config.json index 6d1076b..df83bdb 100644 --- a/config.json +++ b/config.json @@ -31,7 +31,7 @@ "NEEDREPOS" : ["poky"], "DISTRO" : "poky", "MACHINE" : "qemux86-64", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "PACKAGE_CLASSES" : "package_rpm package_deb package_ipk", "DLDIR" : "DL_DIR = '${BASE_SHAREDDIR}/current_sources'", "SSTATEDIR" : ["SSTATE_DIR ?= '${BASE_SHAREDDIR}/pub/sstate'"], @@ -85,14 +85,14 @@ "IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'" ], "step1" : { - "SDKMACHINE" : "i686", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk", - "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk" + "SDKMACHINE" : "x86_64", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" }, "step2" : { - "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", - "SANITYTARGETS" : "core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" + "SDKMACHINE" : "i686", + "BBTARGETS" : "core-image-sato:do_populate_sdk", + "SANITYTARGETS" : "core-image-sato:do_testsdk" } }, "arch-qemu-lite" : { @@ -173,7 +173,7 @@ "arch-hw" : { "BUILDINFO" : true, "step1" : { - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -203,26 +203,27 @@ "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], "MACHINE" : "qemuarm64", "step1" : { - "SDKMACHINE" : "i686", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk", - "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk" + "SDKMACHINE" : "x86_64", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" }, "step2" : { - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "MACHINE" : "qemux86-64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step3" : { - "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", - "SANITYTARGETS" : "core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" + "SDKMACHINE" : "i686", + "BBTARGETS" : "core-image-sato:do_populate_sdk", + "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step4" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk" + "SDKMACHINE" : "i686", + "BBTARGETS" : "core-image-sato:do_populate_sdk", + "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step5" : { "BUILDINFO" : false, @@ -454,14 +455,14 @@ "step1": { "shortname": "Build for fvp-base", "MACHINE": "fvp-base", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step2": { "shortname": "Build for generic-arm64 (poky)", "MACHINE": "generic-arm64", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, @@ -469,7 +470,7 @@ "shortname": "Build for generic-arm64 (poky-altcfg)", "DISTRO": "poky-altcfg", "MACHINE": "generic-arm64", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -755,7 +756,7 @@ "shortname" : "x86-64 lib64-img", "description" : "x86 building 64bit multilib image", "MACHINE" : "qemux86", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS" : "lib64-core-image-sato lib64-core-image-sato-sdk", "extravars" : [ "require conf/multilib.conf", @@ -767,7 +768,7 @@ "shortname" : "mip64 n32", "description" : "qemumips64 image using n32 as default", "MACHINE" : "qemumips64", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-minimal:do_testsdk", "extravars" : [ @@ -782,7 +783,7 @@ "pkgman-non-rpm" : { "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-minimal:do_testsdk", - "SDKMACHINE" : "i686", + "SDKMACHINE" : "x86_64", "step1" : { "shortname" : "x86 ipk", "MACHINE" : "qemux86-64", From patchwork Thu Sep 7 16:48:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 30174 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB8A7EC8747 for ; Thu, 7 Sep 2023 16:48:53 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.18377.1694105331185991112 for ; Thu, 07 Sep 2023 09:48:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=BNOviZ00; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.48, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-401b393ddd2so13529105e9.0 for ; Thu, 07 Sep 2023 09:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1694105329; x=1694710129; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oKRD1MthngblTv8qnDjDeopn4gXyTLtFcFxKUJa4OW8=; b=BNOviZ00aNItgz9iunpi8HFOE8YV9saKWZd5djFEAws9nzHq8NgfSN/aDP5x3DsGII MMpcR9WsLzt90wNLqWHl0aHb1gOfbKkStfAnnPMMFrwgGsQUhIhsjs6L8d+GybxTRKZD cBvVWp/2bMtfnh8YWsLcrupDU4Qf20t5ztixE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694105329; x=1694710129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oKRD1MthngblTv8qnDjDeopn4gXyTLtFcFxKUJa4OW8=; b=PnqypcHKa6O10C8940yk0Su5Fx9Ln6CFsmj7eoQuqaTX7T6yKDP1Do6VdO669oxb5X HJ+B2ikCTO9D8QBNCmID/YV8TTXVpkwD5p1gyW3JyI9CFciQw+wTyKHAN5W1kXxqSnYo mmHUKYidvnKUMvHgWWH2dgF1E9KjrASF4LNXqeylOeXYMw2hFyE/9YEqsjfud1dmpkea YBWxGh8I0ZQu7688uI6gKBsSrPMVzz03DT4r1QYuAwyla+5bH5LHe94upJyXoMzMEKNW htm0C/FrE1+MCziZBDUbQuYfXNFJ884xQVgxBbdOutpryRAhJoBTi9zog6KFxhWu1FoB kF0w== X-Gm-Message-State: AOJu0Yz0fmSurBKRvXtv1F/r7OhaxZN/XHI2kBaXmPnkK4Mp33JGChws yD4ubSdDu26l22GaGVnxrcOVakfLw3lh154UiDI= X-Google-Smtp-Source: AGHT+IH/4LbI/+NHqBvllF+SMy/aVgjbrgmdfTVfvhl/KT2xuvxRMidmJw83Ueg1Gkxs1wEPDgbwhg== X-Received: by 2002:a05:600c:214e:b0:401:eb0:a980 with SMTP id v14-20020a05600c214e00b004010eb0a980mr233098wml.14.1694105329186; Thu, 07 Sep 2023 09:48:49 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5f38:2f43:a165:5f10]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003fef6881350sm3026493wme.25.2023.09.07.09.48.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:48:48 -0700 (PDT) From: Richard Purdie To: yocto@lists.yoctoproject.org Subject: [yocto-autobuilder-helper] [PATCH 3/5] config.json: Drop now unneeded SDKMACHINE settings Date: Thu, 7 Sep 2023 17:48:44 +0100 Message-Id: <20230907164846.3186078-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> References: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Sep 2023 16:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60937 Signed-off-by: Richard Purdie --- config.json | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/config.json b/config.json index df83bdb..bc73e93 100644 --- a/config.json +++ b/config.json @@ -102,7 +102,6 @@ "IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'" ], "step1" : { - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" } @@ -173,7 +172,6 @@ "arch-hw" : { "BUILDINFO" : true, "step1" : { - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -181,7 +179,6 @@ "arch-hw-qemu" : { "BUILDINFO" : true, "step1" : { - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal core-image-sato core-image-sato-sdk core-image-sato:do_populate_sdk core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-sato:do_testsdkext" }, @@ -239,7 +236,6 @@ }, "buildperf" : { "MACHINE" : "qemux86", - "SDKMACHINE" : "x86_64", "SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], "SSTATEDIR_RELEASE" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"], "PACKAGE_CLASSES" : "package_rpm", @@ -259,7 +255,6 @@ }, "selftest" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "PACKAGE_CLASSES" : "package_rpm", "extravars" : [ "RPM_GPG_SIGN_CHUNK = '1'", @@ -285,7 +280,6 @@ }, "reproducible" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "step1" : { "shortname" : "Reproducible Selftest", "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail/ DISPLAY=:1 oe-selftest -r reproducible"], @@ -294,7 +288,6 @@ } }, "trigger-build" : { - "SDKMACHINE" : "x86_64", "MACHINE" : "qemux86-64", "step1" : { "shortname" : "Sources pre-fetching", @@ -306,7 +299,6 @@ } }, "trigger-build-posttrigger" : { - "SDKMACHINE" : "x86_64", "MACHINE" : "qemux86-64", "step1" : { "shortname" : "Source Mirror Selftest", @@ -336,7 +328,6 @@ "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step3" : { - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -366,7 +357,6 @@ "MACHINE" : "beaglebone-yocto", "TEMPLATE" : "arch-hw", "step2" : { - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk" } }, @@ -455,14 +445,12 @@ "step1": { "shortname": "Build for fvp-base", "MACHINE": "fvp-base", - "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, "step2": { "shortname": "Build for generic-arm64 (poky)", "MACHINE": "generic-arm64", - "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, @@ -470,7 +458,6 @@ "shortname": "Build for generic-arm64 (poky-altcfg)", "DISTRO": "poky-altcfg", "MACHINE": "generic-arm64", - "SDKMACHINE" : "x86_64", "BBTARGETS": "core-image-minimal core-image-sato core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } @@ -644,7 +631,6 @@ }, "qemux86-world" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "world", "extravars" : [ "require conf/multilib.conf", @@ -654,7 +640,6 @@ }, "qemux86-world-alt" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "DISTRO" : "poky-altcfg", "BBTARGETS" : "world", "extravars" : [ @@ -666,7 +651,6 @@ }, "qemux86-64-x32" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "BUILDINFO" : true, "extravars" : [ "DEFAULTTUNE = 'x86-64-x32'", @@ -697,7 +681,6 @@ }, "multilib" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "step1" : { "shortname" : "x86-64 lib32-img rpm", "description" : "qemux86-64 32bit multilib image with rpm", @@ -756,7 +739,6 @@ "shortname" : "x86-64 lib64-img", "description" : "x86 building 64bit multilib image", "MACHINE" : "qemux86", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "lib64-core-image-sato lib64-core-image-sato-sdk", "extravars" : [ "require conf/multilib.conf", @@ -768,7 +750,6 @@ "shortname" : "mip64 n32", "description" : "qemumips64 image using n32 as default", "MACHINE" : "qemumips64", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-minimal:do_testsdk", "extravars" : [ @@ -783,7 +764,6 @@ "pkgman-non-rpm" : { "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-minimal:do_testsdk", - "SDKMACHINE" : "x86_64", "step1" : { "shortname" : "x86 ipk", "MACHINE" : "qemux86-64", @@ -936,7 +916,6 @@ }, "musl-qemux86" : { "MACHINE" : "qemux86", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-sato-sdk world", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-sato-sdk:do_testimage", "extravars" : [ @@ -945,7 +924,6 @@ }, "musl-qemux86-64" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "BUILDINFO" : true, "BBTARGETS" : "core-image-minimal core-image-full-cmdline core-image-sato-sdk world", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-full-cmdline:do_testimage core-image-sato-sdk:do_testimage", @@ -955,7 +933,6 @@ }, "checkuri" : { "MACHINE" : "qemux86-64", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "universe:do_checkuri", "extravars" : [ "SOURCE_MIRROR_FETCH = '1'", @@ -1147,7 +1124,6 @@ }, "step3" : { "shortname" : "Full eSDK type", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-minimal:do_populate_sdk_ext", "extravars" : [ "SDK_EXT_TYPE = 'full'" @@ -1155,18 +1131,15 @@ }, "step4" : { "shortname" : "Prep locked-sigs test", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato core-image-sato:do_populate_sdk_ext" }, "step5" : { "shortname" : "Prep #2 locked-sigs test", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato -S none", "EXTRACMDS" : ["${SCRIPTSDIR}/../janitor/clobberdir ${BUILDDIR}/../build/tmp"] }, "step6" : { "shortname" : "Test locked-sigs image", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato", "extravars" : [ "TMPDIR = '${TOPDIR}/newtmp'", @@ -1175,7 +1148,6 @@ }, "step7" : { "shortname" : "Test locked-sigs eSDK", - "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato:do_populate_sdk_ext", "extravars" : [ "TMPDIR = '${TOPDIR}/sdktmp'" From patchwork Thu Sep 7 16:48:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 30170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCC96EC874D for ; Thu, 7 Sep 2023 16:48:53 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.18205.1694105331537690727 for ; Thu, 07 Sep 2023 09:48:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=gCW2hs9Q; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-401da71b7c5so13210235e9.2 for ; Thu, 07 Sep 2023 09:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1694105330; x=1694710130; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TSu4NDdwKjIbayhIwnl8zrCDzMFpAq4D/dcQ7aP6ULk=; b=gCW2hs9QDiMcRTy7p2pBFWDQz7Q7vjIu5/FPvUYQVvuTRCD5ujYHUbQJ96hGVE8wFx XiblOkYzNdBDVQdtdu/wCBOiwLmYU7Sg6ZTlRxiIUaXyZHXM7GvpS7afM00J8fQBcIfA klfsNmzCqy4dpn034MZzktrNBezSDMGvd5TLo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694105330; x=1694710130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TSu4NDdwKjIbayhIwnl8zrCDzMFpAq4D/dcQ7aP6ULk=; b=aioZ6ysqB4WgDp1xzketmLhkQUEWuljEbOncWf+hH6gltanZlIZRot4e9zYyhr8OnL SgTDMTVjhVphZN/o/NsC8Z059cllfDflDgQrQammBtz1XfG6SPJQlcUejRb5MiW87tgz 3qMM7VIzFY0j9gTMfHie+3VxFk1w/FcM7La4p8BT+P96bxoXnrMQhi0GDue4dPA7iUa0 hS2Yws61xXMDf/AyuxEGwwKl/hgcJYbIX/ANe9jOO/KMmRqT2/RsCo1oC3OaUHX5ccuv 9G8o8CdP0vlK2rs65kJ9o34Vbm/Bh0GME6GCDPVRUn77J7yo3AJYZ+yuzuZAKCQ7Oz6M cYQw== X-Gm-Message-State: AOJu0YzJMElypUuV7iBzt9Rb+NQImy2Gf7toc2Ju0HxVITSZ6rBzOkKX v8bR6xeRPxp/tB4o6VisRAOpKNUiI0yR4JjwXPU= X-Google-Smtp-Source: AGHT+IEJeQQEGUNSgIZ0Lc/oC4+5NIYO+lAO30DEqdSdp3i+Tx117RA2P8e0LqacUJEhCNPGtsolrQ== X-Received: by 2002:a7b:c456:0:b0:402:ee67:45d1 with SMTP id l22-20020a7bc456000000b00402ee6745d1mr163172wmi.36.1694105329904; Thu, 07 Sep 2023 09:48:49 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5f38:2f43:a165:5f10]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003fef6881350sm3026493wme.25.2023.09.07.09.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:48:49 -0700 (PDT) From: Richard Purdie To: yocto@lists.yoctoproject.org Subject: [yocto-autobuilder-helper] [PATCH 4/5] config.json: Consolodate oecore test steps Date: Thu, 7 Sep 2023 17:48:45 +0100 Message-Id: <20230907164846.3186078-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> References: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Sep 2023 16:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60938 Signed-off-by: Richard Purdie --- config.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/config.json b/config.json index bc73e93..685e957 100644 --- a/config.json +++ b/config.json @@ -319,17 +319,13 @@ "BB_SIGNATURE_HANDLER = 'OEEquivHash'" ], "step1" : { - "BBTARGETS" : "core-image-sato", - "SANITYTARGETS" : "core-image-sato:do_testimage" + "BBTARGETS" : "core-image-sato core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", + "SANITYTARGETS" : "core-image-sato:do_testimage core-image-sato:do_testsdk" }, "step2" : { "SDKMACHINE" : "i686", "BBTARGETS" : "core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" - }, - "step3" : { - "BBTARGETS" : "core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", - "SANITYTARGETS" : "core-image-sato:do_testsdk" } }, "qemuarm" : { From patchwork Thu Sep 7 16:48:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 30171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCC4DEC874C for ; Thu, 7 Sep 2023 16:48:53 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.18206.1694105332219580463 for ; Thu, 07 Sep 2023 09:48:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=RRYw0w5N; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-402c1407139so13426985e9.1 for ; Thu, 07 Sep 2023 09:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1694105330; x=1694710130; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TTTIBQeIsL5tNdjzfh/XgwBb93sS51ungLip+Uguuqc=; b=RRYw0w5NfZbS9rWIW8ZSuhQBTwPgq00bsK4pw7jC7qdZkeFGo84Lj5ytH9RmxSVVIM HOccz2ku82Hrvz0RV1+iWrSFjLGPIWsqp7VqsnUTOPMXpwQuFNCssEWD6hD1wigfl+/8 F4ZkNiDODhlmyQdBEDHyhE44+CHkLHpofFBiw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694105330; x=1694710130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TTTIBQeIsL5tNdjzfh/XgwBb93sS51ungLip+Uguuqc=; b=c7pXqlvYKzY4uXGQpPslxpQvUnEOt5lVJ5zjThl4On+ShRwVZugqkyrVxNShAn8fSB +/59ff8DEThu3j1lgGc8GCeZtWL5UpbpNCN/IpM+9ch2l7yCQ9NQXj0EQD98RmarDEen tWCxOI/KrMndS0TpU1aPsBvMAsmt0CjhnbsDCbkNATtTVBgR6qZbrJ5O0wMiiOIq+nMO faoBAQW6Fl82VTe8c3SnnW02YtAZ01EYPYXlUwvmwqQOpVKZKgwQ8AVfLHIKeRwpM+/s 1HG8PZRhaox9eC+3Gff/o8qqSU+L3iWiBqm11bX5i3M+pocloVcAcBHL+2GA4I35ykoV jl3A== X-Gm-Message-State: AOJu0YxoK5omY6RbBx1bGoZm21VmtbdAJBrsWwDBMAGrIWSWcQNIyvTk lty0VMQ8qk1sdTiKDyAvbmueKk9Ui9sUN4GTmdo= X-Google-Smtp-Source: AGHT+IF3fvuOJzo0EjiGyqSyz45fW5mp/F7eZe+spm0B1wJytQPvjZcSyFRW3Ax9/f6QmzFLyKavnw== X-Received: by 2002:a1c:4b0a:0:b0:401:bd2e:49fc with SMTP id y10-20020a1c4b0a000000b00401bd2e49fcmr212502wma.24.1694105330562; Thu, 07 Sep 2023 09:48:50 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5f38:2f43:a165:5f10]) by smtp.gmail.com with ESMTPSA id l21-20020a1c7915000000b003fef6881350sm3026493wme.25.2023.09.07.09.48.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:48:50 -0700 (PDT) From: Richard Purdie To: yocto@lists.yoctoproject.org Subject: [yocto-autobuilder-helper] [PATCH 5/5] config.json: Drop most core-image-minimal-dev image tests and add core-image-full-cmdline Date: Thu, 7 Sep 2023 17:48:46 +0100 Message-Id: <20230907164846.3186078-5-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> References: <20230907164846.3186078-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Sep 2023 16:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/60939 Signed-off-by: Richard Purdie --- config.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config.json b/config.json index 685e957..59944f2 100644 --- a/config.json +++ b/config.json @@ -86,7 +86,7 @@ ], "step1" : { "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-full-cmdline core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" }, "step2" : { @@ -172,7 +172,7 @@ "arch-hw" : { "BUILDINFO" : true, "step1" : { - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-ptest-all core-image-sato:do_populate_sdk", "SANITYTARGETS" : "core-image-sato:do_testsdk" } }, @@ -201,13 +201,13 @@ "MACHINE" : "qemuarm64", "step1" : { "SDKMACHINE" : "x86_64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" }, "step2" : { "SDKMACHINE" : "x86_64", "MACHINE" : "qemux86-64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-ptest-all core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-ptest-all core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-sato:do_testsdk" }, @@ -341,7 +341,7 @@ "BUILDINFO" : true, "step1" : { "SDKMACHINE" : "aarch64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" } }, @@ -385,7 +385,7 @@ }, "step2" : { "SDKMACHINE" : "aarch64", - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-sato:do_populate_sdk core-image-minimal:do_populate_sdk_ext core-image-sato:do_populate_sdk_ext", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-sato:do_testsdk core-image-minimal:do_testsdkext core-image-sato:do_testsdkext" } }, @@ -758,7 +758,7 @@ } }, "pkgman-non-rpm" : { - "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-minimal:do_populate_sdk", + "BBTARGETS" : "core-image-sato core-image-sato-sdk core-image-minimal core-image-minimal:do_populate_sdk", "SANITYTARGETS" : "core-image-minimal:do_testimage core-image-sato:do_testimage core-image-sato-sdk:do_testimage core-image-minimal:do_testsdk", "step1" : { "shortname" : "x86 ipk",