diff options
16 files changed, 3 insertions, 373 deletions
@@ -1,40 +1,5 @@ -# meta-patchtest +# patchtest -This README file contains information on the contents of the -meta-patchtest layer. +This was replaced by https://git.yoctoproject.org/meta-patchtest/ please update your remote. -Please see the corresponding sections below for details. - -## Dependencies - -This layer depends on: - -- https://git.openembedded.org/bitbake -- https://git.openembedded.org/openembedded-core -- https://git.openembedded.org/meta-openembedded (meta-oe and meta-python) - -## Patches - -Please submit any patches against the patchtest layer to the -yocto@lists.yoctoproject.org list and cc: the maintainer: - -Maintainer: Trevor Gamblin <tgamblin@baylibre.com> - -## Adding the patchtest layer to your build - -In order to use this layer, you need to make the build system aware of -it. - -Assuming the patchtest layer exists at the top-level of your -yocto build tree, you can add it to the build system by adding the -location of the patchtest layer to bblayers.conf, along with any -other layers needed. e.g.: - - BBLAYERS ?= " \ - /path/to/yocto/meta \ - /path/to/yocto/meta-poky \ - /path/to/yocto/meta-yocto-bsp \ - /path/to/yocto/meta-patchtest \ - /path/to/yocto/meta-openembedded/meta-oe \ - /path/to/yocto/meta-openembedded/meta-python \ - " +git remote set-url origin https://git.yoctoproject.org/meta-patchtest diff --git a/meta-patchtest/COPYING.MIT b/meta-patchtest/COPYING.MIT deleted file mode 100644 index 89de354..0000000 --- a/meta-patchtest/COPYING.MIT +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/meta-patchtest/conf/layer.conf b/meta-patchtest/conf/layer.conf deleted file mode 100644 index 730380f..0000000 --- a/meta-patchtest/conf/layer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "patchtest" -BBFILE_PATTERN_patchtest = "^${LAYERDIR}/" -BBFILE_PRIORITY_patchtest = "6" diff --git a/meta-patchtest/recipes-core/images/core-image-patchtest.bb b/meta-patchtest/recipes-core/images/core-image-patchtest.bb deleted file mode 100644 index 535ad0b..0000000 --- a/meta-patchtest/recipes-core/images/core-image-patchtest.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "An image containing the packages required by patchtest" -DESCRIPTION = "An image containing the packages that patchtest needs, used by the former as guest machine to test oe-core patches" -HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/patchtest/" - -IMAGE_FSTYPES = "ext4" - -# include 500MB of extra space so it can store oe-core & bitbake -IMAGE_ROOTFS_EXTRA_SPACE = "512000" - -IMAGE_INSTALL = "\ - packagegroup-core-boot \ - packagegroup-self-hosted \ - packagegroup-patchtest-oe \ - " -inherit core-image - -fakeroot do_populate_patchtest_src() { - # set the correct LC_ALL, required for python3 based applications - echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/patchtest/.bashrc - echo "export LANG=en_US.utf8" >> ${IMAGE_ROOTFS}/home/patchtest/.bashrc - - # define patchtest runner, called from initscript - cat >> ${IMAGE_ROOTFS}/home/patchtest/.bashrc << EOF -function pt() { - local REPO=\$1 - local MBOX=\$2 - local SUITESTART=\$3 -TMPBUILD="\$(mktemp -d)" -cd \$REPO -source ./oe-init-build-env \$TMPBUILD -BRANCH="\$(patchtest-get-branch \$REPO \$MBOX | awk '{print \$NF}')" -echo "BB_NO_NETWORK = \"1\"" >> conf/local.conf -patchtest --patch \$MBOX --base-branch \$BRANCH --repodir \$REPO --testdir \$SUITESTART -rm -rf \$TMPBUILD - } -EOF - - # set path containing all patchtest and its scripts - echo "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/patchtest/share/patchtest:/home/patchtest/share/patchtest/scripts:$PATH\"" >> ${IMAGE_ROOTFS}/home/patchtest/.bashrc - - # configure git, required for patchtest - cat >> ${IMAGE_ROOTFS}/home/patchtest/.gitconfig << EOF -[user] - name = patchtest - email = patchtest@patchtest.com -EOF - -} - -IMAGE_PREPROCESS_COMMAND += "do_populate_patchtest_src; " diff --git a/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest/patchtest b/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest/patchtest deleted file mode 100755 index 8251175..0000000 --- a/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest/patchtest +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -x -### BEGIN INIT INFO -# Provides: patchtest -# Required-Start: $local_fs mountvirtfs -# Required-Stop: $local_fs -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: Execute patchtest and quits inmediately -# Description: Execute patchtest (the framework to test mboxes) -# taking as input those file mboxes located at -# $base/mboxes folder and results are stored into -# $base/results -### END INIT INFO - -test "$VERBOSE" != no && echo "Executing patchtest..." - -# Set patchtest home path -USER="patchtest" -HOME_USER="/home/patchtest" - -# MP is the share directory between host and guest -MP="$HOME_USER/share" -test ! -d "$MP" && mkdir "$MP" - -mount -t 9p -o trans=virtio test_mount "$MP" -oversion=9p2000.L,posixacl,cache=loose - -# Define directory pathnames base on MP -MBOXES="$MP/mboxes" -REPO="$MP/poky" -SUITESTART="$MP/poky/meta/lib/patchtest/tests" - -# make sure $MBOXES exists -mkdir -p $MBOXES - -# LOCAL_REPO is where patchtest will do its job which is outside MP -LOCAL_REPO="${HOME_USER}/poky" - -# Temporal workaround to avoid the "too many open files" error -sysctl -w fs.file-max=100000 - -if [ -d $REPO ]; then - # Make a local copy of REPO inside patchtest home - cp -a $REPO $HOME_USER - chown -R $USER $LOCAL_REPO - - # Clean local repo - ( cd $LOCAL_REPO; git reset --hard; git clean -fd; ) - - ( # test each mbox individually and pipe the output to - # $MBOX.testresult in the same directory - MBOXLIST=$(ls $MBOXES/*.patch) - if [ -z "$MBOXLIST" ]; then - echo "No patches to test. Exiting..." > /dev/console - else - for MBOX in $MBOXLIST; do - CMD="pt $LOCAL_REPO $MBOX $SUITESTART" - su -l -c "$CMD" $USER 2>&1 \ - | grep --no-filename '^Testing patch\|^PASS:\|^SKIP:\|^FAIL:' \ - | awk 'NR == 1; NR > 1 {print $0 | "sort -n"}' \ - | awk '/FAIL/ && !foundfail {print ""; foundfail=1} 1' \ - | awk '/PASS/ && !foundpass {print ""; foundpass=1} 1' \ - | awk '/SKIP/ && !foundskip {print ""; foundskip=1} 1' \ - | tee $MBOX.testresult - done - fi - ) -fi - -# Poweroff machine -init 0 - -: exit 0 diff --git a/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest_1.0.bb b/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest_1.0.bb deleted file mode 100644 index b81822f..0000000 --- a/meta-patchtest/recipes-core/initscripts-patchtest/initscripts-patchtest_1.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Patchtest-specific add-on for initscripts" -DESCRIPTION = "initscripts-patchtest provides a separate recipe for including the patchtest initscript and user without contaminating other images built with the meta-patchtest layer" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI = " file://patchtest" - -inherit useradd update-rc.d - -INITSCRIPT_NAME = "patchtest" -INITSCRIPT_PARAMS = "start 99 3 5 ." - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "-u 1200 -r -m -s /bin/sh patchtest" - -do_install() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/patchtest ${D}${sysconfdir}/init.d -} - - diff --git a/meta-patchtest/recipes-core/packagegroups/packagegroup-patchtest-oe.bb b/meta-patchtest/recipes-core/packagegroups/packagegroup-patchtest-oe.bb deleted file mode 100644 index b2472ef..0000000 --- a/meta-patchtest/recipes-core/packagegroups/packagegroup-patchtest-oe.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2016 Intel Corporation -# -SUMMARY = "Patchtest-oe package groups" -DESCRIPTION = "Packages required to run oe-core patchtest test cases" - -inherit packagegroup - -RDEPENDS:${PN} = "\ - initscripts-patchtest \ - python3-git-pw \ - python3-pyparsing \ - python3-unidiff \ - python3-pylint \ - " diff --git a/meta-patchtest/recipes-core/packagegroups/packagegroup-self-hosted.bbappend b/meta-patchtest/recipes-core/packagegroups/packagegroup-self-hosted.bbappend deleted file mode 100644 index e22948d..0000000 --- a/meta-patchtest/recipes-core/packagegroups/packagegroup-self-hosted.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -RDEPENDS:packagegroup-self-hosted-extended += "\ - openssh-scp \ - openssh-ssh \ - perl-misc \ -" diff --git a/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch b/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch deleted file mode 100644 index a7637a5..0000000 --- a/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 341e19dd69d847f84859e85cabff5846e7da24c4 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <tgamblin@baylibre.com> -Date: Mon, 15 May 2023 09:26:04 -0400 -Subject: [PATCH] pylint: remove plugin pickle test - -Upstream-Status: Inappropriate (oe-specific) - -Upstream uses an assertion in the removed test to state that the test -needs changing if the plugin loading succeeds. The same failure wasn't -seen when running the tests on the host with pytest, so disable it by -removing the test from the suite. - -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- - tests/test_check_parallel.py | 22 ---------------------- - 1 file changed, 22 deletions(-) - -diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py -index d56502eaf..34fec140f 100644 ---- a/tests/test_check_parallel.py -+++ b/tests/test_check_parallel.py -@@ -257,28 +257,6 @@ class TestCheckParallelFramework: - assert stats.statement == 18 - assert stats.warning == 0 - -- def test_linter_with_unpickleable_plugins_is_pickleable(self) -> None: -- """The linter needs to be pickle-able in order to be passed between workers""" -- linter = PyLinter(reporter=Reporter()) -- # We load an extension that we know is not pickle-safe -- linter.load_plugin_modules(["pylint.extensions.overlapping_exceptions"]) -- try: -- dill.dumps(linter) -- raise AssertionError( -- "Plugins loaded were pickle-safe! This test needs altering" -- ) -- except (KeyError, TypeError, PickleError, NotImplementedError): -- pass -- -- # And expect this call to make it pickle-able -- linter.load_plugin_configuration() -- try: -- dill.dumps(linter) -- except KeyError as exc: -- raise AssertionError( -- "Cannot pickle linter when using non-pickleable plugin" -- ) from exc -- - def test_worker_check_sequential_checker(self) -> None: - """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker.""" - linter = PyLinter(reporter=Reporter()) --- -2.40.1 - diff --git a/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch b/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch deleted file mode 100644 index 7950e72..0000000 --- a/meta-patchtest/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5c415a240189ac6730ba95de0bb5883dfb53609 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <tgamblin@baylibre.com> -Date: Mon, 1 May 2023 11:32:24 -0400 -Subject: [PATCH] pyproject.toml: Remove hard-coded dependencies - -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- -Upstream-Status: Pending - - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index bd542646b..2c0ed9485 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools~=62.6", "wheel~=0.37.1"] -+requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] --- -2.40.0 - diff --git a/meta-patchtest/recipes-devtools/python/python3-pylint/run-ptest b/meta-patchtest/recipes-devtools/python/python3-pylint/run-ptest deleted file mode 100644 index 7a5ceed..0000000 --- a/meta-patchtest/recipes-devtools/python/python3-pylint/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest --benchmark-disable -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-patchtest/recipes-devtools/python/python3-pylint_2.17.4.bb b/meta-patchtest/recipes-devtools/python/python3-pylint_2.17.4.bb deleted file mode 100644 index 96fce2e..0000000 --- a/meta-patchtest/recipes-devtools/python/python3-pylint_2.17.4.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY="Pylint is a Python source code analyzer" -HOMEPAGE= "http://www.pylint.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" - -SRC_URI += " \ - git://github.com/pylint-dev/pylint;branch=main;protocol=https \ - file://run-ptest \ - file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch \ - file://0001-pylint-remove-plugin-pickle-test.patch \ - " -SRCREV ?= "fc34a4b6abe56f3ac07ca15d846b1c1955545f85" - -inherit python_setuptools_build_meta ptest - -RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ - ${PYTHON_PN}-dill \ - ${PYTHON_PN}-isort \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-platformdirs \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-tomlkit \ - " - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-git \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-benchmark \ - ${PYTHON_PN}-pytest-runner \ - ${PYTHON_PN}-pytest-timeout \ - ${PYTHON_PN}-pytest-xdist \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-statistics \ - ${PYTHON_PN}-tomllib \ - ${PYTHON_PN}-typing-extensions \ - " - -S = "${WORKDIR}/git" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript -} diff --git a/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend deleted file mode 100644 index 4e5918b..0000000 --- a/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG:append:class-native = " virtfs" diff --git a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend deleted file mode 100644 index 4e5918b..0000000 --- a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG:append:class-native = " virtfs" diff --git a/meta-patchtest/recipes-kernel/linux/linux-yocto/virtio.cfg b/meta-patchtest/recipes-kernel/linux/linux-yocto/virtio.cfg deleted file mode 100644 index 848089b..0000000 --- a/meta-patchtest/recipes-kernel/linux/linux-yocto/virtio.cfg +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_NET_9P_DEBUG=y -CONFIG_9P_FS=y -CONFIG_9P_FS_POSIX_ACL=y
\ No newline at end of file diff --git a/meta-patchtest/recipes-kernel/linux/linux-yocto_6.%.bbappend b/meta-patchtest/recipes-kernel/linux/linux-yocto_6.%.bbappend deleted file mode 100644 index 3a69acb..0000000 --- a/meta-patchtest/recipes-kernel/linux/linux-yocto_6.%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://virtio.cfg" |