5 files changed, 15 insertions, 1 deletions
diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
new file mode 100644
index 0000000000..05850a872e
--- /dev/null
+++ b/packages/bluez/bluez-utils-nodbus_2.24.bb
@@ -0,0 +1,5 @@
+include bluez-utils.inc
+
+PR = "r0"
+
+EXTRA_OECONF += "--without-dbus"
diff --git a/packages/devio/devio-native.inc b/packages/devio/devio-native.inc
index 1ba886c1ee..49987e6f0a 100644
--- a/packages/devio/devio-native.inc
+++ b/packages/devio/devio-native.inc
@@ -1,4 +1,5 @@
 # Set the installation dir back to the default
 sbindir = "${exec_prefix}/sbin"
+bindir = "${exec_prefix}/bin"
 
 inherit native
diff --git a/packages/devio/devio-native_1.2.bb b/packages/devio/devio-native_1.2.bb
new file mode 100644
index 0000000000..34d931be9d
--- /dev/null
+++ b/packages/devio/devio-native_1.2.bb
@@ -0,0 +1,3 @@
+# This package builds the devio program for the build architecture
+include devio.inc
+include devio-native.inc
diff --git a/packages/devio/devio.inc b/packages/devio/devio.inc
index fadbd4892d..9d346dc43a 100644
--- a/packages/devio/devio.inc
+++ b/packages/devio/devio.inc
@@ -15,6 +15,10 @@ PACKAGES = "${PN}"
 
 # Set the install dir to /sbin, not /usr/sbin, because devio is used
 # during bootstrap (we want it to be posible to mount /usr separately)
-sbindir = "/sbin"
+sbindir = "${base_sbindir}"
+
+# From 1.2 devio installs to bindir, not sbindir, so set that to /bin
+# for the same reason
+bindir = "${base_bindir}"
 
 inherit autotools
diff --git a/packages/devio/devio_1.2.bb b/packages/devio/devio_1.2.bb
new file mode 100644
index 0000000000..38021fa141
--- /dev/null
+++ b/packages/devio/devio_1.2.bb
@@ -0,0 +1 @@
+include devio.inc