diff options
Diffstat (limited to 'meta-ivi/recipes-extended')
27 files changed, 185 insertions, 557 deletions
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 new file mode 100644 index 0000000..3e9c36c --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.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 = "${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.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb new file mode 100644 index 0000000..66b90a8 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.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 = "${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 new file mode 100644 index 0000000..425d384 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-native.inc @@ -0,0 +1,53 @@ +SECTION = "devel" +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])}" + +def get_launcher_name(d): + BS = d.getVar('BUILD_SYS', True) + if BS == "x86_64-linux": + launcherName = "${LAUNCHER_BASE}-linux-x86_64" + elif BS == "i686-linux": + launcherName = "${LAUNCHER_BASE}-linux-x86" + else: + bb.fatal("Build system '%s' is not supported by ${PN}_${PV} recipe" % BS) + return launcherName + +LAUNCHER = "${@get_launcher_name(d)}" + +inherit native +SANITY_REQUIRED_UTILITIES += "java" + +S = "${WORKDIR}" +DD = "${D}${datadir}/${PN}-${PV}" + +do_install() { + # work around for java-8 + java_version=`java -version 2>&1 | head -n 1 | grep '[ "]1\.8[\. "$$]' || true;` + if [ "x${java_version}" != "x" ]; then + for i in x86 x86_64; do + perl -pi -e 's|-XX:PermSize=128m||' ${S}/${LAUNCHER_BASE}-linux-${i}.ini + done + fi + + install -d ${DD} + install -m 0644 ${S}/artifacts.xml ${DD} + install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86 ${DD} + install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86.ini ${DD} + install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86_64 ${DD} + install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86_64.ini ${DD} + for dir in ./configuration ./features ./plugins; do + for item in $(find ${dir} -name '*' -print); do + if [ -d ${item} ]; then + install -d ${DD}/${item} + else + install -m 0644 ${S}/${item} ${DD}/$(dirname ${item}) + fi + done + done + install -d "${D}${bindir}" + ln -sf -T "${DD}/${LAUNCHER}" ${D}${bindir}/${LAUNCHER_LINK} +} 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 new file mode 100644 index 0000000..d4eccb0 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.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 = "${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++-someip_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb new file mode 100644 index 0000000..a35cef4 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "Genivi CommonAPI-SomeIP" +SECTION = "libs" +LICENSE = "MPLv2" +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 " + +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/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch deleted file mode 100644 index 5bf6bf8..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8080b7395c1638baee60fb3c46667f21e00b87fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Erik=20Bot=C3=B6?= <erik.boto@pelagicore.com> -Date: Fri, 4 Apr 2014 10:59:18 +0200 -Subject: [PATCH 1/4] Fix build with systemd >= 209 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Erik Botö <erik.boto@pelagicore.com> ---- - src/system/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt -index ce87914..1d0d224 100644 ---- a/src/system/CMakeLists.txt -+++ b/src/system/CMakeLists.txt -@@ -23,7 +23,7 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin - dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) - add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) - if(WITH_SYSTEMD_JOURNAL) -- target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) -+ target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd) - else(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) - endif(WITH_SYSTEMD_JOURNAL) --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch index 40c5afb..1688479 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch @@ -7,85 +7,75 @@ Upstream-Status: Inappropriate [Configuration Specific] Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> --- systemd/dlt-adaptor-udp.service.cmake | 1 - - systemd/dlt-dbus.service.cmake | 1 - systemd/dlt-example-user.service.cmake | 1 - systemd/dlt-receive.service.cmake | 1 - systemd/dlt-system.service.cmake | 1 - systemd/dlt.service.cmake | 1 - - 6 files changed, 6 deletions(-) + 5 files changed, 5 deletions(-) diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index 0c39637..f446757 100644 +index 8dac1f2..ecf9f9e 100644 --- a/systemd/dlt-adaptor-udp.service.cmake +++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -20,7 +20,6 @@ Wants=dlt.service +@@ -21,9 +21,8 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ LimitCORE=infinity -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index 2727c2d..d1e3b12 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -21,7 +21,6 @@ Wants=dlt.service -
- [Service]
- Type=Simple
--User=root
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+ [Install] +-WantedBy=multi-user.target +\ No newline at end of file ++WantedBy=multi-user.target diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index 3652292..b67a83c 100644 +index b665742..35009b0 100644 --- a/systemd/dlt-example-user.service.cmake +++ b/systemd/dlt-example-user.service.cmake -@@ -20,6 +20,5 @@ Wants=dlt.service +@@ -21,6 +21,5 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity +-LimitCORE=infinity \ No newline at end of file ++LimitCORE=infinity diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index b92c8b2..4bbdfc2 100644 +index c07d447..8f88f00 100644 --- a/systemd/dlt-receive.service.cmake +++ b/systemd/dlt-receive.service.cmake -@@ -21,6 +21,5 @@ Wants=dlt.service +@@ -22,6 +22,5 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity +-LimitCORE=infinity \ No newline at end of file ++LimitCORE=infinity diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index f5e844b..7ec995c 100755 +index 0e91f42..1a5b913 100755 --- a/systemd/dlt-system.service.cmake +++ b/systemd/dlt-system.service.cmake -@@ -21,7 +21,6 @@ Wants=dlt.service -
- [Service]
- Type=Simple
--User=genivi
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+@@ -22,7 +22,6 @@ Wants=dlt.service + + [Service] + Type=simple +-User=@DLT_USER@ + ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system + WatchdogSec=@DLT_WatchdogSec@ + NotifyAccess=main diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 22279c4..7bb05bc 100755 +index 0b3ee2c..e4753a2 100755 --- a/systemd/dlt.service.cmake +++ b/systemd/dlt.service.cmake -@@ -20,7 +20,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) +@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon WatchdogSec=@DLT_WatchdogSec@ NotifyAccess=main --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch deleted file mode 100644 index 691a500..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6804c68ed61f4436818c58cb0abe1c21b4d48aea Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Tue, 18 Nov 2014 15:48:50 +0100 -Subject: [PATCH 3/4] systemd/*: unit type should be in lowercase, so use - Type=simple - -Upstream-Status: Submitted [http://lists.genivi.org/pipermail/genivi-diagnostic-log-and-trace/2014-October/000546.html] -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> ---- - systemd/dlt-adaptor-udp.service.cmake | 2 +- - systemd/dlt-dbus.service.cmake | 2 +- - systemd/dlt-example-user.service.cmake | 2 +- - systemd/dlt-receive.service.cmake | 2 +- - systemd/dlt-system.service.cmake | 2 +- - systemd/dlt.service.cmake | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index f446757..81a7158 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messag - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index d1e3b12..75dcdc3 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-dbus(1) man:dlt-dbus.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b67a83c..fe9c567 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -19,6 +19,6 @@ Description=GENIVI DLT example user. Generate DLT messages and store them to fil - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index 4bbdfc2..3b47dd3 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -20,6 +20,6 @@ Documentation=man:dlt-receive(1) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 7ec995c..d4a4c96 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-system(1) man:dlt-system.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 7bb05bc..5386ffd 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT logging daemon - Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch index df762f3..685dfcd 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch @@ -9,19 +9,16 @@ Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> systemd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt -index a9838e4..c8feae5 100644 ---- a/systemd/CMakeLists.txt -+++ b/systemd/CMakeLists.txt -@@ -16,7 +16,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6b44a2..0e885bf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) - if(WITH_SYSTEMD) + set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c) -- set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/system ) -+ set(SYSTEMD_CONFIGURATIONS_FILES_DIR /lib/systemd/system ) - - if(WITH_SYSTEMD_WATCHDOG) - set( DLT_WatchdogSec 2 ) --- -1.9.3 - +- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH ++ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH + "Set directory to install systemd unit files") + + add_subdirectory( systemd ) diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch deleted file mode 100644 index cbf049c..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 39a5c3136ee0f84e29fe3c8121b3b61142a8a76f Mon Sep 17 00:00:00 2001 -From: Clement Dransart <clement.dransart@awtce.be> -Date: Tue, 7 Jun 2016 11:02:12 +0200 -Subject: [meta-ivi][PATCH] Fix OE cmake installation dir - -Signed-off-by: Clement Dransart <clement.dransart@awtce.be> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46beec0..ad62848 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,7 +112,7 @@ ELSE (${WITH_DOC} STREQUAL "OFF") - SET(PACKAGE_DOC "")
- ENDIF(${WITH_DOC} STREQUAL "OFF")
-
--set(LIB_INSTALL_DIR lib${LIB_SUFFIX})
-+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-
- configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)
- configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
--- -1.9.1 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb index e3ad60b..8ab95d1 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb @@ -10,18 +10,15 @@ logging facility providing: \ HOMEPAGE = "https://www.genivi.org/" SECTION = "console/utils" LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ - file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "dbus zlib" -SRCREV = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;branch=v2.11.x;protocol=http \ - file://0001-Fix-build-with-systemd-209.patch \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \ - file://0004-Modify-systemd-config-directory.patch \ - file://0005-Fix-OE-cmake-installation-dir.patch" +SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" +SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ + file://0004-Modify-systemd-config-directory.patch \ + " S = "${WORKDIR}/git" inherit gzipnative autotools gettext cmake systemd diff --git a/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch b/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch deleted file mode 100644 index 076eaff..0000000 --- a/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libitzam-6.0.4/configure.ac -=================================================================== ---- libitzam-6.0.4.orig/configure.ac 2011-09-17 20:16:04.000000000 +0300 -+++ libitzam-6.0.4/configure.ac 2014-02-24 13:43:02.000000000 +0200 -@@ -1,7 +1,7 @@ - AC_INIT(src/itzam.h) - AC_CONFIG_MACRO_DIR([m4]) - --GENERIC_LIBRARY_NAME=libitzam -+GENERIC_LIBRARY_NAME=itzam - - #release versioning - GENERIC_MAJOR_VERSION=6 diff --git a/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb b/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb deleted file mode 100644 index 07b5a47..0000000 --- a/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "itzam/C" - -HOMEPAGE = "https://www.genivi.org/" -SECTION = "base" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LicenseOpenSource.txt;md5=757d512d8e160c938b85a8b6487cd126" - -SRC_URI = "http://coyotegulch.scottrobertladd.net/products/itzam/c/libitzam-6.0.4.tar.gz \ - file://libitzam_pc.patch \ - " - -SRC_URI[md5sum] = "333f680c21037e32b4000933eae27721" -SRC_URI[sha256sum] = "d5b565a9d96275e3bf39ea2dd0b121a92b578819650a09fc5add4f4113df734d" - -PR = "r2" - -inherit autotools - -do_configure_prepend() { - # Add necesary files - touch ${S}/INSTALL ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog -} - -do_install_prepend() { - mkdir -p ${D}/usr/lib/pkgconfig - cp ${B}/libitzam.pc ${D}/usr/lib/pkgconfig -} - -FILES_${PN}-dev += "/usr/lib/pkgconfig/*" diff --git a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb index 9d92364..755fe85 100644 --- a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb +++ b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" PR = "r4" SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;branch=genivi-excalibur;protocol=http \ +SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;nobranch=1;protocol=http \ file://use-systemd-unit-dir.patch \ file://fix-no-libsystemd-daemon.patch \ " diff --git a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb index 58a3830..a2b0fdc 100644 --- a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb +++ b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb @@ -11,7 +11,7 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "dd4a86b9459537d2e85489b36abf80f34d12f098" +SRCREV = "0894ea63e0b86afcee3a45baa10abc6b8be4ad44" SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;protocol=http \ file://nsm-fix-systemd-service-dep.patch \ file://nsm-fix-no-libsystemd-daemon.patch \ @@ -19,7 +19,7 @@ SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" -PR = "r1" +PR = "r2" EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}" @@ -49,7 +49,8 @@ FILES_${PN} += "\ " do_install_append() { - rm -f ${D}${bindir}/NodeStateTest - rm -f ${D}${libdir}/libNodeStateMachineTest.* - rm -f ${D}${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml -} + T_XML=${D}/${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml + if [ -f ${T_XML} ]; then + rm -f ${T_XML} + fi +}
\ No newline at end of file diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch deleted file mode 100644 index 99bb684..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 23b3053a7062ba38cf39e1b0caeb5ec006287d68 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Mon, 22 Jun 2015 22:21:50 +0200 -Subject: [PATCH] Add support for json-c > 0.12 - -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> -Upstream-Status: Submitted [http://bugs.genivi.org/show_bug.cgi?id=354] ---- - Administrator/src/ssw_pers_admin_config.c | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Administrator/src/ssw_pers_admin_config.c b/Administrator/src/ssw_pers_admin_config.c -index 62671a5..c52af16 100644 ---- a/Administrator/src/ssw_pers_admin_config.c -+++ b/Administrator/src/ssw_pers_admin_config.c -@@ -25,7 +25,7 @@ - * - **********************************************************************************************************************/ - --#include <json/json.h> -+#include <json-c/json.h> - - #include <sys/types.h> - #include <sys/stat.h> -diff --git a/configure.ac b/configure.ac -index 5207334..48ed91f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0]) - PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5]) - PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) - PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) --PKG_CHECK_MODULES([JSON], [json >= 0.9]) -+PKG_CHECK_MODULES([JSON], [json-c >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) - --- -2.1.0 - diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch deleted file mode 100644 index a52f88f..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 887c1367ba633357abe13dde39363f2a9da4c6c6 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 16:39:21 +0100 -Subject: [[PATCH] configure.ac: fix typo libperscommon - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5207334..6e1b2dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,7 +113,7 @@ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.4.10]) - PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0]) - PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5]) - PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) --PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) -+PKG_CHECK_MODULES([PERSCOMMON], [persistence_client_library >= 1.0.1]) - PKG_CHECK_MODULES([JSON], [json >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch deleted file mode 100644 index 866a2c3..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f1fde52..44a1045 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,7 +116,7 @@ PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) - PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) - PKG_CHECK_MODULES([JSON], [json >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) --PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) -+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 37 ]) - - AC_SUBST(DEPS_CFLAGS) - AC_SUBST(DEPS_LIBS) diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb index 1d1adc5..9f6a280 100644 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb +++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb @@ -6,16 +6,14 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1" +SRCREV = "47e5a424c8ef6e33565737f20d3bd81f69c8efc9" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-administrator.git;protocol=http \ - file://libsystemd_daemon.patch \ - file://0001-Add-support-for-json-c-0.12.patch \ " S = "${WORKDIR}/git" DEPENDS = "glib-2.0 dbus dlt-daemon libarchive zlib json-c node-state-manager \ - systemd persistence-common-object libffi libitzam" + systemd persistence-common-object libffi" inherit autotools-brokensep systemd pkgconfig diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch index 5bf6aae..2c3958b 100644 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch @@ -5,25 +5,22 @@ Subject: [PATCH] load correct version of libpers_common Signed-off-by: Igor Socec <igor.socec@pelagicore.com> --- - config/pclCustomLibConfigFile.cfg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + config/pclCustomLibConfigFile.cfg.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg -index fe95ea0..f8e0877 100644 ---- a/config/pclCustomLibConfigFile.cfg -+++ b/config/pclCustomLibConfigFile.cfg -@@ -1,8 +1,8 @@ - hwinfo /usr/lib/libhwinfoperscustom.so init async - secure /usr/lib/libsecureperscustom.so od sync - custom3 /usr/lib/libcustom3perscustom.so init sync --default /usr/lib/libpers_common.so.1 init sync -+default /usr/lib/libpers_common.so.0 init sync - emergency /usr/lib/libemergencyperscustom.so od async - early /usr/lib/libearlyperscustom.so od sync +diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in +index 185cab4..fe95b18 100644 +--- a/config/pclCustomLibConfigFile.cfg.in ++++ b/config/pclCustomLibConfigFile.cfg.in +@@ -1,7 +1,7 @@ + hwinfo @prefix@/lib/libhwinfoperscustom.so init async + secure @prefix@/lib/libsecureperscustom.so od sync + custom3 @prefix@/lib/libcustom3perscustom.so init sync +-default @prefix@/lib/libpers_common.so init sync ++default @prefix@/lib/libpers_common.so.0 init sync + emergency @prefix@/lib/libemergencyperscustom.so od async + early @prefix@/lib/libearlyperscustom.so od sync anInvalidEntry /wrongPath/wrongLib do cnys --custom2 /usr/lib/libcustom2perscustom.so init sync -\ No newline at end of file -+custom2 /usr/lib/libcustom2perscustom.so init sync --- -2.1.4 +-- +1.9.1 diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch deleted file mode 100644 index 8b60de1..0000000 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 9ee8b6a522e2b1f731799690ac78da40f26e1bb7 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico.cadete@awtce.be> -Date: Wed, 8 Jun 2016 14:43:53 +0200 -Subject: [PATCH] plugin conf file: rework to use @libdir@ from autotools - -Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be> ---- - Makefile.am | 15 ++++++++++++++- - config/pclCustomLibConfigFile.cfg | 8 -------- - config/pclCustomLibConfigFile.cfg.in | 8 ++++++++ - config/pclCustomLibConfigFileEmpty.cfg | 0 - config/pclCustomLibConfigFileEmpty.cfg.in | 0 - configure.ac | 1 + - 6 files changed, 23 insertions(+), 9 deletions(-) - delete mode 100644 config/pclCustomLibConfigFile.cfg - create mode 100644 config/pclCustomLibConfigFile.cfg.in - delete mode 100644 config/pclCustomLibConfigFileEmpty.cfg - create mode 100644 config/pclCustomLibConfigFileEmpty.cfg.in - -diff --git a/Makefile.am b/Makefile.am -index 51b4104..7e42f63 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,15 +6,28 @@ SUBDIRS+=test - endif - - # Write the config file for customer plugins to the config destination --sysconf_DATA = config/pclCustomLibConfigFile.cfg \ -+libconffiles = config/pclCustomLibConfigFile.cfg \ - config/pclCustomLibConfigFileEmpty.cfg - -+libconffiles_subst = $(SED) \ -+ -e 's|@libdir[@]|$(libdir)|g' -+ -+$(libconffiles): -+ $(libconffiles_subst) '$(abs_top_srcdir)/$@.in' > $@ -+ -+config/pclCustomLibConfigFile.cfg: config/pclCustomLibConfigFile.cfg.in -+config/pclCustomLibConfigFileEmpty.cfg: config/pclCustomLibConfigFileEmpty.cfg.in -+ - # Add config file to distribution -+sysconf_DATA = $(libconffiles) - EXTRA_DIST = $(sysconf_DATA) - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=persistence_client_library.pc - -+CLEANFILES = \ -+ $(libconffiles) -+ - MAINTAINERCLEANFILES = \ - Makefile.in aclocal.m4 compile config.guess config.h.in config.sub \ - configure depcomp install-sh ltmain.sh persistence_client_library.pc config.h.in~ Makefile missing -diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg -deleted file mode 100644 -index 305cb7c..0000000 ---- a/config/pclCustomLibConfigFile.cfg -+++ /dev/null -@@ -1,8 +0,0 @@ --hwinfo /usr/lib/libhwinfoperscustom.so init async --secure /usr/lib/libsecureperscustom.so od sync --custom3 /usr/lib/libcustom3perscustom.so init sync --default /usr/lib/libpers_common.so.0 init sync --emergency /usr/lib/libemergencyperscustom.so od async --early /usr/lib/libearlyperscustom.so od sync --anInvalidEntry /wrongPath/wrongLib do cnys --custom2 /usr/lib/libcustom2perscustom.so init sync -diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in -new file mode 100644 -index 0000000..8527211 ---- /dev/null -+++ b/config/pclCustomLibConfigFile.cfg.in -@@ -0,0 +1,8 @@ -+hwinfo @libdir@/libhwinfoperscustom.so init async -+secure @libdir@/libsecureperscustom.so od sync -+custom3 @libdir@/libcustom3perscustom.so init sync -+default @libdir@/libpers_common.so.0 init sync -+emergency @libdir@/libemergencyperscustom.so od async -+early @libdir@/libearlyperscustom.so od sync -+anInvalidEntry /wrongPath/wrongLib do cnys -+custom2 @libdir@/libcustom2perscustom.so init sync -diff --git a/config/pclCustomLibConfigFileEmpty.cfg b/config/pclCustomLibConfigFileEmpty.cfg -deleted file mode 100644 -index e69de29..0000000 -diff --git a/config/pclCustomLibConfigFileEmpty.cfg.in b/config/pclCustomLibConfigFileEmpty.cfg.in -new file mode 100644 -index 0000000..e69de29 -diff --git a/configure.ac b/configure.ac -index 2ae0042..649f9c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -193,6 +193,7 @@ esac], - - AM_CONDITIONAL(DEBUG, test x"$debug" = x"true") - -+AC_PROG_SED - - AC_CONFIG_FILES([Makefile - persistence_client_library.pc --- -1.9.1 - diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb index c423f70..1445a8d 100644 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb @@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823" DEPENDS = "dlt-daemon dbus libcheck persistence-common-object" -SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e" +SRCREV = "fe4b73dcc282932ae3ebb8805e0b617a0016dc9a" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-client-library.git;protocol=http \ file://0001-load-correct-version-of-libpers_common.patch \ file://0001-fix-exec-path.patch \ - file://0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch deleted file mode 100644 index 1f75b2f..0000000 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0f5eca77f55f7236b51016e0d7573c078c895640 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 18:29:45 +0100 -Subject: [[PATCH] persComTypes.h: Bug 251 work around - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - inc/protected/persComTypes.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/inc/protected/persComTypes.h b/inc/protected/persComTypes.h -index 47a6664..7a312b4 100644 ---- a/inc/protected/persComTypes.h -+++ b/inc/protected/persComTypes.h -@@ -83,7 +83,7 @@ typedef __s64 INT64; - typedef __u8 uint8_t; - typedef __u16 uint16_t; - typedef __u32 uint32_t; --typedef __u64 uint64_t; -+//typedef __u64 uint64_t; - #endif - - /** -@@ -203,7 +203,7 @@ typedef sint32_t* psint32_t; - /** - * \brief Pointer to UNSIGNED-64-Bit - */ --typedef uint64_t* puint64_t; -+//typedef uint64_t* puint64_t; - /** - * \brief Pointer to SIGNED-64-Bit - */ --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch deleted file mode 100644 index ac760ae..0000000 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d4aa6cf7344c3d1b244fdddfe95d8300f35aa157 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 17:08:08 +0100 -Subject: [[PATCH] configure.ac: fix typo - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index badd5c6..88e8a63 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ m4_define([PERSCOMMON_LIB_VERSION_N],[1001001]) - dnl *************************** - dnl *** Initialize autoconf *** - dnl *************************** --AC_INIT([persistence-common],[LIBPERSOCOMMON_VERSION_S()]) -+AC_INIT([persistence-common],[PERSCOMMON_PACKAGE_VERSION_S]) - AC_COPYRIGHT([Copyright (c) 2012 Continental Automotive GmbH]) - AC_PREREQ([2.50]) - --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb index 240c2a6..16ed3a5 100644 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb +++ b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb @@ -5,15 +5,13 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "b27fe577fcef7bf57d8d287f56e8dfd6ac60b1f0" +SRCREV = "395b0f504e05ee6c59c1b9d9267c793e072a19ba" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-common-object.git;protocol=http \ - file://configure.ac-fix-typo.patch \ - file://B251_typedef_uint64_t.patch \ " S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 libitzam dlt-daemon" +DEPENDS = "glib-2.0 dlt-daemon" inherit autotools-brokensep pkgconfig diff --git a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 b/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 deleted file mode 100644 index 64d71cb..0000000 --- a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 +++ /dev/null @@ -1,7 +0,0 @@ - -# vexpress A9 ports -ttyAMA0 -ttyAMA1 -ttyAMA2 -ttyAMA3 - diff --git a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend b/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend deleted file mode 100644 index dda8d60..0000000 --- a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -SRC_URI_append_vexpressa9 = " file://securetty-vea9" - -do_configure_prepend_vexpressa9 () { - cat ${WORKDIR}/securetty-vea9 >> ${WORKDIR}/securetty -} |