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

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

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 876 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.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/package/builddeb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index e14c56e..25c5abd 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) ;;
 	ppc*)
 		debarch=powerpc ;;
 	parisc*)

-- 
Ben Hutchings
Who are all these weirdos? - David Bowie, reading IRC for the first time

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

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

[maximilian attems]

On Sun, Oct 06, 2013 at 06:05:14PM +0100, 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.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: maximilian attems <max@stro.at>
> ---
>  scripts/package/builddeb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index e14c56e..25c5abd 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) ;;
>  	ppc*)
>  		debarch=powerpc ;;
>  	parisc*)
> 
> -- 
> Ben Hutchings
> Who are all these weirdos? - David Bowie, reading IRC for the first time

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

[Michal Marek]

On Mon, Oct 07, 2013 at 03:38:35PM +0200, maximilian attems wrote:
> On Sun, Oct 06, 2013 at 06:05:14PM +0100, 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.
> > 
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> Acked-by: maximilian attems <max@stro.at>

Added to kbuild.git#misc, thanks.

Michal