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

Groups > linux.debian.kernel > #61603

[PATCH 04/12] builddeb: Introduce functions to simplify kconfig tests in set_debarch

Show all headers | View raw

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

We now have many repetitive greps over the kernel config.  Refactor
them into functions.

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

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index f4449b575379..ada3c73d1493 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -6,6 +6,18 @@
 
 set -e
 
+is_enabled() {
+	grep -q "^CONFIG_$1=y" $KCONFIG_CONFIG
+}
+
+if_enabled_echo() {
+	if is_enabled "$1"; then
+		echo -n "$2"
+	elif [ $# -ge 3 ]; then
+		echo -n "$3"
+	fi
+}
+
 set_debarch() {
 	if [ -n "$KBUILD_DEBARCH" ] ; then
 		debarch="$KBUILD_DEBARCH"
@@ -23,22 +35,18 @@ set_debarch() {
 	s390*)
 		debarch=s390x ;;
 	ppc*)
-		debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
+		debarch=$(if_enabled_echo CPU_LITTLE_ENDIAN ppc64el powerpc) ;;
 	parisc*)
 		debarch=hppa ;;
 	mips*)
-		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
+		debarch=mips$(if_enabled_echo CPU_LITTLE_ENDIAN el) ;;
 	aarch64|arm64)
 		debarch=arm64 ;;
 	arm*)
-		if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
-		    if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
-			debarch=armhf
-		    else
-			debarch=armel
-		    fi
+		if is_enabled AEABI; then
+			debarch=arm$(if_enabled_echo VFP hf el)
 		else
-		    debarch=arm
+			debarch=arm
 		fi
 		;;
 	*)

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