diff options
| -rw-r--r-- | meta-agl/conf/distro/poky-agl.conf | 89 |
1 files changed, 35 insertions, 54 deletions
diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf index 2f80f3f33..65248d0bf 100644 --- a/meta-agl/conf/distro/poky-agl.conf +++ b/meta-agl/conf/distro/poky-agl.conf @@ -1,7 +1,7 @@ DISTRO = "poky-agl" DISTRO_NAME = "Automotive Grade Linux" -DISTRO_VERSION = "1.0.0" -# DISTRO_CODENAME = "XXX" +DISTRO_VERSION = "1.0+snapshot-${DATE}" +DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -10,7 +10,6 @@ MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>" TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" -LAYER_CONF_VERSION ?= "6" PREFERRED_PROVIDER_udev ?= "systemd" PREFERRED_PROVIDER_udev-utils ?= "systemd" @@ -18,11 +17,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "" -# Backport from poky:319a69f1d757a577b50a2ca9c8fbf845eba8e274 -export systemd_system_unitdir = "${nonarch_base_libdir}/systemd/system" -export nonarch_libdir = "${exec_prefix}/lib" -export systemd_user_unitdir = "${nonarch_libdir}/systemd/user" - # Override these in poky based distros AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam bluetooth bluez5" AGL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" @@ -38,9 +32,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.14%" PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%" PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%" -# PREFERRED_VERSION_linux-yocto_qemumips ?= "3.14%" -# PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%" -# PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%" +PREFERRED_VERSION_linux-yocto_qemumips ?= "3.14%" +PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%" +PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%" # Prefer GStreamer 1.4.x by default PREFERRED_VERSION_gstreamer1.0 ?= "1.4.%" @@ -51,29 +45,27 @@ PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%" PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%" PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%" -# Prefer the GStreamer-enabled version of GUPnP-DLNA -PREFERRED_VERSION_gupnp-dlna ?= "0.9.4%" +# Prefer libjpeg-turbo +PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -EXTRAOPKGCONFIG = "poky-feed-config-opkg" - DISTRO_EXTRA_RDEPENDS += " ${AGL_DEFAULT_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += " ${AGL_DEFAULT_EXTRA_RRECOMMENDS}" -POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}" +POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" -# DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" -# DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" +DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" +DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" +DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" TCLIBCAPPEND = "" -QEMU_TARGETS ?= "arm i386 x86_64" -# QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" -# Other QEMU_TARGETS "mips64 mips64el sh4" +QEMU_TARGETS ?= "arm aarch64 i386 x86_64" +# Other QEMU_TARGETS "mips mips64 mips64el ppc sh4" PREMIRRORS ??= "\ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ @@ -83,7 +75,6 @@ gitsm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -svk://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" MIRRORS =+ "\ @@ -100,30 +91,22 @@ CONNECTIVITY_CHECK_URIS ?= " \ https://eula-downloads.yoctoproject.org/index.php \ http://bugzilla.yoctoproject.org/report.cgi" -# SANITY_TESTED_DISTROS ?= " \ -# Poky-1.4 \n \ -# Poky-1.5 \n \ -# Poky-1.6 \n \ -# Poky-1.7 \n \ -# Ubuntu-12.04 \n \ -# Ubuntu-13.10 \n \ -# Ubuntu-14.04 \n \ -# Fedora-19 \n \ -# Fedora-20 \n \ -# CentOS-6.4 \n \ -# CentOS-6.5 \n \ -# Debian-7.0 \n \ -# Debian-7.1 \n \ -# Debian-7.2 \n \ -# Debian-7.3 \n \ -# Debian-7.4 \n \ -# Debian-7.5 \n \ -# Debian-7.6 \n \ -# Debian-7.7 \n \ -# SUSE-LINUX-12.2 \n \ -# openSUSE-project-12.3 \n \ -# openSUSE-project-13.1 \n \ -# " +SANITY_TESTED_DISTROS ?= " \ + poky-1.7 \n \ + poky-1.8 \n \ + poky-2.0 \n \ + Ubuntu-14.04 \n \ + Ubuntu-14.10 \n \ + Ubuntu-15.04 \n \ + Ubuntu-15.10 \n \ + Fedora-21 \n \ + Fedora-22 \n \ + CentOS-6.* \n \ + CentOS-7.* \n \ + Debian-7.* \n \ + Debian-8.* \n \ + openSUSE-project-13.2 \n \ + " # Default hash policy for distro BB_SIGNATURE_HANDLER ?= 'OEBasicHash' @@ -133,16 +116,14 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "11" # add poky sanity bbclass INHERIT += "poky-sanity" # QA check settings - a little stricter than the OE-Core defaults -WARN_QA = "textrel files-invalid incompatible-license xorg-driver-abi libdir \ - unknown-configure-option build-deps file-rdeps" -ERROR_QA = "dev-so debug-deps dev-deps debug-files arch pkgconfig la perms \ - useless-rpaths rpaths staticdev ldflags pkgvarcheck already-stripped \ - compile-host-path dep-cmp installed-vs-shipped install-host-path \ - packages-list perm-config perm-line perm-link pkgv-undefined \ - pn-overrides split-strip var-undefined version-going-backwards" +WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \ + installed-vs-shipped ldflags pn-overrides rpaths staticdev \ + useless-rpaths" +WARN_QA_remove = "${WARN_TO_ERROR_QA}" +ERROR_QA_append = " ${WARN_TO_ERROR_QA}" |