deb-pkg: Add automatic support for s390x architecture

The Debian s390x architecture has 64-bit userland whereas s390 has
32-bit userland.  A 64-bit kernel can be used with either.  Now that
Debian supports multiarch and officially supports s390x, it makes more
sense to assign a 64-bit kernel package to s390x.

Reported-by: Stephen Powell <[email protected]>
References: https://bugs.debian.org/750925
Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Michal Marek <[email protected]>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index ae7e607dc286a9c9bde343dfed95b8b16c4471cc..c8e04b33b0646199bce7d6ff6aba14f8b200b81b 100644 (file)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -35,7 +35,7 @@ create_package() {
        sparc*)
                debarch=sparc ;;
        s390*)
-               debarch=s390 ;;
+               debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
        ppc*)
                debarch=powerpc ;;
        parisc*)