diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /tests/guix-system.sh | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'tests/guix-system.sh')
| -rw-r--r-- | tests/guix-system.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index f76a5ce119..16c02e6e4c 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -342,6 +342,10 @@ for example in gnu/system/examples/*.tmpl; do # 'asus-c201.tmpl' uses 'linux-libre-arm-generic', which is an # ARM-only package. options="--system=armhf-linux";; + *raspberry*) + # The Raspberry Pi templates 'linux-libre-arm64-generic', which is + # an ARM-only package. + options="--system=aarch64-linux";; *vm-image*) # The VM image tries to build 'current-guix' as per 'guix pull'. # Skip it. @@ -354,6 +358,12 @@ for example in gnu/system/examples/*.tmpl; do guix system -n disk-image $options "$example" done +# Make sure the desktop image can be built on major architectures. +for system in x86_64-linux i686-linux aarch64-linux +do + guix system -n image -s "$system" gnu/system/examples/desktop.tmpl +done + # Verify that the images can be built. guix system -n vm gnu/system/examples/bare-bones.tmpl guix system -n image gnu/system/images/pinebook-pro.scm |