Merge pull request canonical#9843 from mvo5/debian-sbuild-fix

packaging: fix arch-indep build on debian-sid
kbroulik · Jan 19, 2021 · 7467a49 · 7467a49
2 parents fe7a22b + 0575d37
commit 7467a49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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"