From patchwork Wed Apr 26 19:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1774246 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=RVFQY4aF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q68Tf6vXNz23vF for ; Thu, 27 Apr 2023 05:44:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A017186368; Wed, 26 Apr 2023 21:44:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="RVFQY4aF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1D878636D; Wed, 26 Apr 2023 21:44:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1134.google.com (mail-yw1-x1134.google.com [IPv6:2607:f8b0:4864:20::1134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9A55686175 for ; Wed, 26 Apr 2023 21:44:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-54f945a7bddso89799857b3.0 for ; Wed, 26 Apr 2023 12:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1682538278; x=1685130278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4PaVHOFRoPukxaZmsobVYzQfc5LrFQFHTLDeQ23Rpu8=; b=RVFQY4aFb9eL0QjpaXQccsljDD/n/eKinDT/ixTfCTNEpNTz8yIvbCNdkyzRWihIHF Tdz3+q/M7H40RXO5L0XGxUxgsiUlZPfDOiNeJu3JLyQzziXY1u5GFRQz4oUyuXC6zCvw rvmoIwUkKqbWyiX6j4zGvdO0TwgDrlclHn548= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682538278; x=1685130278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4PaVHOFRoPukxaZmsobVYzQfc5LrFQFHTLDeQ23Rpu8=; b=B3yUOnIZ8qh21r5fSx4d9V6aLHPInUwPf0309baTkdF5U5CxB8LH1mbizPZULpvzUb IsTQIMIoePDGkK65jEqw9eD+34X18h6DIGRDVjKwUewsqL2MmVQdxmvko24RnfHLqM00 grcKQzhiIhtCESbYwXDSP2Ohb94JK0UQ2qnsdTYplz/qFveoOyHs4V/eexOMyPWTdL6b E1MIhWMGd+9eNC1Tu7R4WugkDI2jr929YayYi3p4gN+BxApcIsjDhIhhBU3T1Em55KwR GeERNO8FBDaOgR1NW3zNczLkemu60zloRTzcdee0Uvmq+rl1OLQqXg7WWkFcF37Bja7v BENA== X-Gm-Message-State: AAQBX9dCaJGwB6w6oRS4pkWBqsdgD99OAo+d4Ek5M+0CYicKq1ODxerN 5WOV1+TKAp5mhj0kpKN729e9Ivx2Shd/ndx0taPFuw== X-Google-Smtp-Source: AKy350aYr0S0Z6RAquB6M0gURUjYVVbgvKD0q/xUfxsZzCsSwzHSI9vQwwxVyAVWqa0+/ky+J4lvBA== X-Received: by 2002:a0d:e614:0:b0:549:29db:7421 with SMTP id p20-20020a0de614000000b0054929db7421mr12999815ywe.9.1682538278253; Wed, 26 Apr 2023 12:44:38 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-b8bf-e376-67d0-fd6b.res6.spectrum.com. [2603:6081:7b00:6400:b8bf:e376:67d0:fd6b]) by smtp.gmail.com with ESMTPSA id c17-20020a258811000000b00b923b2935d9sm4159326ybl.20.2023.04.26.12.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 12:44:37 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass , Neha Malcom Francis Subject: [PATCH 1/2] buildman: Create a requirements.txt file Date: Wed, 26 Apr 2023 15:44:35 -0400 Message-Id: <20230426194436.1785433-1-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230421123203.1315330-2-n-francis@ti.com> References: <20230421123203.1315330-2-n-francis@ti.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean At this point, buildman requires a few different modules and so we need a requirements.txt to track what modules are needed. Cc: Simon Glass Cc: Neha Malcom Francis Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- tools/buildman/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tools/buildman/requirements.txt diff --git a/tools/buildman/requirements.txt b/tools/buildman/requirements.txt new file mode 100644 index 000000000000..a1efcb9d4b44 --- /dev/null +++ b/tools/buildman/requirements.txt @@ -0,0 +1,2 @@ +jsonschema==4.17.3 +pyyaml==6.0 From patchwork Wed Apr 26 19:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1774247 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=hq4P/6ZH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q68Tp0BzHz23vF for ; Thu, 27 Apr 2023 05:45:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 86D9986394; Wed, 26 Apr 2023 21:44:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="hq4P/6ZH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C14886175; Wed, 26 Apr 2023 21:44:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4A8258636A for ; Wed, 26 Apr 2023 21:44:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-b95fb433f59so13452545276.0 for ; Wed, 26 Apr 2023 12:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1682538279; x=1685130279; 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=o1u8LEBALznUtBTHQSiwLFXMjoTWtW4HqIJUgS1LDYI=; b=hq4P/6ZHy+IKJUA3JS4zID/bgULVtq7wvuMY400BvgWRqJcy+MsO7Z3ECmWD6DHPhv ECwlF86t9kl83m4045FyHL5926zeOYKBoQaO28pvsYRLfE0cTKNi8jlIyjmZ+kgqLI9k O6yU9OfHVLbFcPXWPrmBm9dQwNgN6aOoxQDWE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682538279; x=1685130279; 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=o1u8LEBALznUtBTHQSiwLFXMjoTWtW4HqIJUgS1LDYI=; b=WQKorJZ7rvvs2AhcQEgc/uw+wE2ddlpKZ3nNQ1LuvydVi8fC3tmnjipGKsoPaE4PEG CLRaoJzcQU5kuMqQLT/gCs6DutZzAO8xtDTEOCjVUrcexHd6JXvi5Ajp7OO3eWEN7IjS hGxt5u63PcDxFeK+2wzken5WL4lxxHpcgpIhnRBglDlHTQIL4LdoxQpkR6xXm64jSjfO jxk/kiPdaEHYdyQZoBTRhE7v2dOWfa5yQ0ZRow0nYLdy8e1Df42nCVKHg6OPOBKAtT2z IooSaA0stTXD81M1Dyx0MBUChF6tGb/6Xb/MoN4O1ehqntEE/NS2lN3lK2zyGdGk1ytD q2RQ== X-Gm-Message-State: AC+VfDyZPayOHyXdfmqkfEPxswBNLUDU+gmKC6ZLsDE3h9MFc8G/8n5i NFZiJDYEXcE9rOAoLJUe/HXx9H5yf2xo4yRpRf5/wQ== X-Google-Smtp-Source: ACHHUZ6fKMLymyOx95Io8/uZ7IqmqrR7eQ3aU65qOBWmWmlY255/IcX8eQwP/hx9TkxTPlGkjRxCFQ== X-Received: by 2002:a25:4aca:0:b0:b9a:29e5:1922 with SMTP id x193-20020a254aca000000b00b9a29e51922mr3366054yba.8.1682538278748; Wed, 26 Apr 2023 12:44:38 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-b8bf-e376-67d0-fd6b.res6.spectrum.com. [2603:6081:7b00:6400:b8bf:e376:67d0:fd6b]) by smtp.gmail.com with ESMTPSA id c17-20020a258811000000b00b923b2935d9sm4159326ybl.20.2023.04.26.12.44.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 12:44:38 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/2] CI: Make use of buildman requirements.txt Date: Wed, 26 Apr 2023 15:44:36 -0400 Message-Id: <20230426194436.1785433-2-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426194436.1785433-1-trini@konsulko.com> References: <20230421123203.1315330-2-n-francis@ti.com> <20230426194436.1785433-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Now that buildman has a requirements.txt file we need to make use of it. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .azure-pipelines.yml | 3 +++ .gitlab-ci.yml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 76ffdeebd667..22d634f4aa7a 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -162,6 +162,7 @@ stages: virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate pip install -r test/py/requirements.txt + pip install -r tools/buildman/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} @@ -209,6 +210,7 @@ stages: git config --global --add safe.directory $(work_dir) export USER=azure pip install -r test/py/requirements.txt + pip install -r tools/buildman/requirements.txt pip install asteval pylint==2.12.2 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc @@ -404,6 +406,7 @@ stages: if [ -n "${BUILD_ENV}" ]; then export ${BUILD_ENV}; fi + pip install -r tools/buildman/requirements.txt tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} cp ~/grub_x86.efi ${UBOOT_TRAVIS_BUILD_DIR}/ cp ~/grub_x64.efi ${UBOOT_TRAVIS_BUILD_DIR}/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b193fee98f86..22ed61be642a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,6 +97,7 @@ build all 32bit ARM platforms: script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; + pip install -r tools/buildman/requirements.txt; ./tools/buildman/buildman -o /tmp -PEWM arm -x aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; @@ -110,6 +111,7 @@ build all 64bit ARM platforms: - . /tmp/venv/bin/activate - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; + pip install -r tools/buildman/requirements.txt; ./tools/buildman/buildman -o /tmp -PEWM aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; @@ -208,6 +210,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt; + pip install -r tools/buildman/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; @@ -240,6 +243,7 @@ Run pylint: script: - git config --global --add safe.directory "${CI_PROJECT_DIR}" - pip install -r test/py/requirements.txt + - pip install -r tools/buildman/requirements.txt - pip install asteval pylint==2.12.2 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc