[ping] builddeb: fix cross-building to arm64 producing host-arch debs
diff mbox

Message ID 20161124012703.15704-1-kilobyte@angband.pl
State New
Headers show

Commit Message

Adam Borowski Nov. 24, 2016, 1:27 a.m. UTC
Both Debian and kernel archs are "arm64" but UTS_MACHINE and gcc say
"aarch64".  Recognizing just the latter should be enough but let's
accept both in case something regresses again or an user sets
UTS_MACHINE=arm64.

Regressed in cfa88c7: arm64: Set UTS_MACHINE in the Makefile.

Signed-off-by: Adam Borowski <kilobyte@angband.pl>
Acked-by: Riku Voipio <riku.voipio@linaro.org>
---
As 4.9 is not only a LTS, but also the kernel Debian stretch will use,
fixing this regression would be really nice.

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

Comments

Riku Voipio Nov. 25, 2016, 11:36 a.m. UTC | #1
On 24 November 2016 at 03:27, Adam Borowski <kilobyte@angband.pl> wrote:
> Both Debian and kernel archs are "arm64" but UTS_MACHINE and gcc say
> "aarch64".  Recognizing just the latter should be enough but let's
> accept both in case something regresses again or an user sets
> UTS_MACHINE=arm64.
>
> Regressed in cfa88c7: arm64: Set UTS_MACHINE in the Makefile.
>
> Signed-off-by: Adam Borowski <kilobyte@angband.pl>
> Acked-by: Riku Voipio <riku.voipio@linaro.org>
> ---
> As 4.9 is not only a LTS, but also the kernel Debian stretch will use,
> fixing this regression would be really nice.

Yes, this would be really appreciated.

Riku

>  scripts/package/builddeb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 8ea9fd2..3c575cd0 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -51,7 +51,7 @@ set_debarch() {
>                 debarch=hppa ;;
>         mips*)
>                 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
> -       arm64)
> +       aarch64|arm64)
>                 debarch=arm64 ;;
>         arm*)
>                 if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
> --
> 2.10.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michal Marek Nov. 25, 2016, 2:44 p.m. UTC | #2
On Fri, Nov 25, 2016 at 01:36:21PM +0200, Riku Voipio wrote:
> On 24 November 2016 at 03:27, Adam Borowski <kilobyte@angband.pl> wrote:
> > Both Debian and kernel archs are "arm64" but UTS_MACHINE and gcc say
> > "aarch64".  Recognizing just the latter should be enough but let's
> > accept both in case something regresses again or an user sets
> > UTS_MACHINE=arm64.
> >
> > Regressed in cfa88c7: arm64: Set UTS_MACHINE in the Makefile.
> >
> > Signed-off-by: Adam Borowski <kilobyte@angband.pl>
> > Acked-by: Riku Voipio <riku.voipio@linaro.org>
> > ---
> > As 4.9 is not only a LTS, but also the kernel Debian stretch will use,
> > fixing this regression would be really nice.
> 
> Yes, this would be really appreciated.

This is in kbuild.git#rc-fixes now.

Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2..3c575cd0 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -51,7 +51,7 @@  set_debarch() {
 		debarch=hppa ;;
 	mips*)
 		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
-	arm64)
+	aarch64|arm64)
 		debarch=arm64 ;;
 	arm*)
 		if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then