Merge branch 'master' into thumb

Conflicts:
	debian/changelog
	debian/rules

diff --git a/debian/changelog b/debian/changelog
index 3ff7403..78760a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ busybox-power (1.21.0power1) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Tue, 22 Jan 2013 12:45:45 +0100
 
+busybox-power (1.20.2power5+thumb0) unstable; urgency=low
+
+  * Merged master
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Fri, 30 Nov 2012 19:58:28 +0100
+
 busybox-power (1.20.2power5) unstable; urgency=low
 
   * Introduce Diablo support (by Teemu Ikonen)
@@ -16,6 +22,12 @@ busybox-power (1.20.2power5) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 28 Nov 2012 22:30:14 +0100
 
+busybox-power (1.20.2power4+thumb0) unstable; urgency=low
+
+  * Merged master
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Thu, 25 Oct 2012 21:11:25 +0200
+
 busybox-power (1.20.2power4) unstable; urgency=low
 
   * Divert /bin/busybox during installation
@@ -29,6 +41,12 @@ busybox-power (1.20.2power4) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 24 Oct 2012 17:55:14 +0200
 
+busybox-power (1.20.2power3+thumb0) unstable; urgency=low
+
+  * Merged master
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 13 Oct 2012 16:24:27 +0200
+
 busybox-power (1.20.2power3) unstable; urgency=low
 
   * Exit shell cleanly upon receiving SIGHUP
@@ -43,6 +61,12 @@ busybox-power (1.20.2power2) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 19 Sep 2012 23:39:03 +0200
 
+busybox-power (1.20.2power1-thumb0) unstable; urgency=low
+
+  * Enable thumb compilation
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 25 Aug 2012 14:54:55 +0200
+
 busybox-power (1.20.2power1) unstable; urgency=low
 
   * New upstream release (BusyBox 1.20.2)

diff --git a/debian/config/config.busybox b/debian/config/config.busybox
index f529386..e954974 100644 (file)
--- a/debian/config/config.busybox
+++ b/debian/config/config.busybox
@@ -64,7 +64,7 @@ CONFIG_FEATURE_HAVE_RPC=y
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_CFLAGS="-fgnu89-inline"
 CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 

diff --git a/debian/control b/debian/control
index 3d349c5..64eade2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.3
 
 Package: busybox-power
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kernel-feature-errata-430973-workaround
 XB-Maemo-Display-Name: Enhanced BusyBox shell
 Description: Tiny utilities for small and embedded systems - enhanced package
  BusyBox combines tiny versions of many common UNIX utilities into a

diff --git a/debian/rules b/debian/rules
index 3d36226..c68e792 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,9 @@ STAMPS_DIR = debian/stamps
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        CONFIG_DEBUG = y
 endif
-ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+#ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
        THUMB := -mthumb
-endif
+#endif
 
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
     PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \