[PATCH v2 2/2] deb-pkg: Add automatic support for s390x architecture

[PATCH v2 2/2] deb-pkg: Add automatic support for s390x architecture

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]

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 <zlinuxman@wowway.com>
References: https://bugs.debian.org/750925
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
v2: - add bug reference, since Stephen also found this
    - add '|| true', as in recent fixes for other architectures

 scripts/package/builddeb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 6756ed6..8db6dbd 100644
--- 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*)

-- 
Ben Hutchings
One of the nice things about standards is that there are so many of them.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH v2 2/2] deb-pkg: Add automatic support for s390x architecture

[Michal Marek]

On 2014-06-09 02:24, Ben Hutchings wrote:
> 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 <zlinuxman@wowway.com>
> References: https://bugs.debian.org/750925
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Applied to kbuild.git#misc, thanks.

Michal