diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-01-18 17:07:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 17:07:05 +0000 |
| commit | 2dc9ee48f37e5ccbf2b7220911c270baa7bcd170 (patch) | |
| tree | 013d47bb76421c75b2a7a01d281cbfc852b650de /packages/devio | |
| parent | f28138ea966f7852229736197c34b416f2ba450c (diff) | |
| parent | 8d60e06669abb89149ba60248ee6b72b6a274f04 (diff) | |
merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
and 72f8be28da1900bbf98ed7cc1fa244d3cd750692
Diffstat (limited to 'packages/devio')
| -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 |
4 files changed, 10 insertions, 1 deletions
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 |