Skip to content

Commit

Permalink
packaging: fix arch-indep build on debian-sid
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mvo5 committed Jan 15, 2021
1 parent 334b969 commit 0575d37
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions packaging/debian-sid/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions tests/nightly/sbuild/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ priority: 500

environment:
BUILD_MODE/normal: normal
BUILD_MODE/any: any
BUILD_MODE/all: all

systems: [debian-sid-*]

Expand All @@ -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"
Expand Down

0 comments on commit 0575d37

Please sign in to comment.