Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2abcc13 authored by Ben Hutchings's avatar Ben Hutchings Committed by Masahiro Yamada
Browse files

builddeb: Skip architecture detection when KBUILD_DEBARCH is set 



If KBUILD_DEBARCH is set then we will not use the result of
architecture detection, and we may also warn unnecessarily.
Move the check for KBUILD_DEBARCH further up to avoid this.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 43fee2b2

scripts/package/mkdebian

+6 −3
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ 
set -e



set_debarch() {

	if [ -n "$KBUILD_DEBARCH" ] ; then

		debarch="$KBUILD_DEBARCH"

		return

	fi



	# Attempt to find the correct Debian architecture

	case "$UTS_MACHINE" in

	i386|ia64|alpha)
@@ -46,10 +51,8 @@ set_debarch() { 
		echo "Falling back to using your current userspace instead!" >&2

		echo "Please add support for $UTS_MACHINE to ${0} ..." >&2

		echo "" >&2

		;;

	esac

	if [ -n "$KBUILD_DEBARCH" ] ; then

		debarch="$KBUILD_DEBARCH"

	fi

}



# Some variables and settings used throughout the script