diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 56 | ||||
| -rw-r--r-- | conf/sanity.conf | 2 |
2 files changed, 28 insertions, 30 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index de526f0e56..4fe5c21e02 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -2,23 +2,20 @@ # Standard target filesystem layout. ################################################################## -# Note these currently match the existing staging layout but this -# is planned to change, see the oe-dev mailing list - # Path prefixes -layout_prefix = "" -layout_exec_prefix = "" +layout_prefix = "/usr" +layout_exec_prefix = "/usr" layout_base_prefix = "" # Base paths layout_base_bindir = "${layout_base_prefix}/bin" -layout_base_sbindir = "${layout_base_prefix}/bin" +layout_base_sbindir = "${layout_base_prefix}/sbin" layout_base_libdir = "${layout_base_prefix}/lib" # Architecture independent paths -layout_sysconfdir = "/etc" -layout_localstatedir = "/var" -layout_servicedir = "/srv" +layout_sysconfdir = "${layout_base_prefix}/etc" +layout_localstatedir = "${layout_base_prefix}/var" +layout_servicedir = "${layout_base_prefix}/srv" layout_sharedstatedir = "${layout_prefix}/com" layout_datadir = "${layout_prefix}/share" layout_infodir = "${layout_datadir}/info" @@ -27,7 +24,7 @@ layout_docdir = "${layout_datadir}/doc" # Architecture dependent paths layout_bindir = "${layout_exec_prefix}/bin" -layout_sbindir = "${layout_exec_prefix}/bin" +layout_sbindir = "${layout_exec_prefix}/sbin" layout_libdir = "${layout_exec_prefix}/lib" layout_includedir = "${layout_exec_prefix}/include" layout_libexecdir = "${layout_exec_prefix}/libexec" @@ -38,31 +35,31 @@ layout_libexecdir = "${layout_exec_prefix}/libexec" # Path prefixes export base_prefix = "" -export prefix = "/usr" -export exec_prefix = "${prefix}" +export prefix = "${layout_prefix}" +export exec_prefix = "${layout_exec_prefix}" # Base paths -export base_bindir = "${base_prefix}/bin" -export base_sbindir = "${base_prefix}/sbin" -export base_libdir = "${base_prefix}/lib" +export base_bindir = "${layout_base_bindir}" +export base_sbindir = "${layout_base_sbindir}" +export base_libdir = "${layout_base_libdir}" # Architecture independent paths -export datadir = "${prefix}/share" -export sysconfdir = "/etc" -export sharedstatedir = "${prefix}/com" -export localstatedir = "/var" -export infodir = "${datadir}/info" -export mandir = "${datadir}/man" -export docdir = "${datadir}/doc" -export servicedir = "/srv" +export datadir = "${layout_datadir}" +export sysconfdir = "${layout_sysconfdir}" +export sharedstatedir = "${layout_sharedstatedir}" +export localstatedir = "${layout_localstatedir}" +export infodir = "${layout_infodir}" +export mandir = "${layout_mandir}" +export docdir = "${layout_docdir}" +export servicedir = "${layout_servicedir}" # 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" +export bindir = "${layout_bindir}" +export sbindir = "${layout_sbindir}" +export libexecdir = "${layout_libexecdir}" +export libdir = "${layout_libdir}" +export includedir = "${layout_includedir}" +export oldincludedir = "${layout_includedir}" ################################################################## # Architecture-dependent build variables. @@ -511,6 +508,7 @@ SLOT = "0" export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" diff --git a/conf/sanity.conf b/conf/sanity.conf index 4af4454e2e..35d9d32de1 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -11,7 +11,7 @@ BB_MIN_VERSION = "1.8.10" # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -SANITY_ABI = "0" +SANITY_ABI = "1" SANITY_ABIFILE = "${TMPDIR}/abi_version" INHERIT += "sanity" |