aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirza Krak <mirza.krak@endian.se>2018-05-16 11:43:06 +0200
committergunnarx <gunnarx@users.noreply.github.com>2018-07-19 17:57:08 +0200
commited8ada9064caf866c55a473aeb69e3682a4877a7 (patch)
treec5590b2f746562808d0f3b9fa0b0631fdf3cbadc
parent6c0ae93c04529583b45519fe95708ed899b6d35a (diff)
downloadmeta-ivi-ed8ada9064caf866c55a473aeb69e3682a4877a7.tar.gz
meta-ivi-ed8ada9064caf866c55a473aeb69e3682a4877a7.tar.bz2
meta-ivi-ed8ada9064caf866c55a473aeb69e3682a4877a7.zip
distro: poky-ivi-systemd: inherit from poky
The poky-ivi-systemd.conf file is a copy of an outdated poky.conf. Converted to actually include the poky.conf and instead override desired values to create a custom distribution. This way we can follow poky updates without much effort. Signed-off-by: Mirza Krak <mirza.krak@endian.se>
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf87
1 files changed, 13 insertions, 74 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 2825f1a..b05b27d 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -1,3 +1,5 @@
+require conf/distro/poky.conf
+
DISTRO = "poky-ivi-systemd"
DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)"
DISTRO_VERSION = "14.0.0"
@@ -5,18 +7,23 @@ DISTRO_CODENAME ="pulsar"
MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>"
-TARGET_VENDOR = "-poky"
-
-LOCALCONF_VERSION = "1"
-LAYER_CONF_VERSION ?= "6"
+POKY_DEFAULT_DISTRO_FEATURES = "\
+ bluetooth \
+ largefile \
+ opengl \
+ pam \
+ systemd \
+ wayland \
+"
include conf/distro/include/default-providers-ivi.inc
+# Conflicts with wayland. It is possible run wayland
+# on-top of x11 but that is not a use-case that we support
+DISTRO_FEATURES_remove = "x11 directfb"
VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = ""
-DISTRO_FEATURES_append = " bluetooth systemd opengl wayland pam bluez5"
-DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
require conf/distro/include/security_flags.inc
@@ -43,15 +50,6 @@ PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.12.2"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.12.2"
PREFERRED_VERSION_gstreamer1.0-libav ?= "1.12.2"
PREFERRED_VERSION_gstreamer1.0-omx ?= "1.12.2"
-
-POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}"
-DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_vexpressa9 = " ${POKYQEMUDEPS}"
-
-TCLIBCAPPEND = ""
-
QEMU_TARGETS ?= "arm aarch64 i386 x86_64"
XSERVER ?= "xserver-xorg \
@@ -69,62 +67,3 @@ XSERVER ?= "xserver-xorg \
${@bb.utils.contains("MACHINE_ARCH", "qemux86_64", "xf86-video-vmware", "", d)} \
${@bb.utils.contains("MACHINE_ARCH", "vexpressa9", "xf86-video-fbdev", "", d)} \
"
-
-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 \
-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 ?= " \
- https://eula-downloads.yoctoproject.org/index.php \
- http://www.genivi.org"
-
-# 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 = "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"
-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"
-
-# Recent changes in siggen.py check for task hash and generate build errors
-# called Taskhash mismatch when using variables with date and time. Exclude
-# date variables as done.
-# see https://lists.yoctoproject.org/pipermail/poky/2016-April/010470.html
-DISTRO_VERSION[vardepsexclude] = "DATE"
-SDK_VERSION[vardepsexclude] = "DATE"
-
-#
-# TO DO
-# When bug is fixed: https://bugzilla.yoctoproject.org/show_bug.cgi?id=5968
-# In quilt binary diffs are not supported. Use git as tool for applying patches.
-# PATCHTOOL = 'git'