Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.debian.kernel > #61601
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Newsgroups | linux.debian.kernel |
| Subject | [PATCH 01/12] builddeb: Skip architecture detection when KBUILD_DEBARCH is set |
| Date | 2018-07-26 12:30 +0200 |
| Message-ID | <wfLGV-1sT-1@gated-at.bofh.it> (permalink) |
| References | <wfLxg-1pq-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
[Multipart message — attachments visible in raw view] - view raw
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: Ben Hutchings <ben@decadent.org.uk>
---
scripts/package/mkdebian | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 985d72d1ab34..434f0b4d5231 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -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
Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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