From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: 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 --- classes/cross.bbclass | 4 ++-- classes/native.bbclass | 19 ++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) (limited to 'classes') diff --git a/classes/cross.bbclass b/classes/cross.bbclass index cb49ef63e6..0f57fe5fd9 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -24,7 +24,7 @@ exec_prefix = "${prefix}" # 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 @@ -39,7 +39,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" 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" -- cgit v1.2.3