diff options
Diffstat (limited to 'meta/conf')
112 files changed, 1581 insertions, 1349 deletions
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index a829687780..4964880108 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "11" +OELAYOUT_ABI = "12" diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample index 518da7402c..c985f4f242 100644 --- a/meta/conf/bblayers.conf.sample +++ b/meta/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "5" +LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -8,8 +8,3 @@ BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ " - -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - " - diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 06971da811..a24be0551d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -15,7 +15,7 @@ BASELIB_powerpc64 = "lib64" # Path prefixes export base_prefix = "" export prefix = "/usr" -export exec_prefix = "/usr" +export exec_prefix = "${prefix}" # Base paths export base_bindir = "${base_prefix}/bin" @@ -41,7 +41,7 @@ export systemd_user_unitdir = "${nonarch_libdir}/systemd/user" export bindir = "${exec_prefix}/bin" export sbindir = "${exec_prefix}/sbin" export libdir = "${exec_prefix}/${baselib}" -export libexecdir = "${libdir}/${BPN}" +export libexecdir = "${exec_prefix}/libexec" export includedir = "${exec_prefix}/include" export oldincludedir = "${exec_prefix}/include" localedir = "${libdir}/locale" @@ -55,13 +55,16 @@ bindir_native = "${prefix_native}/bin" sbindir_native = "${prefix_native}/sbin" includedir_native = "${prefix_native}/include" libdir_native = "${prefix_native}/lib" -libexecdir_native = "${libdir_native}/${BPN}" +libexecdir_native = "${prefix_native}/libexec" base_libdir_native = "/lib" datadir_native = "${prefix_native}/share" bindir_cross = "/bin" bindir_crossscripts = "${bindir}/crossscripts" prefix_nativesdk = "/usr" bindir_nativesdk = "${prefix_nativesdk}/bin" +sbindir_nativesdk = "${prefix_nativesdk}/sbin" +base_bindir_nativesdk = "/bin" +base_sbindir_nativesdk = "/sbin" includedir_nativesdk = "${prefix_nativesdk}/include" libdir_nativesdk = "${prefix_nativesdk}/lib" base_libdir_nativesdk = "/lib" @@ -120,16 +123,16 @@ SDKUSE_NLS ??= "yes" TARGET_ARCH = "${TUNE_ARCH}" TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" TARGET_VENDOR = "-oe" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS', True), ''][d.getVar('TARGET_OS', True) == ('' or 'custom')]}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "${TUNE_CCARGS}" TARGET_LD_ARCH = "${TUNE_LDARGS}" TARGET_AS_ARCH = "${TUNE_ASARGS}" -SDK_ARCH = "${BUILD_ARCH}" +SDKMACHINE ??= "x86_64" SDK_OS = "${BUILD_OS}" SDK_VENDOR = "-oesdk" -SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" +SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS'), ''][d.getVar('SDK_OS') == ('' or 'custom')]}" SDK_PREFIX = "${SDK_SYS}-" SDK_CC_ARCH = "${BUILD_CC_ARCH}" SDKPKGSUFFIX = "nativesdk" @@ -139,7 +142,7 @@ SDK_AS_ARCH = "${BUILD_AS_ARCH}" TUNE_PKGARCH ??= "" PACKAGE_ARCH ??= "${TUNE_PKGARCH}" -MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}" +MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}" PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" # MACHINE_ARCH shouldn't be included here as a variable dependency @@ -147,7 +150,6 @@ PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH" MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" ################################################################## # Date/time variables. @@ -167,17 +169,21 @@ ASSUME_PROVIDED = "\ bzip2-native \ chrpath-native \ file-native \ + findutils-native \ git-native \ grep-native \ diffstat-native \ patch-native \ - perl-native-runtime \ - python-native-runtime \ + libgcc-native \ + hostperl-runtime-native \ + hostpython-runtime-native \ tar-native \ virtual/libintl-native \ + virtual/libiconv-native \ texinfo-native \ bash-native \ sed-native \ + wget-native \ " # gzip-native should be listed above? @@ -188,24 +194,26 @@ ASSUME_PROVIDED = "\ PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}" +PE = "" PF = "${PN}-${EXTENDPE}${PV}-${PR}" -EXTENDPE = "${@['','${PE\x7d_'][int(d.get |