diff options
13 files changed, 116 insertions, 11 deletions
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 index 1426d9c..1c66e20 100644 --- 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 @@ -7,7 +7,7 @@ DEPENDS = "commonapi3 dbus" REQUIRES = "commonapi3 dbus" SRCREV = "3348a422ffc756b63de5890356383858a898e8b1" -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git" +SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;protocol=http" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr " 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.5.bb index 66308d4..71bf3c3 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.5.bb @@ -8,7 +8,7 @@ PR = "r0" inherit autotools cmake lib_package pkgconfig SRCREV = "77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407" -SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git" +SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;protocol=http" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr" 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.11.1.bb index e117ad4..91ed440 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ DEPENDS = "dbus zlib" SRCREV = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=v2.11.x \ +SRC_URI = "git://git.projects.genivi.org/${PN}.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 \ diff --git a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb index 2ef9cdb..27a2a0e 100644 --- a/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb +++ b/meta-ivi/recipes-extended/node-health-monitor/node-health-monitor_1.3.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" PR = "r2" SRCREV="851565499527e2d44047de3f6cbe9dd3a84a6c74" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \ +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;protocol=http \ file://fix-no-libsystemd-daemon.patch \ file://0001-change-service-name.patch \ " 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 570677a..3740b2b 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/${PN}.git;branch=genivi-excalibur \ +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;branch=genivi-excalibur;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 f2af33b..ea30ae4 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 @@ -12,7 +12,7 @@ LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" SRCREV = "dd4a86b9459537d2e85489b36abf80f34d12f098" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git \ +SRC_URI = "git://git.projects.genivi.org/lifecycle/${PN}.git;protocol=http \ file://nsm-fix-systemd-service-dep.patch \ file://nsm-fix-no-libsystemd-daemon.patch \ file://link-with-gio.patch \ 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.5.bb index 0f36220..1d1adc5 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.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1" SRC_URI = " \ - git://git.projects.genivi.org/persistence/persistence-administrator.git \ + 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 \ " 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 new file mode 100644 index 0000000..8b60de1 --- /dev/null +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch @@ -0,0 +1,102 @@ +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 bbaf9a5..c423f70 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 @@ -11,9 +11,10 @@ DEPENDS = "dlt-daemon dbus libcheck persistence-common-object" SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e" SRC_URI = " \ - git://git.projects.genivi.org/persistence/persistence-client-library.git \ + 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_1.0.3.bb b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb index 2ba5c88..240c2a6 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 @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" SRCREV = "b27fe577fcef7bf57d8d287f56e8dfd6ac60b1f0" SRC_URI = " \ - git://git.projects.genivi.org/persistence/persistence-common-object.git \ + git://git.projects.genivi.org/persistence/persistence-common-object.git;protocol=http \ file://configure.ac-fix-typo.patch \ file://B251_typedef_uint64_t.patch \ " diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb index d7310fc..e3a3c21 100644 --- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb +++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=176cedb32f48dd58f07e0c1c717b3ea4" PR = "r1" SRCREV = "beac5d2e25324ca9cc82d0e3b364512258af3567" -SRC_URI = "git://git.projects.genivi.org/${PN}.git \ +SRC_URI = "git://git.projects.genivi.org/${PN}.git;protocol=http \ file://remove_compile-host-path_issue.patch \ file://0001-buildsystem-make-example-programs-link-to-the-genera.patch \ " diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index 5a97540..b7e9151 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -10,7 +10,7 @@ DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" SRCREV = "8725157e248c6706de59a02996f869b6ccdccb13" SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=master \ + git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ file://AudioManager.service \ file://setup_amgr.sh \ " diff --git a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb index cd2de0f..c1e382b 100644 --- a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb +++ b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_106.bb @@ -43,3 +43,5 @@ do_install_append() { install -m 0644 ${WORKDIR}/ecryptfs.service ${D}${systemd_unitdir}/system fi } + +RDEPENDS_${PN} = "nspr nss" |