refine strategy to spot ip address, keep on calling guest_ipv4

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index ad95581..849530d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ PLANETLAB_RELEASE = 5.2
 # Default values
 #
 # minimal compat with macos, just so this does not complain
-HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
+HOSTARCH := $(shell arch)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
 DISTRONAME := $(shell ./getdistroname.sh)
@@ -348,9 +348,7 @@ header.spec:
        echo "%global _source_filedigest_algorithm 1" >> $@
        echo "%global _source_payload       w9.gzdio" >> $@
        echo "%global _binary_payload       w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35 f37)"
        echo "%define debug_package %{nil}" >> $@
-endif
 
 ### make up spec file - extract module first
 define target_spec