diff options
58 files changed, 446 insertions, 1077 deletions
@@ -29,17 +29,17 @@ Layer Dependencies ------------------ URI: git://git.yoctoproject.org/poky -> branch: krogoth -> revision: aad7166704021d82ad3a5ec468552f8f10360d41 +> branch: morty +> revision: 5aa481dfedfd089f0d6e8a3bae1b84134d5dff4c URI: git://git.openembedded.org/meta-openembedded > layer: meta-oe -> branch: krogoth -> revision: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a +> branch: morty +> revision: 1efa5d623bc64659b57389e50be2568b1355d5f7 Using the above git sha's and the master meta-ivi branch, - bitbaking miranda-image is known to work - (the miranda-image build should be aligned with GENIVI 11.0). + bitbaking nostromo-image is known to work + (the nostromo-image build should be aligned with GENIVI 12.0). For creating a specific GENIVI compliant image version, please make sure you git checkout the related meta-ivi branch and follow the build instructions @@ -75,18 +75,18 @@ export TEMPLATECONF=/full/path/to/meta-ivi/meta-ivi/conf 2. Run the following command: > $ source poky/oe-init-build-env -3. Build miranda-image including GENIVI 11.0 (Miranda) components - > $ bitbake miranda-image +3. Build nostromo-image including GENIVI 12.0 (Nostromo) components + > $ bitbake nostromo-image 4. Run the emulator: > for qemu vexpressa9: - > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu miranda-image vexpressa9 + > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu nostromo-image vexpressa9 > > for qemu x86: - > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu miranda-image qemux86 + > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu nostromo-image qemux86 > > for qemu x86-64: - > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu miranda-image qemux86-64 + > $ PATH_TO_META_IVI/meta-ivi/scripts/runqemu nostromo-image qemux86-64 5. To login use these credentials: > User - root diff --git a/README.ubuntu1604 b/README.ubuntu1604 new file mode 100644 index 0000000..17cabe3 --- /dev/null +++ b/README.ubuntu1604 @@ -0,0 +1,22 @@ +if your build environment is ubuntu 16.06, + you may encounter the following build problem: + +Log data follows: +| DEBUG: Executing python function sysroot_cleansstate +| DEBUG: Python function sysroot_cleansstate finished +| DEBUG: Executing shell function autotools_preconfigure +| DEBUG: Shell function autotools_preconfigure finished +| DEBUG: Executing python function autotools_copy_aclocals +| DEBUG: Python function autotools_copy_aclocals finished +| DEBUG: Executing shell function do_configure +| +| ERROR: User requested feature sdl +| configure was not able to find it. +| Install SDL devel +| + +then, you may pass with following workaround: + +add BUILD_LDFLAGS_prepend_pn-qemu-native = "-Wl,-rpath-link,/lib/x86_64-linux-gnu " to local.conf." + +(see https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-January/001492.html for more detail) diff --git a/meta-ivi-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-ivi-bsp/recipes-kernel/linux/linux-yocto_%.bbappend index 5fc758d..7d2241a 100644 --- a/meta-ivi-bsp/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-ivi-bsp/recipes-kernel/linux/linux-yocto_%.bbappend @@ -9,5 +9,4 @@ SRC_URI_append_qemux86-64 = " file://qemux86_64.cfg" # vexpress-a9 support KMACHINE_vexpressa9 = "beagleboard" -SRCREV_machine_vexpressa9 ?= "${AUTOREV}" COMPATIBLE_MACHINE_vexpressa9 = "vexpressa9" diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus/common-api-c++-dbus_t.inc b/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus/common-api-c++-dbus_t.inc new file mode 100644 index 0000000..09199db --- /dev/null +++ b/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus/common-api-c++-dbus_t.inc @@ -0,0 +1,31 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Common API C++ test code" +} + +_run_dir=/opt/tests/capicxx-perf +_run_1() { + ${_run_dir}/capicxx-server & + ${_run_dir}/capicxx-client + kill -9 `pidof capicxx-server` + sleep 1 +} + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 >& /tmp/t + _test_completed=`cat /tmp/t | grep "test completed"` + _10000_sent=`cat /tmp/t | grep "sync messages sent" | grep 10000` + if [ "x${_test_completed}" != "x" -a "y${_10000_sent}" != "y" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus_%.bbappend b/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus_%.bbappend new file mode 100644 index 0000000..31c2875 --- /dev/null +++ b/meta-ivi-test/recipes-extended/common-api/common-api-c++-dbus_%.bbappend @@ -0,0 +1,34 @@ +# +# for test +# +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " +SRC_URI_append += " \ + http://googletest.googlecode.com/files/gtest-1.7.0.zip \ + " +SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7" +SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d" + +EXTRA_OECMAKE += "-DWITH_DLTTEST=ON -DCMAKE_SKIP_RPATH=ON -DWITH_MAN=OFF \ + -DGTEST_ROOT=${WORKDIR}/gtest-1.7.0 \ + " + +do_compile_append() { + make -C src/test +} + +do_install_append() { + _BIN=${WORKDIR}/build/src/test + install -d ${D}/opt/tests/${PN} + install -m 0755 ${_BIN}/DBus*Test ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} +} + +PACKAGES += "${PN}-test" +DEPENDS_${PN}-test = "${PN}" + +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test-3.1.5.tar.gz b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test-3.1.5.tar.gz Binary files differindex e1f5f7c..0f520b1 100644 --- a/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test-3.1.5.tar.gz +++ b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test-3.1.5.tar.gz diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb b/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb index 04b8154..05310cf 100644 --- a/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb +++ b/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb @@ -2,7 +2,8 @@ SUMMARY = "testsuite for CommonAPI" SECTION = "test" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" + +PR = "r1" inherit cmake pkgconfig @@ -47,21 +48,21 @@ do_install() { install -m 0755 ${_BIN}/${i}/lib${i}-dbus.so ${D}${libdir} done - for i in BlueZ ObjectPathSimple UDisks2 VariantSimple; do - install -d ${_DEST}/${i} - install -m 0755 ${_BIN}/${i}/${i}Client ${_DEST}/${i} - rm -rf ${_DEST}/${i}/.debug - if [ -e ${_BIN}/${i}/${i}Service ]; then - install -m 0755 ${_BIN}/${i}/${i}Service ${_DEST}/${i} - fi - if [ -e ${S}/${i}/README ]; then - install -m 0644 ${S}/${i}/README ${_DEST}/${i} - fi - if [ -e ${S}/${i}/commonapi4dbus.ini ]; then - install -m 0644 ${S}/${i}/commonapi4dbus.ini ${_DEST}/${i} - fi - install -m 0755 ${_BIN}/${i}/lib${i}-dbus.so ${D}${libdir} - done +# for i in BlueZ ObjectPathSimple UDisks2 VariantSimple; do +# install -d ${_DEST}/${i} +# install -m 0755 ${_BIN}/${i}/${i}Client ${_DEST}/${i} +# rm -rf ${_DEST}/${i}/.debug +# if [ -e ${_BIN}/${i}/${i}Service ]; then +# install -m 0755 ${_BIN}/${i}/${i}Service ${_DEST}/${i} +# fi +# if [ -e ${S}/${i}/README ]; then +# install -m 0644 ${S}/${i}/README ${_DEST}/${i} +# fi +# if [ -e ${S}/${i}/commonapi4dbus.ini ]; then +# install -m 0644 ${S}/${i}/commonapi4dbus.ini ${_DEST}/${i} +# fi +# install -m 0755 ${_BIN}/${i}/lib${i}-dbus.so ${D}${libdir} +# done - install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc index ea9b942..fe45729 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc @@ -1,6 +1,6 @@ #!/bin/sh get_list() { - return 7 + return 6 } get_title() { @@ -40,7 +40,3 @@ run_5() { run_6() { _run AmSocketHandlerTest $* } - -run_7() { - _run AmTelnetServerTest $* -} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend index 0647b46..50e695f 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend @@ -15,7 +15,7 @@ DEPENDS += "gtest gmock" do_install_append() { mkdir -p ${D}/opt/tests/${PN} - for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do + for i in `find ${B}/ -type f -regex '.*[tT]est'`; do install -m 0755 ${i} ${D}/opt/tests/${PN} done diff --git a/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb index 909182d..0f73eea 100644 --- a/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb +++ b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb @@ -5,6 +5,7 @@ PV = "${DATE}" IMAGE_INSTALL_append += " openssh test-fw \ audiomanager-test audiomanagerplugins-test \ common-api-test capicxx-perf \ + common-api-c++-dbus-test \ persistence-client-library-test \ persistence-common-object-test \ persistence-administrator-test \ diff --git a/meta-ivi/conf/conf-notes.txt b/meta-ivi/conf/conf-notes.txt index d1f98ca..21b2dd9 100644 --- a/meta-ivi/conf/conf-notes.txt +++ b/meta-ivi/conf/conf-notes.txt @@ -1,4 +1,4 @@ Common targets are: - miranda-image + nostromo-image ivi-image diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf index 23eae0b..efaa26a 100644 --- a/meta-ivi/conf/distro/poky-ivi-systemd.conf +++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf @@ -1,7 +1,7 @@ DISTRO = "poky-ivi-systemd" DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)" -DISTRO_VERSION = "11.0.0" -DISTRO_CODENAME ="miranda" +DISTRO_VERSION = "12.0.0" +DISTRO_CODENAME ="nostromo" MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>" @@ -20,13 +20,13 @@ DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" # do not use gstreamer 1.2.3 by default -PREFERRED_VERSION_gstreamer1.0 ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.6.%" -PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%" +PREFERRED_VERSION_gstreamer1.0 ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.8.3" +PREFERRED_VERSION_gstreamer1.0-omx ?= "1.8.3" POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}" DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch new file mode 100644 index 0000000..dc37466 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch @@ -0,0 +1,44 @@ +--- dbus-1.10.10/dbus/dbus-sysdeps-unix.c.orig 2017-01-26 20:39:27.868191644 +0900 ++++ dbus-1.10.10/dbus/dbus-sysdeps-unix.c 2017-01-26 20:43:15.708197478 +0900 +@@ -4320,13 +4320,14 @@ + { + for (;;) + { +- struct dirent buf, *de; +- int k, fd; ++ struct dirent *de; ++ int fd; + long l; + char *e = NULL; + +- k = readdir_r (d, &buf, &de); +- if (k != 0 || !de) ++ errno = 0; ++ de = readdir (d); ++ if (!de && errno) + break; + + if (de->d_name[0] == '.') +--- dbus-1.10.10/dbus/dbus-message.c.orig 2017-01-26 20:32:02.456180239 +0900 ++++ dbus-1.10.10/dbus/dbus-message.c 2017-01-26 20:32:27.288180875 +0900 +@@ -4128,7 +4128,7 @@ + beginning. This sucks a bit, however unless SCM_RIGHTS is fixed + there is no better way. */ + +- if (loader->n_unix_fds_allocated < loader->max_message_unix_fds) ++ if ((int)(loader->n_unix_fds_allocated) < loader->max_message_unix_fds) + { + int *a = dbus_realloc(loader->unix_fds, + loader->max_message_unix_fds * sizeof(loader->unix_fds[0])); +--- dbus-1.10.10/dbus/dbus-shell.c.orig 2017-01-26 20:45:49.292201410 +0900 ++++ dbus-1.10.10/dbus/dbus-shell.c 2017-01-26 20:47:39.840204241 +0900 +@@ -419,7 +419,9 @@ + { + case '\n': + if (!delimit_token (¤t_token, &retval, error)) ++ { + goto error; ++ } + + _dbus_string_free (¤t_token); + diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch deleted file mode 100644 index e383b72..0000000 --- a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dbus-1.10.6/dbus/dbus-marshal-recursive.c.orig 2016-06-30 15:25:51.655302658 +0900 -+++ dbus-1.10.6/dbus/dbus-marshal-recursive.c 2016-06-30 15:26:51.559300885 +0900 -@@ -989,7 +989,7 @@ - _dbus_type_reader_recurse (DBusTypeReader *reader, - DBusTypeReader *sub) - { -- const DBusTypeReaderClass *klass; -+ const DBusTypeReaderClass *klass = NULL; - int t; - - t = _dbus_first_type_in_signature (reader->type_str, reader->type_pos); ---- dbus-1.10.6/dbus/dbus-message.c.orig 2016-07-01 20:24:23.884214520 +0900 -+++ dbus-1.10.6/dbus/dbus-message.c 2016-07-01 20:24:49.708213755 +0900 -@@ -4091,7 +4091,7 @@ - beginning. This sucks a bit, however unless SCM_RIGHTS is fixed - there is no better way. */ - -- if (loader->n_unix_fds_allocated < loader->max_message_unix_fds) -+ if (loader->n_unix_fds_allocated < (unsigned long)(loader->max_message_unix_fds)) - { - int *a = dbus_realloc(loader->unix_fds, - loader->max_message_unix_fds * sizeof(loader->unix_fds[0])); diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch index 1ede7a4..e0c2c6f 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch @@ -13,10 +13,11 @@ Subject: [PATCH] Add functions to support querying and manipulating the dbus/dbus-string.h | 5 +++ 4 files changed, 134 insertions(+) -diff -urN dbus-1.10.6.orig/dbus/dbus-message.c dbus-1.10.6/dbus/dbus-message.c ---- dbus-1.10.6.orig/dbus/dbus-message.c 2016-06-30 15:42:08.307273745 +0900 -+++ dbus-1.10.6/dbus/dbus-message.c 2016-06-30 15:42:38.939272838 +0900 -@@ -3558,6 +3558,47 @@ +diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c +index 43cb1be..d34663a 100644 +--- a/dbus/dbus-message.c ++++ b/dbus/dbus-message.c +@@ -3445,6 +3445,47 @@ dbus_message_get_sender (DBusMessage *message) } /** @@ -64,7 +65,7 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-message.c dbus-1.10.6/dbus/dbus-message.c * Gets the type signature of the message, i.e. the arguments in the * message payload. The signature includes only "in" arguments for * #DBUS_MESSAGE_TYPE_METHOD_CALL and only "out" arguments for -@@ -4742,6 +4783,64 @@ +@@ -4632,6 +4673,64 @@ dbus_message_type_to_string (int type) } /** @@ -129,10 +130,11 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-message.c dbus-1.10.6/dbus/dbus-message.c * Turn a DBusMessage into the marshalled form as described in the D-Bus * specification. * -diff -urN dbus-1.10.6.orig/dbus/dbus-message.h dbus-1.10.6/dbus/dbus-message.h ---- dbus-1.10.6.orig/dbus/dbus-message.h 2016-06-30 15:42:08.307273745 +0900 -+++ dbus-1.10.6/dbus/dbus-message.h 2016-06-30 15:42:38.939272838 +0900 -@@ -138,6 +138,9 @@ +diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h +index 4fd44da..76377b8 100644 +--- a/dbus/dbus-message.h ++++ b/dbus/dbus-message.h +@@ -138,6 +138,9 @@ dbus_bool_t dbus_message_set_sender (DBusMessage *message, DBUS_EXPORT const char* dbus_message_get_sender (DBusMessage *message); DBUS_EXPORT @@ -142,7 +144,7 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-message.h dbus-1.10.6/dbus/dbus-message.h const char* dbus_message_get_signature (DBusMessage *message); DBUS_EXPORT void dbus_message_set_no_reply (DBusMessage *message, -@@ -265,6 +268,17 @@ +@@ -262,6 +265,17 @@ dbus_bool_t dbus_message_iter_close_container (DBusMessageIter *iter, DBUS_EXPORT void dbus_message_iter_abandon_container (DBusMessageIter *iter, DBusMessageIter *sub); @@ -160,10 +162,11 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-message.h dbus-1.10.6/dbus/dbus-message.h DBUS_EXPORT void dbus_message_lock (DBusMessage *message); -diff -urN dbus-1.10.6.orig/dbus/dbus-string.c dbus-1.10.6/dbus/dbus-string.c ---- dbus-1.10.6.orig/dbus/dbus-string.c 2016-06-30 15:42:08.307273745 +0900 -+++ dbus-1.10.6/dbus/dbus-string.c 2016-06-30 15:42:38.939272838 +0900 -@@ -744,6 +744,22 @@ +diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c +index 0f63612..a084eca 100644 +--- a/dbus/dbus-string.c ++++ b/dbus/dbus-string.c +@@ -730,6 +730,22 @@ _dbus_string_get_length (const DBusString *str) } #endif /* !_dbus_string_get_length */ @@ -186,10 +189,11 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-string.c dbus-1.10.6/dbus/dbus-string.c /** * Makes a string longer by the given number of bytes. Checks whether * adding additional_length to the current length would overflow an -diff -urN dbus-1.10.6.orig/dbus/dbus-string.h dbus-1.10.6/dbus/dbus-string.h ---- dbus-1.10.6.orig/dbus/dbus-string.h 2016-06-30 15:42:08.307273745 +0900 -+++ dbus-1.10.6/dbus/dbus-string.h 2016-06-30 15:43:01.027272184 +0900 -@@ -61,6 +61,7 @@ +diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h +index 86fb8c3..bfa2a39 100644 +--- a/dbus/dbus-string.h ++++ b/dbus/dbus-string.h +@@ -61,6 +61,7 @@ struct DBusString */ #define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1)) #define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2) @@ -197,7 +201,7 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-string.h dbus-1.10.6/dbus/dbus-string.h #define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b)) #define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) #define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1)) -@@ -151,6 +152,10 @@ +@@ -151,6 +152,10 @@ DBUS_PRIVATE_EXPORT int _dbus_string_get_length (const DBusString *str); #endif /* !_dbus_string_get_length */ @@ -208,3 +212,6 @@ diff -urN dbus-1.10.6.orig/dbus/dbus-string.h dbus-1.10.6/dbus/dbus-string.h /** * Get the string's length as an unsigned integer, for comparison with * size_t and similar unsigned types that does not trigger compiler +-- +1.9.1 + diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-send-with-reply-and-block-delete-reply-on-error.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-send-with-reply-and-block-delete-reply-on-error.patch new file mode 100644 index 0000000..51f3953 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-send-with-reply-and-block-delete-reply-on-error.patch @@ -0,0 +1,26 @@ +diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c +index 5962e77..4a4ee9b 100644 +--- a/dbus/dbus-connection.c ++++ b/dbus/dbus-connection.c +@@ -3709,13 +3709,9 @@ dbus_connection_send_with_reply_and_block (DBusConnection *connection, + */ + _dbus_assert (reply != NULL); + +- if (dbus_set_error_from_message (error, reply)) +- { +- dbus_message_unref (reply); +- return NULL; +- } +- else +- return reply; ++ dbus_set_error_from_message (error, reply); ++ ++ return reply; + } + + /** +@@ -6447,3 +6443,4 @@ _dbus_connection_get_address (DBusConnection *connection) + #endif + + /** @} */ ++ diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend index e468884..407535b 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend +++ b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend @@ -1,11 +1,12 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # add support for GENIVI CommonAPI D-Bus runtime -# - http://projects.genivi.org/commonapi/ +# - https://genivi-oss.atlassian.net/wiki/display/COMMONAPICPP/CommonAPI-cpp SRC_URI_append = " \ file://capi-dbus-add-send-with-reply-set-notify.patch \ file://capi-dbus-add-support-for-custom-marshalling.patch \ file://capi-dbus-block-acquire-io-path-on-send.patch \ file://capi-dbus-correct-dbus-connection-block-pending-call.patch \ - file://build_fixup.patch \ + file://capi-dbus-send-with-reply-and-block-delete-reply-on-error.patch \ " +SRC_URI_append_qemux86 = " file://build_fix-ubunt1604-qemux86.patch" diff --git a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch deleted file mode 100644 index 481896b..0000000 --- a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf03c16..b102654 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -180,7 +180,7 @@ install ( - ) - - install ( -- FILES ${EXAMPLE_CONFIG_FILES} DESTINATION etc/vsomeip COMPONENT config -+ FILES ${EXAMPLE_CONFIG_FILES} DESTINATION /etc/vsomeip COMPONENT config - ) - - # Add all targets to the build-tree export set diff --git a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.0.1.bb b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.5.2.bb index cbe7ba4..d6745f6 100644 --- a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.0.1.bb +++ b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.5.2.bb @@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" DEPENDS = "boost dlt-daemon" -SRCREV = "2b7442a4c2452f8f3bd9e0f09f829478256d39af" -SRC_URI = "git://git.projects.genivi.org/vSomeIP.git;protocol=http \ - file://build_fixup.patch \ +SRCREV = "1a230558936ec84b4fb44b2346dc5ae52d6f2805" +SRC_URI = "git://github.com/GENIVI/vsomeip.git;protocol=https \ " - S = "${WORKDIR}/git" inherit cmake lib_package gitpkgv -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" - PACKAGES_remove += "${PN}-bin" -FILES_${PN} += "${bindir}/vsomeipd" +FILES_${PN} += "${bindir}/vsomeipd ${sysconfdir}/${BPN}" FILES_${PN}-dev += "${libdir}/cmake" BBCLASSEXTEND = "nativesdk" + +do_install_append() { + mv ${D}/usr/etc ${D} +}
\ No newline at end of file diff --git a/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.10.2.bb b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.10.2.bb new file mode 100644 index 0000000..04fe9b0 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.10.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ core generator" + +LAUNCHER_BASE = "commonapi-generator" +LAUNCHER_LINK = "capicxx-core-gen" + +require capicxx-native.inc + +SRC_URI = "https://github.com/GENIVI/${_BPN}-tools/releases/download/${PV}/commonapi-generator.zip" +SRC_URI[md5sum] = "b8bacc0cc99760a06708795a63a5090e" +SRC_URI[sha256sum] = "27c88092f58f4570225784db87bad913beddea4a66d8d8a2487e708f74628a0f" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb deleted file mode 100644 index 3e9c36c..0000000 --- a/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ core generator" - -LAUNCHER_BASE = "commonapi-generator" -LAUNCHER_LINK = "capicxx-core-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi-generator.zip" -SRC_URI[md5sum] = "c12551e8f61da944b17a22c00d3e6559" -SRC_URI[sha256sum] = "538a923a1e596106b9f2ce0838fcf85fd81c4e09b0951c59ad2e2e72eb6d0534" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.10.2.bb b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.10.2.bb new file mode 100644 index 0000000..b5ff1a6 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.10.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ D-Bus generator" + +LAUNCHER_BASE = "commonapi-dbus-generator" +LAUNCHER_LINK = "capicxx-dbus-gen" + +require capicxx-native.inc + +SRC_URI = "https://github.com/GENIVI/${_BPN}-tools/releases/download/${PV}/commonapi_dbus_generator.zip" +SRC_URI[md5sum] = "5b4863c98b9412344682f503ffda5eef" +SRC_URI[sha256sum] = "1c0ebf0fffc1d348e7aa644570b27b0828704cece3e99bbab5a30eda22d7cb78" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb deleted file mode 100644 index 66b90a8..0000000 --- a/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ D-Bus generator" - -LAUNCHER_BASE = "commonapi-dbus-generator" -LAUNCHER_LINK = "capicxx-dbus-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_dbus_generator.zip" -SRC_URI[md5sum] = "70a6f1cf7e42a94260385281a569a486" -SRC_URI[sha256sum] = "de165298b1062951dff07d99f491c8d8a3ca3c1a087de56bc01c083cf71fa742" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-native.inc b/meta-ivi/recipes-extended/common-api/capicxx-native.inc index 425d384..30b3a3f 100644 --- a/meta-ivi/recipes-extended/common-api/capicxx-native.inc +++ b/meta-ivi/recipes-extended/common-api/capicxx-native.inc @@ -3,8 +3,8 @@ LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = \ "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" -BASE_URL = "http://docs.projects.genivi.org/yamaica-update-site/CommonAPI" BASE_VER = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" +_BPN = "${@'-'.join(d.getVar('BPN', True).split('-')[0:2])}" def get_launcher_name(d): BS = d.getVar('BUILD_SYS', True) diff --git a/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.10.bb b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.10.bb new file mode 100644 index 0000000..6934c48 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.10.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ SOME/IP generator" + +LAUNCHER_BASE = "commonapi-someip-generator" +LAUNCHER_LINK = "capicxx-someip-gen" + +require capicxx-native.inc + +SRC_URI = "https://github.com/GENIVI/${_BPN}-tools/releases/download/${PV}/commonapi_someip_generator.zip" +SRC_URI[md5sum] = "edd260db732a4c45476e200b12cea1bd" +SRC_URI[sha256sum] = "259a4524a6d24208461d6bba77becefffb8fc65e972e2ccb60fae565d6c75e35" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb deleted file mode 100644 index d4eccb0..0000000 --- a/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ SOME/IP generator" - -LAUNCHER_BASE = "commonapi-someip-generator" -LAUNCHER_LINK = "capicxx-someip-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_someip_generator.zip" -SRC_URI[md5sum] = "23196ec64737ea85b96aa754d17cf01c" -SRC_URI[sha256sum] = "5135d9df40a27d29f60785db9812a65395e077b3e61f3beaa15d08c6094f8e0d" diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus/0001-common-api-dbus-runtime-replace-hard-coded-lib-dir-b.patch b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus/0001-common-api-dbus-runtime-replace-hard-coded-lib-dir-b.patch deleted file mode 100644 index e0b64a5..0000000 --- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus/0001-common-api-dbus-runtime-replace-hard-coded-lib-dir-b.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 174781bad5f910f30dfc4adcd6de3c49e1d99988 Mon Sep 17 00:00:00 2001 -From: Clement Dransart <clement.dransart@awtce.be> -Date: Wed, 15 Jun 2016 11:13:22 +0200 -Subject: [common-api-dbus-runtime][PATCH] replace hard-coded lib dir by - variable INSTALL_LIB_DIR - -Signed-off-by: Clement Dransart <clement.dransart@awtce.be> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2750c4e..d651494 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,7 +63,7 @@ set(INSTALL_INCLUDE_DIR include/CommonAPI-${COMMONAPI_API_HEADER_VERSION} CACHE - if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR cmake) - else() -- set(DEF_INSTALL_CMAKE_DIR lib/cmake/CommonAPI-DBus-${COMPONENT_VERSION}) -+ set(DEF_INSTALL_CMAKE_DIR ${INSTALL_LIB_DIR}/cmake/CommonAPI-DBus-${COMPONENT_VERSION}) - endif() - set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - -@@ -296,7 +296,7 @@ endif() - # create pkg-config file - if(NOT WIN32 AND PKG_CONFIG_FOUND) - configure_file(CommonAPI-DBus.pc.in ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc @ONLY) -- install(FILES ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc DESTINATION lib/pkgconfig) -+ install(FILES ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) - endif() - - ############################################################################## --- -1.9.1 - diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.10.4.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.10.4.bb new file mode 100644 index 0000000..bdcb55f --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.10.4.bb @@ -0,0 +1,20 @@ +SUMMARY = "CommonAPI-DBus" +SECTION = "libs" +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +PR = "r0" + +DEPENDS = "commonapi3 dbus" +REQUIRES = "commonapi3 dbus" + +SRCREV = "55559fa14073203f9efc53a6c20d0b92e9bb69e5" +SRC_URI = "git://github.com/GENIVI/capicxx-dbus-runtime.git;protocol=https" +S = "${WORKDIR}/git" + +inherit cmake lib_package pkgconfig +FILES_${PN}-dev += "${libdir}/cmake" + +EXTRA_OECMAKE = "-DINSTALL_LIB_DIR:PATH=${baselib} \ + -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/CommonAPI-DBus \ + " diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb deleted file mode 100644 index 479b01c..0000000 --- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "CommonAPI-DBus" -SECTION = "libs" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -PR = "r0" -DEPENDS = "commonapi3 dbus" -REQUIRES = "commonapi3 dbus" - -SRCREV = "3348a422ffc756b63de5890356383858a898e8b1" -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;protocol=http" -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr " -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" - -inherit cmake lib_package pkgconfig -FILES_${PN}-dev += "${libdir}/cmake" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-common-api-dbus-runtime-replace-hard-coded-lib-dir-b.patch" -EXTRA_OECMAKE = "-DINSTALL_LIB_DIR:PATH=${baselib} -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/CommonAPI-DBus" diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.10.4.bb index a35cef4..6a45298 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.10.4.bb @@ -5,18 +5,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" DEPENDS = "boost common-api-c++ vsomeip" -SRCREV = "e2b0e5cbf9a36be6896c5cef7b1ba4857e7111c4" -SRC_URI = "git://git.projects.genivi.org/common-api/cpp-someip-runtime.git;protocol=http " - +SRCREV = "fba300794f528c7b0e485d05c17f869cbdf0cc29" +SRC_URI = "git://github.com/GENIVI/capicxx-someip-runtime.git;protocol=https \ + " S = "${WORKDIR}/git" inherit cmake lib_package gitpkgv EXTRA_OECMAKE += "-DUSE_INSTALLED_COMMONAPI=ON" -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" FILES_${PN}-dev += "${libdir}/cmake" - RDEPENDS_${PN}-dev = "vsomeip-dev" BBCLASSEXTEND = "nativesdk" diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++/0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch b/meta-ivi/recipes-extended/common-api/common-api-c++/0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch deleted file mode 100644 index 43dc84c..0000000 --- a/meta-ivi/recipes-extended/common-api/common-api-c++/0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aa6c2d8bba7342da3c666b98070419a80b876d3a Mon Sep 17 00:00:00 2001 -From: Clement Dransart <clement.dransart@awtce.be> -Date: Tue, 7 Jun 2016 15:30:35 +0200 -Subject: [common-api-runtime][PATCH] replace hard-coded lib dir by - variable INSTALL_LIB_DIR - -Signed-off-by: Clement Dransart <clement.dransart@awtce.be> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 961674f..764f203 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,7 +56,7 @@ set(INSTALL_INCLUDE_DIR include/CommonAPI-${COMMONAPI_API_HEADER_VERSION} CACHE - if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR cmake) - else() -- set(DEF_INSTALL_CMAKE_DIR lib/cmake/CommonAPI-${COMPONENT_VERSION}) -+ set(DEF_INSTALL_CMAKE_DIR ${INSTALL_LIB_DIR}/cmake/CommonAPI-${COMPONENT_VERSION}) - endif() - set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - -@@ -229,7 +229,7 @@ endif() - # create pkg-config file - if(NOT WIN32 AND PKG_CONFIG_FOUND) - configure_file(CommonAPI.pc.in ${PROJECT_BINARY_DIR}/CommonAPI.pc @ONLY) -- install(FILES ${PROJECT_BINARY_DIR}/CommonAPI.pc DESTINATION lib/pkgconfig) -+ install(FILES ${PROJECT_BINARY_DIR}/CommonAPI.pc DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) - endif() - - ############################################################################## --- -1.9.1 - diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.10.1.bb index 94991a3..d0fa9d2 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.10.1.bb @@ -4,16 +4,14 @@ LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" PROVIDES = "commonapi3" -PR = "r1" +PR = "r0" DEPENDS = "dlt-daemon" inherit cmake lib_package pkgconfig -SRCREV = "77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407" - -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;protocol=http \ - file://0001-common-api-runtime-replace-hard-coded-lib-dir-by-var.patch \ +SRCREV = "436750026fb1a27944584513c7191d1bc83e9f0d" +SRC_URI = "git://github.com/GENIVI/capicxx-core-runtime.git;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.16.0.bb index be4d332..5509a85 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.16.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "dbus zlib" -SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" +SRCREV = "b2688c1c77d050dcbcaf85e5cd031b30262db935" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ diff --git a/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch deleted file mode 100644 index 97c63bd..0000000 --- a/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch +++ /dev/null @@ -1,72 +0,0 @@ -This is a workaround upstream suggests for use with kernel 4.1. - -Upstream-Status: Inappropriate [temporary work-around] -Signed-Off-By: Jussi Kukkonen <jussi.kukkonen@intel.com> - - - -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon Aug 3 18:23:12 PDT 2015 -Subject: [PATCH v3 libinput] touchpad: serial synaptics need to fake new touches on TRIPLETAP - -On the 4.1 kernels synaptics pretends to have 3 slots (the serial fw only does -2). This was added to avoid cursor jumps but has since been reverted for 4.2 -(kernel commit dbf3c37086, 4.1.3 is still buggy). In some cases a TRIPLETAP -may be triggered without slot 2 ever activating. - -While there are still those kernels out there, work around this bug by opening -a new touch point where none exists if the fake finger count exceeds the slot -count. - -Reported-by: Jan Alexander Steffens <jan.steffens at gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net> -Tested-by: Jan Alexander Steffens <jan.steffens at gmail.com> -Reviewed-by: Hans de Goede <hdegoede at redhat.com> ---- -Changes to v2: -- split out the handling instead of having a tmp state variable, see Hans' - comments from v2 - -Mainly sending this to the list again so I have a link to point people to. -If you're on 4.1.x add this patch to your distribution package. - - src/evdev-mt-touchpad.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index a683d9a..5ef03d5 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -369,13 +369,23 @@ tp_restore_synaptics_touches(struct tp_dispatch *tp, - for (i = 0; i < tp->num_slots; i++) { - struct tp_touch *t = tp_get_touch(tp, i); - -- if (t->state != TOUCH_END) -+ switch(t->state) { -+ case TOUCH_HOVERING: -+ case TOUCH_BEGIN: -+ case TOUCH_UPDATE: - continue; -- -- /* new touch, move it through begin to update immediately */ -- tp_new_touch(tp, t, time); -- tp_begin_touch(tp, t, time); -- t->state = TOUCH_UPDATE; -+ case TOUCH_NONE: -+ /* new touch, move it through to begin immediately */ -+ tp_new_touch(tp, t, time); -+ tp_begin_touch(tp, t, time); -+ break; -+ case TOUCH_END: -+ /* touch just ended ,we need need to restore it to update */ -+ tp_new_touch(tp, t, time); -+ tp_begin_touch(tp, t, time); -+ t->state = TOUCH_UPDATE; -+ break; -+ } - } - } - --- -2.4.3 - diff --git a/meta-ivi/recipes-graphics/wayland/libinput_1.3.0.bb b/meta-ivi/recipes-graphics/wayland/libinput_1.3.0.bb deleted file mode 100644 index cc21ea7..0000000 --- a/meta-ivi/recipes-graphics/wayland/libinput_1.3.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" - -DEPENDS = "libevdev udev mtdev" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ -" -SRC_URI[md5sum] = "5f8bc2c746bfbc9454143f78e5b477a9" -SRC_URI[sha256sum] = "998a75fb261d161efaa7da44411cdc9a32a953280e4ffc6322ca19f057d0c1ea" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" -PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" -PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" - -FILES_${PN} += "${libdir}/udev/" -FILES_${PN}-dbg += "${libdir}/udev/.debug" diff --git a/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb deleted file mode 100644 index ccd0ebb..0000000 --- a/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" - -inherit autotools pkgconfig diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.10.90.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb index 328d6e7..b7e5570 100644 --- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.10.90.bb +++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb @@ -5,8 +5,9 @@ BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Exten LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=176cedb32f48dd58f07e0c1c717b3ea4" -PR = "r1" -SRCREV = "e232017e0906557f468823505a49e92d4c94591c" +PR = "r0" + +SRCREV = "c9001582b10ce209c37b42dd560947c5aa8928b3" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" @@ -19,5 +20,6 @@ EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" FILES_${PN} += "${libdir}/weston/*" FILES_${PN}-dbg += "${libdir}/weston/.debug/*" +INSANE_SKIP_${PN} = "dev-deps" EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" diff --git a/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch deleted file mode 100644 index 6cc0f3b..0000000 --- a/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch +++ /dev/null @@ -1,29 +0,0 @@ -Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call -will fail if the host cpu is not recognised (which can happen when -e.g. Yocto builds for "allarch"). - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Backport [cc276dfa41] - -diff --git a/configure.ac b/configure.ac -index 5b48b1a..3d45a4b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4]) - - AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version]) - --AC_CANONICAL_HOST --AC_CANONICAL_BUILD -- - AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable]) - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then -- if test x$host = x$build; then -+ if test "x$cross_compiling" != "xyes"; then - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) - wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` - else --- -cgit v0.10.2 - diff --git a/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb b/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb deleted file mode 100644 index 86e89b5..0000000 --- a/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://dont-use-AC_CANONICAL.patch" -SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0" -SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f" - -inherit allarch autotools pkgconfig - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/meta-ivi/recipes-graphics/wayland/wayland_1.11.0.bb b/meta-ivi/recipes-graphics/wayland/wayland_1.11.0.bb deleted file mode 100644 index 08d2b2c..0000000 --- a/meta-ivi/recipes-graphics/wayland/wayland_1.11.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9" -SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0" - -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "expat libxml2 libffi wayland-native" - -EXTRA_OECONF = "--disable-documentation --with-host-scanner" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -sysroot_stage_all_append_class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" diff --git a/meta-ivi/recipes-graphics/wayland/weston-init.bb b/meta-ivi/recipes-graphics/wayland/weston-init.bb deleted file mode 100644 index 291cd16..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston-init.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -SRC_URI = "file://init \ - file://weston.service \ - file://weston-start" - -S = "${WORKDIR}" - -do_install() { - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start -} - -inherit allarch update-rc.d distro_features_check systemd - -# rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -RDEPENDS_${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/init b/meta-ivi/recipes-graphics/wayland/weston-init/init deleted file mode 100644 index 5c925f4..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston-init/init +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - - weston-start -s -- $OPTARGS - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/weston-start b/meta-ivi/recipes-graphics/wayland/weston-init/weston-start deleted file mode 100755 index 5b7604f..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston-init/weston-start +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <<EOF - $0 <openvt arguments> -- <weston options> -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -# Add openvt extra argument -add_openvt_argument() { - openvt_args="$openvt_args $1" -} - -if test $# -lt 2; then - usage - exit 1 -fi - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi -if [ -n "$DISPLAY" ]; then - launcher="weston" -else - launcher="weston-launch --" -fi - -openvt_args="" -while [ -n "$1" ]; do - openvt_args="$openvt_args $1" - shift - - if [ "$1" = "--" ]; then - shift - break - fi -done - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - done -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi -fi - -exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/weston.service b/meta-ivi/recipes-graphics/wayland/weston-init/weston.service deleted file mode 100644 index 689ce41..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston-init/weston.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Weston Wayland Compositor -RequiresMountsFor=/run - -[Service] -User=root -EnvironmentFile=-/etc/default/weston -ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS - -[Install] -WantedBy=multi-user.target - diff --git a/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch deleted file mode 100644 index bb1f1ef..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 11 May 2016 16:16:30 +0300 -Subject: [PATCH] configure.ac: Fix wayland-protocols path - -The wayland-protocols directory is used during build: Fix the path -to point to sysroot specified in recipe. - -Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that -breaks multilib weston as it would point to multilib sysroot when the -(allarch) wayland-protocols is actually in the machine sysroot. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Inappropriate [embedded specific] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac.orig 2016-06-30 18:28:23.586978429 +0900 -+++ a/configure.ac 2016-06-30 18:19:28.526994269 +0900 -@@ -187,7 +187,7 @@ - PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) - - PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], -- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) -+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) - - AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/meta-ivi/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta-ivi/recipes-graphics/wayland/weston/0001-make-error-portable.patch deleted file mode 100644 index 148848d..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH weston] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 src/weston-error.h - -diff --git a/configure.ac b/configure.ac -index 263fc22..f52cd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git a/src/weston-error.h b/src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/src/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#include <string.h> -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -30,7 +30,6 @@ - #include <poll.h> - #include <errno.h> - --#include <error.h> - #include <getopt.h> - - #include <sys/types.h> -@@ -56,6 +55,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - --- -2.1.4 - diff --git a/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch deleted file mode 100644 index 6bdd0c5..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 228349e796e9baa86f2ba8232c730c18ac41283d Mon Sep 17 00:00:00 2001 -From: Tom Hochstein <tom.hochstein@nxp.com> -Date: Fri, 13 May 2016 09:31:55 -0500 -Subject: [PATCH weston] weston-launch: Provide a default version that doesn't - require PAM - -weston-launch requires PAM for starting weston as a non-root user. - -Since starting weston as root is a valid use case by itself, if -PAM is not available, provide a default version of weston-launch -without non-root-user support. - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> ---- - Makefile.am | 3 --- - configure.ac | 12 +++++++----- - src/weston-launch.c | 20 ++++++++++++++++++++ - 3 files changed, 27 insertions(+), 8 deletions(-) - ---- a/configure.ac.orig 2016-06-30 18:30:49.058974122 +0900 -+++ a/configure.ac 2016-06-30 18:34:39.046967314 +0900 -@@ -418,11 +418,12 @@ - - AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) - AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes) --if test x$enable_weston_launch == xyes; then -+if test x$enable_weston_launch == xyes -a x$with_pam = xyes; then - WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) - if test x$have_pam == xno; then -- AC_ERROR([weston-launch requires pam]) -+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) - fi -+ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available]) - fi - - AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") -@@ -519,6 +520,9 @@ - AS_IF([test "x$have_systemd_login_209" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) - -+AC_ARG_WITH(pam, -+ AS_HELP_STRING([--with-pam], [Use PAM]), -+ [use_pam=$withval], [use_pam=yes]) - - # Note that other features might want libxml2, or this feature might use - # alternative xml libraries at some point. Therefore the feature and -@@ -673,6 +677,7 @@ - Enable developer documentation ${enable_devdocs} - - weston-launch utility ${enable_weston_launch} -+ PAM support ${with_pam} - systemd-login support ${have_systemd_login} - systemd notify support ${enable_systemd_notify} - ---- a/src/weston-launch.c.orig 2016-06-30 18:35:00.702966673 +0900 -+++ a/src/weston-launch.c 2016-06-30 18:38:29.186960500 +0900 -@@ -51,7 +51,9 @@ - - #include <pwd.h> - #include <grp.h> -+#ifdef HAVE_PAM - #include <security/pam_appl.h> -+#endif - - #ifdef HAVE_SYSTEMD_LOGIN - #include <systemd/sd-login.h> -@@ -93,8 +95,10 @@ - #endif - - struct weston_launch { -+#ifdef HAVE_PAM - struct pam_conv pc; - pam_handle_t *ph; -+#endif - int tty; - int ttynr; - int sock[2]; -@@ -181,6 +185,7 @@ - return false; - } - -+#ifdef HAVE_PAM - static int - pam_conversation_fn(int msg_count, - const struct pam_message **messages, -@@ -221,6 +226,7 @@ - - return 0; - } -+#endif - - static int - setup_launcher_socket(struct weston_launch *wl) -@@ -414,6 +420,7 @@ - close(wl->signalfd); - close(wl->sock[0]); - -+#ifdef HAVE_PAM - if (wl->new_user) { - err = pam_close_session(wl->ph, 0); - if (err) -@@ -421,6 +428,7 @@ - err, pam_strerror(wl->ph, err)); - pam_end(wl->ph, err); - } -+#endif - - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -600,6 +608,7 @@ - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -+#ifdef HAVE_PAM - env = pam_getenvlist(wl->ph); - if (env) { - for (i = 0; env[i]; ++i) { -@@ -608,6 +617,7 @@ - } - free(env); - } -+#endif - } - - static void -@@ -665,7 +675,9 @@ - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -+#ifdef HAVE_PAM - fprintf(stderr, " -u, --user Start session as specified username\n"); -+#endif - fprintf(stderr, " -t, --tty Start session on alternative tty\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); - fprintf(stderr, " -h, --help Display this help message\n"); -@@ -678,7 +690,9 @@ - int i, c; - char *tty = NULL; - struct option opts[] = { -+#ifdef HAVE_PAM - { "user", required_argument, NULL, 'u' }, -+#endif - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -690,9 +704,13 @@ - while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { - switch (c) { - case 'u': -+#ifdef HAVE_PAM - wl.new_user = optarg; - if (getuid() != 0) - error(1, 0, "Permission denied. -u allowed for root only"); -+#else -+ error(1, 0, "-u is unsupported in this weston-launch build"); -+#endif - break; - case 't': - tty = optarg; -@@ -729,9 +747,11 @@ - - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); -- -+ -+#ifdef HAVE_PAM - if (wl.new_user && setup_pam(&wl) < 0) - exit(EXIT_FAILURE); -+#endif - - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); diff --git a/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch b/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch deleted file mode 100644 index 25c8683..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e8b615250f700f7854b423aaaf0a0aeea92c05a9 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein <tom.hochstein@nxp.com> -Date: Sat, 7 May 2016 08:51:58 -0300 -Subject: [PATCH] weston-launch: Handle invalid command line options -Organization: O.S. Systems Software LTDA. - -Exit the program if an unrecognized command line option is found. - -Upstream-Status: Submitted - -Signed-off-by; Tom Hochstein <tom.hochstein@nxp.com> -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - - src/weston-launch.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/weston-launch.c b/src/weston-launch.c -index b8dfb17..9987d8e 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -703,6 +703,8 @@ main(int argc, char *argv[]) - case 'h': - help("weston-launch"); - exit(EXIT_FAILURE); -+ default: -+ exit(EXIT_FAILURE); - } - } - --- -2.8.2 - diff --git a/meta-ivi/recipes-graphics/wayland/weston/weston.desktop b/meta-ivi/recipes-graphics/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-ivi/recipes-graphics/wayland/weston/weston.png b/meta-ivi/recipes-graphics/wayland/weston/weston.png Binary files differdeleted file mode 100644 index ea8b7e0..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/weston.png +++ /dev/null diff --git a/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start b/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start deleted file mode 100644 index b483c97..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" -fi diff --git a/meta-ivi/recipes-graphics/wayland/weston_1.11.0.bb b/meta-ivi/recipes-graphics/wayland/weston_1.11.0.bb deleted file mode 100644 index 391a3f1..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston_1.11.0.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://0001-make-error-portable.patch \ - file://0001-configure.ac-Fix-wayland-protocols-path.patch \ - file://xwayland.weston-start \ - file://make-weston-launch-exit-for-unrecognized-option.patch \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ -" -SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2" -SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125" - -inherit autotools pkgconfig useradd distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" - -EXTRA_OECONF = "--enable-setuid-install \ - --disable-rpi-compositor \ - --disable-rdp-compositor \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ - " -EXTRA_OECONF[vardepsexclude] = "MACHINE" - -EXTRA_OECONF_append_qemux86 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -EXTRA_OECONF_append_qemux86-64 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - clients launch" -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" -# Weston on X11 -PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" -# weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" -# Weston with cairo glesv2 support -PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" -# Weston with lcms support -PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" -# Weston with unwinding support -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland" -# colord CMS support -PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" -# Clients support -PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" -# Weston with PAM support -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/weston/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi -} - -PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}" -PACKAGES += "${PN}-examples" - -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" -FILES_${PN}-examples = "${bindir}/*" - -FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "liberation-fonts" -RRECOMMENDS_${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb index 4144bd9..907f771 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb @@ -1,18 +1,18 @@ SUMMARY = "Genivi AudioManager" HOMEPAGE = "https://www.genivi.org/" SECTION = "multimedia" - LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" +PR = "r1" + DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" -SRCREV = "5bcd206b9270d9a79e212f91723ea1a08a4d4859" +SRCREV = "fe056279dde92475f29a35f8c0c6c5a41dc59a8b" SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ + git://github.com/GENIVI/AudioManager.git;protocol=https \ file://AudioManager.service \ file://setup_amgr.sh \ - file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb index aa731d7..d8603af 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -1,16 +1,17 @@ SUMMARY = "Genivi AudioManager Plugins" HOMEPAGE = "https://www.genivi.org/" SECTION = "multimedia" - LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" +PR = "r1" + DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" RDEPENDS_${PN} += "libxml2" -SRCREV = "8096eee2649585d13464b23e9ab940f0e030c56a" +SRCREV = "cb5797de3df41f4661c3055b0ea1a3e677c293aa" SRC_URI = " \ - git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + git://github.com/GENIVI/AudioManagerPlugins.git;branch=master;protocol=https \ file://AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch \ " S = "${WORKDIR}/git" @@ -29,6 +30,8 @@ do_configure_prepend() { perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerCore\)|' ${S}/CMakeLists.txt perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager\)|' ${S}/CMakeLists.txt + perl -pi -e 's|\${CMAKE_INSTALL_PREFIX}/etc/controllerconf|/etc/controllerconf|' ${S}/PluginControlInterfaceGeneric/CMakeLists.txt + perl -pi -e 's|set\(LIBRARY_OUTPUT_PATH \${DEFAULT_PLUGIN_ROUTING_DIR}\)|set\(LIBRARY_OUTPUT_PATH ${B}\)|' ${S}/PluginRouting*/CMakeLists.txt perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake @@ -49,7 +52,6 @@ FILES_${PN}-dev = " \ " do_install_append() { - mv ${D}${libdir}/audiomanager/routing/* ${D}${libdir}/routing/ - rmdir ${D}${libdir}/audiomanager/routing + mv ${D}${libdir}/audiomanager/* ${D}${libdir}/ rmdir ${D}${libdir}/audiomanager } diff --git a/meta-ivi/recipes-yocto-ivi/images/miranda-image.bb b/meta-ivi/recipes-yocto-ivi/images/nostromo-image.bb index ac81d2a..c9a1f66 100644 --- a/meta-ivi/recipes-yocto-ivi/images/miranda-image.bb +++ b/meta-ivi/recipes-yocto-ivi/images/nostromo-image.bb @@ -1,5 +1,5 @@ # Base this image on generic IVI image require recipes-yocto-ivi/images/ivi-image.bb -PV = "11.0.0" +PV = "12.0.0" diff --git a/scripts/checkout b/scripts/checkout new file mode 100755 index 0000000..ec892b3 --- /dev/null +++ b/scripts/checkout @@ -0,0 +1,9 @@ +#!/bin/sh +# (C) 2016-10-25 Yong-iL Joh +# License: MPLv2 + +export LANG=C +MYDIR=$(dirname "$0") + +$MYDIR/checkout_layer_hash.sh poky +$MYDIR/checkout_layer_hash.sh meta-openembedded diff --git a/scripts/checkout_layer_hash.sh b/scripts/checkout_layer_hash.sh new file mode 100755 index 0000000..a00dda4 --- /dev/null +++ b/scripts/checkout_layer_hash.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# (C) 2015-12-12 Gunnar Andersson +# (C) 2016-10-25 Yong-iL Joh +# License: MPLv2 + +fail() { + echo "FAILED." + [ -n "$1" ] && echo "Message: " $@ + exit 1 +} + +# Store the location of these scripts +_DIR=$(dirname "$0") +META_IVI=$(readlink -f $_DIR/..) +MYDIR=$(readlink -f $_DIR) + +layer=$1 +[ -z "$layer" ] && fail "No layer name given" + +# Extract revision from README in meta-ivi +cd "$META_IVI" || fail "Can't cd to meta-ivi directory" +revision=$($MYDIR/get_layer_info_from_README.sh $layer revision) +uri=$($MYDIR/get_layer_info_from_README.sh $layer URI) + +# Fail if we could not fetch revision +[ -z "$revision" ] && fail "Revision extracted from README was empty" + +# Checkout the right revision in this layer +if [ ! -d "$META_IVI/../$layer/.git" ]; then + if [ -e "$META_IVI/../$layer" ]; then + rm -rf "$META_IVI/../$layer" + else + cd "$META_IVI/.." + git clone $uri + fi +fi +cd "$META_IVI/../$layer" || fail "Can't cd to layer directory ($layer)" +git checkout $revision diff --git a/scripts/get_layer_info_from_README.sh b/scripts/get_layer_info_from_README.sh new file mode 100755 index 0000000..25bc9b2 --- /dev/null +++ b/scripts/get_layer_info_from_README.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# (C) Gunnar Andersson 2015-12-12 +# License: MPLv2 + +# This fetches information about layer dependencies +# as documented in meta-ivi README. +# revision, branch name, or sub layer name can be extracted + +README=README.md +DEBUG=false + +layer=$1 +what=$2 + +[ -z "$layer" -o -z "$what" ] && { echo "Usage: $0 <layername> <branch|revision>" ; exit 1 ; } + +fail() { + echo "*** FAILED ***" + [ -n "$1" ] && echo "Message: " $@ + exit 1 +} + +sanity_check_num_lines() { + what=$1 ; min=$2 ; max=$3 + + numlines="$(wc -l)" # < Reads from stdin + + if [ $numlines -lt $min ] ; then + fail "Sanity check: It looks like section $what has $numlines lines, and that is not enough. Please check what is wrong." + fi + + if [ $numlines -gt $max ] ; then + fail "Sanity check: It looks like section $what has $numlines lines, and that is more than expected. Please check what is wrong." + fi +} + +[ -f ./$README ] || fail "Cannot find README.md. (Current directory is $PWD)" + +# Extract relevant section of the README +dependency_section=$( <$README \ + sed -n '/Layer Dependencies/,/known to work/p' |\ + egrep 'URI:|branch:|layer:|revision:') + +# Debug printouts... +$DEBUG && echo "OK, found the following layer info in dependency section:" +$DEBUG && cat <<EOT +$dependency_section +EOT + +cat <<EOT | sanity_check_num_lines "Layer Dependencies Section" 6 20 +$dependency_section +EOT + +# Get only this layer's information +layer_info=$( +cat <<EOT | sed -n "/URI:.*$layer/,/URI:/p" | sed 's/> //' | head -4 +$dependency_section +EOT +) + +# Get value for item "what" +value=$( +cat <<EOT | grep "$what" | awk '{print $2}' +$layer_info +EOT +) + +# Check again - now only one line expected... +cat <<EOT | sanity_check_num_lines "$what information for $layer" 1 1 +$value +EOT + +# OK, this should be it: +echo $value + + +# Example README format: +# +#Layer Dependencies +#------------------ +# +#URI: git://git.yoctoproject.org/poky +#> branch: fido +#> revision: eb4a134a60e3ac26a48379675ad6346a44010339 +# +#URI: git://git.openembedded.org/meta-openembedded +#> layer: meta-oe +#> branch: fido +#> revision: 5b0305d9efa4b5692cd942586fb7aa92dba42d59 + |
