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/cross.bbclass | 54 ++++++++++++++++++++++++++++++++++ classes/native.bbclass | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ conf/bitbake.conf | 29 ++++++++++++------ 3 files changed, 154 insertions(+), 9 deletions(-) diff --git a/classes/cross.bbclass b/classes/cross.bbclass index e69de29bb2..cb49ef63e6 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -0,0 +1,54 @@ +# Cross packages are built indirectly via dependency, +# no need for them to be a direct target of 'world' +EXCLUDE_FROM_WORLD = "1" + +PACKAGES = "" + +HOST_ARCH = "${BUILD_ARCH}" +HOST_VENDOR = "${BUILD_VENDOR}" +HOST_OS = "${BUILD_OS}" +HOST_PREFIX = "${BUILD_PREFIX}" +HOST_CC_ARCH = "${BUILD_CC_ARCH}" + +CPPFLAGS = "${BUILD_CPPFLAGS}" +CFLAGS = "${BUILD_CFLAGS}" +CXXFLAGS = "${BUILD_CFLAGS}" +LDFLAGS = "${BUILD_LDFLAGS}" + +# Overrides for paths + +# Path prefixes +base_prefix = "${exec_prefix}" +prefix = "${CROSS_DIR}" +exec_prefix = "${prefix}" + +# Base paths +base_bindir = "${base_prefix}/bin" +base_sbindir = "${base_prefix}/sbin" +base_libdir = "${base_prefix}/lib" + +# Architecture independent paths +datadir = "${prefix}/share" +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" + +do_stage () { + oe_runmake install +} + +do_install () { + : +} 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 +} diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 7c91245379..fc62c269ef 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -2,23 +2,34 @@ # Standard target filesystem paths. ################################################################## +# Path prefixes +export base_prefix = "" export prefix = "/usr" export exec_prefix = "${prefix}" -export bindir = "${exec_prefix}/bin" -export sbindir = "${exec_prefix}/sbin" -export libexecdir = "${exec_prefix}/libexec" + +# Base paths +export base_bindir = "${base_prefix}/bin" +export base_sbindir = "${base_prefix}/sbin" +export base_libdir = "${base_prefix}/lib" + +# Architecture independent paths export datadir = "${prefix}/share" export sysconfdir = "/etc" export sharedstatedir = "${prefix}/com" export localstatedir = "/var" -export libdir = "${exec_prefix}/lib" -export includedir = "${prefix}/include" -export oldincludedir = "/usr/include" -export infodir = "${datadir}/info" -export mandir = "${datadir}/man" -export docdir = "${datadir}/doc" +export infodir = "${prefix}/info" +export mandir = "${prefix}/man" +export docdir = "${prefix}/doc" export servicedir = "/srv" +# Architecture dependent paths +export bindir = "${exec_prefix}/bin" +export sbindir = "${exec_prefix}/sbin" +export libexecdir = "${exec_prefix}/libexec" +export libdir = "${exec_prefix}/lib" +export includedir = "${exec_prefix}/include" +export oldincludedir = "${exec_prefix}/include" + ################################################################## # Architecture-dependent build variables. ################################################################## -- cgit v1.2.3