diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
| commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
| tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /classes/native.bbclass | |
| parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.
2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting.
2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.
2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded
2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references. As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.
2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.
BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg
Diffstat (limited to 'classes/native.bbclass')
| -rw-r--r-- | classes/native.bbclass | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass index edb6d0831c..32bd9dbae2 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -23,21 +23,6 @@ CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" -bindir = "${exec_prefix}/bin" -sbindir = "${exec_prefix}/bin" -libexecdir = "${exec_prefix}/libexec" -datadir = "${exec_prefix}/share" -sysconfdir = "${prefix}/etc" -sharedstatedir = "${prefix}/com" -localstatedir = "${prefix}/var" -libdir = "${exec_prefix}/lib" -includedir = "${exec_prefix}/include" -oldincludedir = "${exec_prefix}/include" -infodir = "${prefix}/info" -mandir = "${prefix}/man" -docdir = "${prefix}/doc" -servicedir = "${prefix}/srv" - # Path prefixes base_prefix = "${exec_prefix}" prefix = "${STAGING_DIR}" @@ -45,7 +30,7 @@ exec_prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}" # Base paths base_bindir = "${base_prefix}/bin" -base_sbindir = "${base_prefix}/sbin" +base_sbindir = "${base_prefix}/bin" base_libdir = "${base_prefix}/lib" # Architecture independent paths @@ -59,7 +44,7 @@ servicedir = "${prefix}/srv" # Architecture dependent paths bindir = "${exec_prefix}/bin" -sbindir = "${exec_prefix}/sbin" +sbindir = "${exec_prefix}/bin" libexecdir = "${exec_prefix}/libexec" libdir = "${exec_prefix}/lib" includedir = "${exec_prefix}/include" |