diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-01-16 22:15:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-16 22:15:59 +0000 |
| commit | 47252fc24cbfd80630f5a768bd5ac960b47daace (patch) | |
| tree | 08888fb2dee051fb31fe6206f2bacc2adf7ff3b9 | |
| parent | f613f68d04446adc7a6d70cf0fe40a87829c9b70 (diff) | |
| parent | 18e012cd023b2ef139806a58bf67110b9c4f1abb (diff) | |
merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
and ad95dcf752605087d27c256e46709c87817b0ff0
| -rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.24.bb | 5 | ||||
| -rw-r--r-- | packages/devio/devio-native.inc | 1 | ||||
| -rw-r--r-- | packages/devio/devio-native_1.2.bb | 3 | ||||
| -rw-r--r-- | packages/devio/devio.inc | 6 | ||||
| -rw-r--r-- | packages/devio/devio_1.2.bb | 1 |
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 |