Small fixes to package build rules and helper script

diff --git a/debian/rules b/debian/rules
index a3196affc3f4695b2c104bf5443129d8b37a5887..f5c5924cbce6c81d45bc0a12c70adc08fdcf9969 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,13 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS+ = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
-       CFLAGS += -O2 -pipe -mcpu=arm926ej-s
+       CFLAGS += -O2 -pipe 
+# -mcpu=arm926ej-s
 endif
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))

diff --git a/dpkg-build.sh b/dpkg-build.sh
index ef4f7b281fe485ed544716102ab86634724ffd2b..4669d43175222bd94dbf88d6680a9506a9b02994 100755 (executable)
--- a/dpkg-build.sh
+++ b/dpkg-build.sh
@@ -28,11 +28,15 @@ case "$1" in
     OS2006)
     CFLAGS="-O2 -pipe -mcpu=arm926ej-s"
     VERSION_SUFFIX=-1
-    DBP_EXTRA=
+    DBP_EXTRA=-B
+    ;;
        *)
        echo "Give one of OS2006, OS2007 or OS2008 as parameter"
+    ;;
 esac
 
+export CFLAGS
+
 head -n 1 $CHANGELOG | sed "s/)/$VERSION_SUFFIX)/" > $CHANGELOG.new
 awk 'NR>1 {print}' $CHANGELOG >> $CHANGELOG.new
 mv $CHANGELOG $CHANGELOG.old