From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Dec 2004 22:05:47 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw --- classes/native.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/native.bbclass (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 5dadbaf0cdcd910bab780161eb56aef547bd6a64 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 11 Feb 2005 01:07:28 +0000 Subject: Path variable updates: * add base_prefix, base_bindir, base_libdir, and base_sbindir, for paths that are always rooted at / (for things like /sbin/ldconfig). * Rearrange the path bits in bitbake.conf to be a bit more comprehensible. * Override more path variables in cross.bbclass and native.bbclass, so that they can safely be overridden by the user. BKrev: 420c0550HAHmBzqBNAmgZogIut9Srg --- classes/native.bbclass | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index e69de29bb2..edb6d0831c 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -0,0 +1,80 @@ +inherit base + +# Native packages are built indirectly via dependency, +# no need for them to be a direct target of 'world' +EXCLUDE_FROM_WORLD = "1" + +PACKAGES = "" + +TARGET_ARCH = "${BUILD_ARCH}" +TARGET_OS = "${BUILD_OS}" +TARGET_VENDOR = "${BUILD_VENDOR}" +TARGET_PREFIX = "${BUILD_PREFIX}" +TARGET_CC_ARCH = "${BUILD_CC_ARCH}" + +HOST_ARCH = "${BUILD_ARCH}" +HOST_OS = "${BUILD_OS}" +HOST_VENDOR = "${BUILD_VENDOR}" +HOST_PREFIX = "${BUILD_PREFIX}" +HOST_CC_ARCH = "${BUILD_CC_ARCH}" + +CPPFLAGS = "${BUILD_CPPFLAGS}" +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}" +exec_prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}" + +# Base paths +base_bindir = "${base_prefix}/bin" +base_sbindir = "${base_prefix}/sbin" +base_libdir = "${base_prefix}/lib" + +# Architecture independent paths +sysconfdir = "${prefix}/etc" +sharedstatedir = "${prefix}/com" +localstatedir = "${prefix}/var" +infodir = "${prefix}/info" +mandir = "${prefix}/man" +docdir = "${prefix}/doc" +servicedir = "${prefix}/srv" + +# Architecture dependent paths +bindir = "${exec_prefix}/bin" +sbindir = "${exec_prefix}/sbin" +libexecdir = "${exec_prefix}/libexec" +libdir = "${exec_prefix}/lib" +includedir = "${exec_prefix}/include" +oldincludedir = "${exec_prefix}/include" + +# Datadir is made arch depenedent here, primarily +# for autoconf macros, and other things that +# may be manipulated to handle crosscompilation +# issues. +datadir = "${exec_prefix}/share" + +do_stage () { + oe_runmake install +} + +do_install () { + true +} -- cgit v1.2.3 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/native.bbclass | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'classes/native.bbclass') 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 From 58b704b108847c779bf8fef38bd523183207c1ae Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 24 Feb 2005 00:40:24 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 18:20:11-06:00 ti.com!kergoth Add gnupg 1.4.0, consolidate common metadata into gnupg.inc, include some of the gnupg doc files in ${docdir}/${PN}/. Build 1.4.0 with readline support. Need to revisit what gnupg features we are compiling in, and perhaps disable some things to shrink the binary, and/or use the "minimal" configure option. 2005/02/23 18:16:53-06:00 ti.com!kergoth Path adjustments in cross and native bbclasses per the previous cset. 2005/02/23 18:14:30-06:00 ti.com!kergoth Fix infodir, mandir, and docdir variables to be relative to datadir, not prefix, and fix FILES_${PN}-doc to reference docdir rather than datadir/doc. BKrev: 421d2278QZWskeJqmJFXCyPjQutiuw --- classes/native.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index 32bd9dbae2..3391694838 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -37,9 +37,9 @@ base_libdir = "${base_prefix}/lib" sysconfdir = "${prefix}/etc" sharedstatedir = "${prefix}/com" localstatedir = "${prefix}/var" -infodir = "${prefix}/info" -mandir = "${prefix}/man" -docdir = "${prefix}/doc" +infodir = "${datadir}/info" +mandir = "${datadir}/man" +docdir = "${datadir}/doc" servicedir = "${prefix}/srv" # Architecture dependent paths -- cgit v1.2.3 From cc66d34e4a411ce7e105df2ecb3d95265157f267 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 Aug 2005 22:40:46 +0000 Subject: autotools.bbclass: add INHIBIT_AUTO_STAGE_INCLUDES native.bbclass: add INHIBIT_NATIVE_STAGE_INSTALL --- classes/native.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index 3391694838..955a8ae646 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -50,14 +50,17 @@ libdir = "${exec_prefix}/lib" includedir = "${exec_prefix}/include" oldincludedir = "${exec_prefix}/include" -# Datadir is made arch depenedent here, primarily +# Datadir is made arch dependent here, primarily # for autoconf macros, and other things that # may be manipulated to handle crosscompilation # issues. datadir = "${exec_prefix}/share" do_stage () { - oe_runmake install + if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] + then + oe_runmake install + fi } do_install () { -- cgit v1.2.3