From e047047b56e784bc44df662a9d147a2506ccc66a Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 12 Jan 2017 01:33:09 +0100 Subject: Move meta-agl to 'Daring Dab' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump version to 3.90.x+snapshot for pre-'Daring Dab' Check append files and add shadow files to track origin. Remove unused and broken poky-agl-sysvinit.conf. Change-Id: I2d97c2e60380f6d7a9ca767698caff011574e7a6 Signed-off-by: Jan-Simon Möller --- meta-agl/conf/distro/poky-agl-sysvinit.conf | 135 ---------------------------- meta-agl/conf/distro/poky-agl.conf | 9 +- 2 files changed, 6 insertions(+), 138 deletions(-) delete mode 100644 meta-agl/conf/distro/poky-agl-sysvinit.conf (limited to 'meta-agl/conf') diff --git a/meta-agl/conf/distro/poky-agl-sysvinit.conf b/meta-agl/conf/distro/poky-agl-sysvinit.conf deleted file mode 100644 index c60bfee39..000000000 --- a/meta-agl/conf/distro/poky-agl-sysvinit.conf +++ /dev/null @@ -1,135 +0,0 @@ -DISTRO = "poky-agl" -DISTRO_NAME = "Automotive Grade Linux" -DISTRO_VERSION = "2.0.0+snapshot-${DATE}" -DISTRO_CODENAME = "blowfish" -SDK_VENDOR = "-pokysdk" -SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" - -MAINTAINER = "AGL " - -TARGET_VENDOR = "-poky" - -LOCALCONF_VERSION = "1" -LAYER_CONF_VERSION ?= "6" - -# Override these in poky based distros -AGL_DEFAULT_DISTRO_FEATURES = "opengl wayland" -AGL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" -AGL_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" - -DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${AGL_DEFAULT_DISTRO_FEATURES}" - -#DISTRO_FEATURES_APPEND = " " -DISTRO_FEATURES_remove = "x11" - -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%" - -# Prefer GStreamer 1.4.x by default -PREFERRED_VERSION_gstreamer1.0 ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%" - -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)}" -DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${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" - -PREMIRRORS ??= "\ -bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -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 =+ "\ -ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -http://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" - -# The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully -# fetch from the network (and warn you if not). To disable the test set -# the variable to be empty. -# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=HEAD - -CONNECTIVITY_CHECK_URIS ?= "" - -# 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 \ -# " - -# Default hash policy for distro -BB_SIGNATURE_HANDLER ?= 'OEBasicHash' -# -# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in -# an incompatible way. Such changes should usually be detailed in the commit -# that breaks the format and have been previously discussed on the mailing list -# with general agreement from the core team. -# -OELAYOUT_ABI = "8" - -# 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" - -# using multiple BSP layers causes dangling bbappends in meta-agl-bsp -# turn it into a warning -BB_DANGLINGAPPENDS_WARNONLY = "1" \ No newline at end of file diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf index 31b194fc9..3126f5998 100644 --- a/meta-agl/conf/distro/poky-agl.conf +++ b/meta-agl/conf/distro/poky-agl.conf @@ -3,8 +3,8 @@ require conf/distro/poky.conf # AGL specific derivations DISTRO = "poky-agl" DISTRO_NAME = "Automotive Grade Linux" -DISTRO_VERSION = "3.0.0+snapshot-${DATE}" -DISTRO_CODENAME = "chinook" +DISTRO_VERSION = "3.90.0+snapshot-${DATE}" +DISTRO_CODENAME = "dab" SDK_VENDOR = "-aglsdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -54,7 +54,7 @@ DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" -# Prefer GStreamer 1.4.x by default +# Prefer GStreamer 1.8.x by default PREFERRED_VERSION_gstreamer1.0 ?= "1.8%" PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.8%" PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8%" @@ -75,3 +75,6 @@ PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" # required overrides, upstreamed but not merged yet: # http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107727.html #SECURITY_CFLAGS_pn-llvm3.3 = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_STRINGFORMAT_pn-gpm = "" +SECURITY_CFLAGS_pn-libdbus-c++ = "" +SECURITY_LDFLAGS_pn-libdbus-c++ = "" \ No newline at end of file -- cgit 1.2.3-korg