Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #61604

[PATCH 12/12] builddeb: Add automatic support for sh{3,4}{,eb} architectures

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Different generations of the SH architecture are not very compatible,
so there are/were separate Debian ports for SH3 and SH4.

Move the fallback out of the "case" statement, so that it will also be
used in case we find some SH architecture version without a known
mapping.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/package/mkdebian | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 3ef2fd0c5086..663a7f343b42 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -63,7 +63,15 @@ set_debarch() {
 		;;
 	openrisc)
 		debarch=or1k ;;
-	*)
+	sh)
+		if is_enabled CPU_SH3; then
+			debarch=sh3$(if_enabled_echo CPU_BIG_ENDIAN eb)
+		elif is_enabled CPU_SH4; then
+			debarch=sh4$(if_enabled_echo CPU_BIG_ENDIAN eb)
+		fi
+		;;
+	esac
+	if [ -z "$debarch" ]; then
 		debarch=$(dpkg-architecture -qDEB_HOST_ARCH)
 		echo "" >&2
 		echo "** ** **  WARNING  ** ** **" >&2
@@ -73,8 +81,7 @@ set_debarch() {
 		echo "Falling back to the current host architecture ($debarch)." >&2
 		echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
 		echo "" >&2
-		;;
-	esac
+	fi
 }
 
 # Some variables and settings used throughout the script

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] Update architecture detection Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:20 +0200
  [PATCH 01/12] builddeb: Skip architecture detection when  KBUILD_DEBARCH is set Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 05/12] builddeb: Add automatic support for ppc64 and  powerpcspe architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 04/12] builddeb: Introduce functions to simplify kconfig  tests in set_debarch Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 12/12] builddeb: Add automatic support for sh{3,4}{,eb}  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 02/12] builddeb: Change architecture detection fallback to  use dpkg-architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 11/12] builddeb: Add automatic support for riscv*  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 10/12] builddeb: Add automatic support for m68k architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 06/12] builddeb: Add automatic support for mips64el  architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 08/12] builddeb: Add automatic support for sparc64  architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 07/12] builddeb: Add automatic support for mips{,64}r6{,el}  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 09/12] builddeb: Add automatic support for or1k architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 03/12] builddeb: Drop check for 32-bit s390 Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  Re: [PATCH 00/12] Update architecture detection Masahiro Yamada <yamada.masahiro@socionext.com> - 2018-08-02 01:50 +0200

csiph-web