diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2021-01-15 18:34:51 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2021-01-15 20:36:23 +0100 |
| commit | 0575d37a90d5da0b14df19d47b6f9bb00380f348 (patch) | |
| tree | 44ea90c036e8b6e6ea64b4de22e44d838fc6f049 | |
| parent | 334b969a0c2a0f48fb57d2815a28e5acbb944a45 (diff) | |
packaging: fix arch-indep build on debian-siddebian-sbuild-fix
The clean of override_dh_install-indep was missing to remove ``` tmp/usr/bin/genasset ``` this is fixed now. The nightly sbuild test also needs to be tweaked to *only* build the arch:all packages to reproduce this bug.
| -rwxr-xr-x | packaging/debian-sid/rules | 2 | ||||
| -rw-r--r-- | tests/nightly/sbuild/task.yaml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packaging/debian-sid/rules b/packaging/debian-sid/rules index 15f0b208b3..cdf39ddb56 100755 --- a/packaging/debian-sid/rules +++ b/packaging/debian-sid/rules @@ -222,6 +222,8 @@ override_dh_install-indep: rm -f ${CURDIR}/debian/tmp/usr/bin/snappy # chrorder generator rm -f ${CURDIR}/debian/tmp/usr/bin/chrorder + # bootloader assets generator + rm -f ${CURDIR}/debian/tmp/usr/bin/genasset # docs generator rm -f ${CURDIR}/debian/tmp/usr/bin/docs diff --git a/tests/nightly/sbuild/task.yaml b/tests/nightly/sbuild/task.yaml index 6c2391ca7a..041eceebf9 100644 --- a/tests/nightly/sbuild/task.yaml +++ b/tests/nightly/sbuild/task.yaml @@ -5,7 +5,7 @@ priority: 500 environment: BUILD_MODE/normal: normal - BUILD_MODE/any: any + BUILD_MODE/all: all systems: [debian-sid-*] @@ -16,9 +16,9 @@ execute: | echo "Allow test user to run sbuild" sbuild-adduser test - BUILD_PARAM="--verbose --debug" - if [ "$BUILD_MODE" == "any" ]; then - BUILD_PARAM="$BUILD_PARAM --arch-any" + BUILD_PARAM="--verbose" + if [ "$BUILD_MODE" == "all" ]; then + BUILD_PARAM="$BUILD_PARAM --arch-all --no-arch-any" fi echo "Build mode: $BUILD_MODE" |