diff options
| -rw-r--r-- | meta-ivi-demo/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-ivi/conf/conf-notes.txt | 2 | ||||
| -rw-r--r-- | meta-ivi/conf/distro/include/default-providers-ivi.inc | 5 | ||||
| -rw-r--r-- | meta-ivi/conf/distro/poky-ivi-systemd.conf | 21 | ||||
| -rw-r--r-- | meta-ivi/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-ivi/recipes-yocto-ivi/images/horizon-image.bb | 5 | ||||
| -rw-r--r-- | meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb | 5 | ||||
| -rw-r--r-- | meta-ivi/recipes-yocto-ivi/images/ivi-image.bb | 4 |
8 files changed, 28 insertions, 17 deletions
diff --git a/meta-ivi-demo/conf/layer.conf b/meta-ivi-demo/conf/layer.conf index 0c4d60b..784882c 100644 --- a/meta-ivi-demo/conf/layer.conf +++ b/meta-ivi-demo/conf/layer.conf @@ -15,5 +15,3 @@ LAYERVERSION_ividemo = "1" LAYERDEPENDS_ividemo = "ivi" -PREFERRED_VERSION_weston = "1.5%" - diff --git a/meta-ivi/conf/conf-notes.txt b/meta-ivi/conf/conf-notes.txt index 72fa41a..b04dbc4 100644 --- a/meta-ivi/conf/conf-notes.txt +++ b/meta-ivi/conf/conf-notes.txt @@ -1,4 +1,4 @@ Common targets are: - horizon-image + intrepid-image ivi-image diff --git a/meta-ivi/conf/distro/include/default-providers-ivi.inc b/meta-ivi/conf/distro/include/default-providers-ivi.inc index d236983..7b933ed 100644 --- a/meta-ivi/conf/distro/include/default-providers-ivi.inc +++ b/meta-ivi/conf/distro/include/default-providers-ivi.inc @@ -6,3 +6,8 @@ PREFERRED_PROVIDER_udev ?= "systemd" PREFERRED_PROVIDER_udev-utils ?= "systemd" PREFERRED_PROVIDER_node-state-manager ?= "node-state-manager" +# +# Default jpeg provider +# +PREFERRED_PROVIDER_jpeg ?= "jpeg" +PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf index 796809a..2d0eab5 100644 --- a/meta-ivi/conf/distro/poky-ivi-systemd.conf +++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf @@ -1,12 +1,13 @@ DISTRO = "poky-ivi-systemd" DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)" -DISTRO_VERSION = "6.0+snapshot-${DATE}" -DISTRO_CODENAME ="horizon" +DISTRO_VERSION = "7.0+snapshot-${DATE}" +DISTRO_CODENAME ="intrepid" MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>" TARGET_VENDOR = "-poky" +LOCALCONF_VERSION = "1" LAYER_CONF_VERSION ?= "6" include conf/distro/include/default-providers-ivi.inc @@ -24,8 +25,11 @@ PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.10%" PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.10%" PREFERRED_VERSION_linux-yocto_vexpressa9 ?= "3.10%" -PREFERRED_PROVIDER_jpeg = "jpeg" -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" +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 = "" @@ -51,6 +55,7 @@ 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 \ @@ -81,13 +86,17 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # 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" +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" + pn-overrides split-strip var-undefined version-going-backwards" # # TO DO diff --git a/meta-ivi/conf/layer.conf b/meta-ivi/conf/layer.conf index 3e463dd..1f853d3 100644 --- a/meta-ivi/conf/layer.conf +++ b/meta-ivi/conf/layer.conf @@ -14,4 +14,3 @@ BBFILE_PRIORITY_ivi = "7" # top directory easily IVI_COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}' -PREFERRED_VERSION_weston = "1.5%" diff --git a/meta-ivi/recipes-yocto-ivi/images/horizon-image.bb b/meta-ivi/recipes-yocto-ivi/images/horizon-image.bb deleted file mode 100644 index 7186861..0000000 --- a/meta-ivi/recipes-yocto-ivi/images/horizon-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -# Base this image on generic IVI image -include recipes-yocto-ivi/images/ivi-image.bb - -PV = "6.0.1" - diff --git a/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb b/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb new file mode 100644 index 0000000..c889b0d --- /dev/null +++ b/meta-ivi/recipes-yocto-ivi/images/intrepid-image.bb @@ -0,0 +1,5 @@ +# Base this image on generic IVI image +require recipes-yocto-ivi/images/ivi-image.bb + +PV = "7.0.0" + diff --git a/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb b/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb index 1812f09..7b4130b 100644 --- a/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb +++ b/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb @@ -1,7 +1,7 @@ # Base this image on generic IVI image -include recipes-yocto-ivi/images/ivi-image.inc +require recipes-yocto-ivi/images/ivi-image.inc -PV = "6.0+snapshot-${DATE}" +PV = "7.0+snapshot-${DATE}" IMAGE_INSTALL_append = " \ packagegroup-abstract-component-p1 \ |