remove patch

This commit is contained in:
denix 2023-02-02 23:38:30 +01:00
parent 88acb88a0c
commit 6d5d3a4c78
2 changed files with 9 additions and 73 deletions

View File

@ -1,5 +1,3 @@
image: $CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314
stages:
- fetch-assets
- generate-gitlab-ci
@ -18,24 +16,14 @@ fetch-assets:
- git submodule update --remote --merge
- ./scripts/br-patches.sh
generate-gitlab-ci-yml:
stage: generate-gitlab-ci
dependencies:
- fetch-assets
script: ./buildroot/support/scripts/generate-gitlab-ci-yml ./buildroot/support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml
artifacts:
when: always
paths:
- generated-gitlab-ci.yml
- br-test-pkg/*/.config
- br-test-pkg/*/missing.config
buildroot-pipeline:
stage: build
trigger:
include:
- artifact: generated-gitlab-ci.yml
job: generate-gitlab-ci-yml
strategy: depend
variables:
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
dependencies:
- fetch-assets
artifacts:
when: on_success
paths:
- release
script:
- make clean
- make rpi3_64-nogui

View File

@ -1,52 +0,0 @@
diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in
index 47e72c3213..a18476e0d0 100644
--- a/support/misc/gitlab-ci.yml.in
+++ b/support/misc/gitlab-ci.yml.in
@@ -1,13 +1,13 @@
.check-check-package_base:
script:
- - python3 -m pytest -v utils/checkpackagelib/
+ - python3 -m pytest -v ./buildroot/utils/checkpackagelib/
.check-DEVELOPERS_base:
# get-developers should print just "No action specified"; if it prints
# anything else, it's a parse error.
# The initial ! is removed by YAML so we need to quote it.
script:
- - "! utils/get-developers | grep -v 'No action specified'"
+ - "! ./buildroot/utils/get-developers | grep -v 'No action specified'"
.check-flake8_base:
script:
@@ -23,7 +23,7 @@
script:
- echo "Configure Buildroot for ${DEFCONFIG_NAME}"
- make ${DEFCONFIG_NAME}
- - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME}
+ - ./buildroot/support/scripts/check-dotconfig.py .config ./buildroot/configs/${DEFCONFIG_NAME}
artifacts:
when: on_failure
expire_in: 2 weeks
@@ -45,11 +45,11 @@
script:
- echo "Configure Buildroot for ${DEFCONFIG_NAME}"
- make ${DEFCONFIG_NAME}
- - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME}
+ - ./buildroot/support/scripts/check-dotconfig.py .config ./buildroot/configs/${DEFCONFIG_NAME}
- echo 'Build buildroot'
- *run_make
- |
- ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || {
+ ./buildroot/support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || {
echo 'Failed runtime test last output'
tail -200 runtime-test.log
exit 1
@@ -75,7 +75,7 @@
# elastic runners.
script:
- echo "Starting runtime test ${TEST_CASE_NAME}"
- - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME}
+ - ./buildroot/support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME}
artifacts:
when: always
expire_in: 2 weeks