[meta-ivi][PATCH 01/23] base-passwd: Modify patch as home directory of root user is /root

[meta-ivi][PATCH 01/23] base-passwd: Modify patch as home directory of root user is /root

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../base-passwd/add-default-root-pass.patch        |    4 ++--
 .../base-passwd/base-passwd_3.5.26.bbappend        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch b/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
index 48b0eb3..320841e 100644
--- a/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
+++ b/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
@@ -3,8 +3,8 @@ Index: base-passwd/passwd.master
 --- base-passwd.orig/passwd.master	2012-03-15 16:45:58.149968908 +0200
 +++ base-passwd/passwd.master	2012-03-15 16:47:26.094468934 +0200
 @@ -1,4 +1,4 @@
--root::0:0:root:/home/root:/bin/sh
-+root:\$1\$1DO/lR8M\$f8JOOu4W8GBZzdNzCgSW40:0:0:root:/home/root:/bin/sh
+-root::0:0:root:/root:/bin/sh
++root:\$1\$1DO/lR8M\$f8JOOu4W8GBZzdNzCgSW40:0:0:root:/root:/bin/sh
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
diff --git a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
index 8b73d9d..4e3c8a9 100644
--- a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
+++ b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
@@ -1,4 +1,4 @@
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
 SRC_URI += "file://add-default-root-pass.patch \
-- 
1.7.9.5

[meta-ivi][PATCH 02/23] README.md: Reformat file to use maximum 80 columns

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 README.md |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fe21807..386615b 100644
--- a/README.md
+++ b/README.md
@@ -41,19 +41,25 @@ following steps:
 
 2. Add meta-ivi path to COREBASE/build/conf/bblayers.conf file.
 
-3. Add meta-openembedded/meta-systemd path to COREBASE/build/conf/bblayers.conf file.
+3. Add meta-openembedded/meta-systemd path to COREBASE/build/conf/bblayers.conf
+file.
 
 4. Add meta-openembedded/meta-oe path to COREBASE/build/conf/bblayers.conf file.
 
-5. Add meta-openembedded/meta-gnome path to COREBASE/build/conf/bblayers.conf file.
+5. Add meta-openembedded/meta-gnome path to COREBASE/build/conf/bblayers.conf
+file.
 
-6. Add meta-openembedded/meta-networking path to COREBASE/build/conf/bblayers.conf file.
+6. Add meta-openembedded/meta-networking path to
+COREBASE/build/conf/bblayers.conf file.
 
 7. Set MACHINE ??= "vexpressa9" or MACHINE ??= "qemux86" in
 COREBASE/build/conf/local.conf file to build for an emulated ARMv7a or IA-32
 instruction-set maschine respectively.
 
-8. Add BBMASK = "meta-systemd/meta-efl|meta-systemd/meta-gnome|meta-systemd/meta-multimedia|meta-systemd/meta-oe/recipes-support|meta-gnome/recipes-gnome"
+8. Add
+BBMASK = "meta-systemd/meta-efl|meta-systemd/meta-gnome|\
+meta-systemd/meta-multimedia|meta-systemd/meta-oe/recipes-support|\
+meta-gnome/recipes-gnome"
 in COREBASE/build/conf/local.conf file.
 
 9. Add INCOMPATIBLE_LICENSE = "GPLv3" in COREBASE/build/conf/local.conf file.
-- 
1.7.9.5

[meta-ivi][PATCH 03/23] u-boot: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-bsp/u-boot/u-boot_2011.06.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot_2011.06.bbappend b/recipes-bsp/u-boot/u-boot_2011.06.bbappend
index 16e9f38..672a019 100644
--- a/recipes-bsp/u-boot/u-boot_2011.06.bbappend
+++ b/recipes-bsp/u-boot/u-boot_2011.06.bbappend
@@ -2,4 +2,4 @@
 FILESEXTRAPATHS := "${THISDIR}/files"
 
 # Patch for removing autostart countdown
-SRC_URI_append_imx53qsb += "file://no_delay.patch"
\ No newline at end of file
+SRC_URI_append_imx53qsb += "file://no_delay.patch"
-- 
1.7.9.5

[meta-ivi][PATCH 04/23] connman: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-connectivity/connman/connman_1.4.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-connectivity/connman/connman_1.4.bbappend b/recipes-connectivity/connman/connman_1.4.bbappend
index 55d5955..cda612b 100644
--- a/recipes-connectivity/connman/connman_1.4.bbappend
+++ b/recipes-connectivity/connman/connman_1.4.bbappend
@@ -1,4 +1,4 @@
-PRINC = "2"
+PRINC := "${@int(PRINC) + 2}"
 
 INITSCRIPT_NAME = ""
 INITSCRIPT_PARAMS = ""
-- 
1.7.9.5

[meta-ivi][PATCH 05/23] nfs-utils: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../nfs-utils/nfs-utils_1.2.3.bbappend             |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bbappend
index 005400f..cc459a9 100644
--- a/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bbappend
+++ b/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bbappend
@@ -1,4 +1,4 @@
-PRINC = "2"
+PRINC := "${@int(PRINC) + 2}"
 
 INITSCRIPT_NAME = ""
 INITSCRIPT_PARAMS = ""
-- 
1.7.9.5

[meta-ivi][PATCH 06/23] bluez4: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-connectivity/bluez/bluez4_4.101.bbappend |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-connectivity/bluez/bluez4_4.101.bbappend b/recipes-connectivity/bluez/bluez4_4.101.bbappend
index 8f5da72..7610c18 100644
--- a/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ b/recipes-connectivity/bluez/bluez4_4.101.bbappend
@@ -1,4 +1,4 @@
-PRINC = "3"
+PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
@@ -11,4 +11,4 @@ do_configure_append () {
 	#systemd does not allow to configure any of these filesystem paths
 	#udev is included in systemd
 	sed -i 's:udev_get_sys_path(udev):"/sys":' tools/hid2hci.c
-}
\ No newline at end of file
+}
-- 
1.7.9.5

[meta-ivi][PATCH 07/23] obexd: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-connectivity/obexd/obexd_0.47.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-connectivity/obexd/obexd_0.47.bb b/recipes-connectivity/obexd/obexd_0.47.bb
index 550a4ff..46817ef 100644
--- a/recipes-connectivity/obexd/obexd_0.47.bb
+++ b/recipes-connectivity/obexd/obexd_0.47.bb
@@ -16,4 +16,4 @@ FILES_${PN} += "${datadir}/dbus-1/services/${PN}.service"
 FILES_obex-client = "${libexecdir}/obex-client \
                      ${datadir}/dbus-1/services/obex-client.service"
 # currently the plugins are empty
-FILES_obex-plugins = "${libdir}/obex/plugins"
\ No newline at end of file
+FILES_obex-plugins = "${libdir}/obex/plugins"
-- 
1.7.9.5

[meta-ivi][PATCH 08/23] ofono: Minor file reformatting and fix bashism

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-connectivity/ofono/ofono_1.12.bbappend |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes-connectivity/ofono/ofono_1.12.bbappend b/recipes-connectivity/ofono/ofono_1.12.bbappend
index 2cbc3ac..abe265e 100644
--- a/recipes-connectivity/ofono/ofono_1.12.bbappend
+++ b/recipes-connectivity/ofono/ofono_1.12.bbappend
@@ -1,4 +1,4 @@
-PRINC = "3"
+PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
@@ -12,8 +12,7 @@ INITSCRIPT_PARAMS = ""
 
 # Remove init scripts
 do_install_append() {
-	if [[ "${DISTRO_FEATURES}" == *"systemd"*  ]]
-	then
-		rm -rf ${D}${sysconfdir}/init.d/
-	fi
+	case "${DISTRO_FEATURES}" in
+		*systemd*) rm -rf ${D}${sysconfdir}/init.d/
+	esac
 }
-- 
1.7.9.5

[meta-ivi][PATCH 09/23] portmap: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-connectivity/portmap/portmap_6.0.bbappend |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-connectivity/portmap/portmap_6.0.bbappend b/recipes-connectivity/portmap/portmap_6.0.bbappend
index ea1a1c8..515e9ee 100644
--- a/recipes-connectivity/portmap/portmap_6.0.bbappend
+++ b/recipes-connectivity/portmap/portmap_6.0.bbappend
@@ -1,6 +1,6 @@
-PRINC = "3"
+PRINC := "${@int(PRINC) + 3}"
 
-# Find local "files" and "${PN}" directory
+# Find local ${PN} directory
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
 inherit systemd
@@ -9,8 +9,9 @@ SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE = "portmap.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-SRC_URI_append = " file://portmap.service \
-                 "
+SRC_URI_append = " \
+    file://portmap.service \
+    "
 
 INITSCRIPT_NAME = ""
 INITSCRIPT_PARAMS = ""
-- 
1.7.9.5

[meta-ivi][PATCH 10/23] base-files: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../base-files/base-files_3.0.14.bbappend          |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core-ivi/base-files/base-files_3.0.14.bbappend b/recipes-core-ivi/base-files/base-files_3.0.14.bbappend
index 51ebca9..5a4a309 100644
--- a/recipes-core-ivi/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core-ivi/base-files/base-files_3.0.14.bbappend
@@ -1,3 +1,3 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
-- 
1.7.9.5

[meta-ivi][PATCH 11/23] base-passwd: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../base-passwd/base-passwd_3.5.26.bbappend        |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
index 4e3c8a9..325d641 100644
--- a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
+++ b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
@@ -1,5 +1,6 @@
 PRINC := "${@int(PRINC) + 2}"
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
-SRC_URI += "file://add-default-root-pass.patch \
-           "
+SRC_URI += " \
+    file://add-default-root-pass.patch \
+    "
-- 
1.7.9.5

[meta-ivi][PATCH 12/23] eglibc: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-core-ivi/eglibc/eglibc_2.16.bbappend |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core-ivi/eglibc/eglibc_2.16.bbappend b/recipes-core-ivi/eglibc/eglibc_2.16.bbappend
index 715401d..0e82372 100644
--- a/recipes-core-ivi/eglibc/eglibc_2.16.bbappend
+++ b/recipes-core-ivi/eglibc/eglibc_2.16.bbappend
@@ -5,5 +5,5 @@ PRINC := "${@int(PRINC) + 1}"
 
 # Add patch to avoid overwriting libc_cv_rootsbindir
 SRC_URI += " \
-             file://eglibc_2.16_add_af_bus_support.patch \
-           "
+    file://eglibc_2.16_add_af_bus_support.patch \
+    "
-- 
1.7.9.5

[meta-ivi][PATCH 13/23] nebase: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-core-ivi/netbase/netbase_5.0.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core-ivi/netbase/netbase_5.0.bbappend b/recipes-core-ivi/netbase/netbase_5.0.bbappend
index eb57879..d130a6f 100644
--- a/recipes-core-ivi/netbase/netbase_5.0.bbappend
+++ b/recipes-core-ivi/netbase/netbase_5.0.bbappend
@@ -6,5 +6,5 @@ INITSCRIPT_PARAMS = ""
 
 # Remove installed init scripts
 do_install_append () {
-	rm -rvf ${D}${sysconfdir}/init.d
+    rm -rvf ${D}${sysconfdir}/init.d
 }
-- 
1.7.9.5

[meta-ivi][PATCH 14/23] systemd: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-core-ivi/systemd/systemd_git.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core-ivi/systemd/systemd_git.bbappend b/recipes-core-ivi/systemd/systemd_git.bbappend
index 60df67a..f881b7f 100644
--- a/recipes-core-ivi/systemd/systemd_git.bbappend
+++ b/recipes-core-ivi/systemd/systemd_git.bbappend
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # xz is GPLv3
 # Remove this package from depends and configure
-- 
1.7.9.5

[meta-ivi][PATCH 15/23] dlt-daemon: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
index 9cdbfc0..5be4aba 100644
--- a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
+++ b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
@@ -16,8 +16,10 @@ PR = "r0"
 inherit gzipnative
 
 LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \
-		    file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \
+    file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc \
+    "
 
 SRC_URI = "git://git.projects.genivi.org/${PN}.git;protocol=git;tag=v${PV}"
 
-- 
1.7.9.5

[meta-ivi][PATCH 16/23] node-startup-controller: Remove git version recipe

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../node-startup-controller_git.bb                 |   53 --------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 recipes-extended/node-startup-controller/node-startup-controller_git.bb

diff --git a/recipes-extended/node-startup-controller/node-startup-controller_git.bb b/recipes-extended/node-startup-controller/node-startup-controller_git.bb
deleted file mode 100644
index 0d3b90c..0000000
--- a/recipes-extended/node-startup-controller/node-startup-controller_git.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "GENIVI Node Startup Controller"
-DESCRIPTION = "The GENIVI Node Startup Controller \
-		- manages the Last User Context (LUC) \
-		- monitors node startup \
-		  and \
-		- manages legacy applications within a node \
-		"
-
-HOMEPAGE = "https://www.genivi.org/"
-SECTION = "base"
-
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
-
-SRCREV = "958e5ab2bc93ac0d885ca75f4f33988cbdd3e758"
-PV = "1.0.0+git${SRCPV}"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.projects.genivi.org/lifecycle/node-startup-controller.git;protocol=git"
-
-DEPENDS = "glib-2.0 dlt-daemon systemd"
-
-S = "${WORKDIR}/git"
-
-inherit autotools gtk-doc
-do_configure_prepend () {
-        mkdir m4
-}
-
-PACKAGES =+ "${PN}-nsm-dummy ${PN}-nsm-dummy-dbg"
-
-RRECOMMENDS_${PN} += "${PN}-nsm-dummy"
-
-
-FILES_${PN} += "\
-	${libdir}/${PN}-1/${PN} \
-	${libdir}/${PN}-1/legacy-app-handler \
-	${libdir}/systemd/system/${PN}.service \
-	${datadir}/dbus-1/system-services/org.genivi.NodeStartupController1.service \
-	"
-FILES_${PN}-dbg += "\
-	${libdir}/${PN}-1/.debug/*ler \
-	"
-FILES_${PN}-nsm-dummy = "\
-	${libdir}/${PN}-1/nsm-dummy \
-	${libdir}/systemd/system/nsm-dummy.service \
-	${datadir}/dbus-1/system-services/org.genivi.NodeStateManager.* \
-	"
-FILES_${PN}-nsm-dummy-dbg = "\
-	${libdir}/${PN}-1/.debug/nsm-dummy \
-	"
-- 
1.7.9.5

[meta-ivi][PATCH 17/23] layer-management: Remove git version recipe

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../include-unistd-for-alarm-in-example.patch      |   12 -----
 ...include-unistd-for-usleep-in-OpenGLES2App.patch |   18 -------
 .../point-to-internal-CMakeVersions.patch          |   13 -----
 .../layer-management/layer-management_git.bb       |   56 --------------------
 4 files changed, 99 deletions(-)
 delete mode 100644 recipes-graphics/layer-management/layer-management-git/include-unistd-for-alarm-in-example.patch
 delete mode 100644 recipes-graphics/layer-management/layer-management-git/include-unistd-for-usleep-in-OpenGLES2App.patch
 delete mode 100644 recipes-graphics/layer-management/layer-management-git/point-to-internal-CMakeVersions.patch
 delete mode 100644 recipes-graphics/layer-management/layer-management_git.bb

diff --git a/recipes-graphics/layer-management/layer-management-git/include-unistd-for-alarm-in-example.patch b/recipes-graphics/layer-management/layer-management-git/include-unistd-for-alarm-in-example.patch
deleted file mode 100644
index 20896b4..0000000
--- a/recipes-graphics/layer-management/layer-management-git/include-unistd-for-alarm-in-example.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/LayerManagerExamples/LayerManagerControl/src/commands.cpp
-===================================================================
---- git.orig/LayerManagerExamples/LayerManagerControl/src/commands.cpp	2012-07-12 16:51:49.695274924 +0300
-+++ git/LayerManagerExamples/LayerManagerControl/src/commands.cpp	2012-07-12 16:52:03.231275452 +0300
-@@ -21,6 +21,7 @@
- #include "ExpressionInterpreter.h"
- #include <iostream>
- #include <signal.h> // signal
-+#include <unistd.h>
- 
- using namespace std;
- 
diff --git a/recipes-graphics/layer-management/layer-management-git/include-unistd-for-usleep-in-OpenGLES2App.patch b/recipes-graphics/layer-management/layer-management-git/include-unistd-for-usleep-in-OpenGLES2App.patch
deleted file mode 100644
index 87a9379..0000000
--- a/recipes-graphics/layer-management/layer-management-git/include-unistd-for-usleep-in-OpenGLES2App.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Include unistd.h in OpenGLES2App.cpp as usleep is used in code
-
-Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
-Upstream-status: Pending
-
-Index: git/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp
-===================================================================
---- git.orig/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp	2012-05-16 13:52:30.114057234 +0300
-+++ git/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp	2012-05-16 13:52:46.674056640 +0300
-@@ -28,6 +28,8 @@
- #include <math.h>
- #include <sys/time.h>
- 
-+#include <unistd.h>
-+
- #define RUNTIME_IN_MS() (GetTickCount() - startTimeInMS)
- 
- // Max width and height of the window
diff --git a/recipes-graphics/layer-management/layer-management-git/point-to-internal-CMakeVersions.patch b/recipes-graphics/layer-management/layer-management-git/point-to-internal-CMakeVersions.patch
deleted file mode 100644
index 5fd080f..0000000
--- a/recipes-graphics/layer-management/layer-management-git/point-to-internal-CMakeVersions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt	2012-02-16 13:02:02.257718578 +0200
-+++ git/CMakeLists.txt	2012-02-16 13:02:20.217968698 +0200
-@@ -22,7 +22,7 @@
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
- 
--include(${CMAKE_MODULE_PATH}/CMakeVersions.txt)
-+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CMakeVersions.txt)
- 
- # set default build type, if not defined by user
- if (NOT CMAKE_BUILD_TYPE)
diff --git a/recipes-graphics/layer-management/layer-management_git.bb b/recipes-graphics/layer-management/layer-management_git.bb
deleted file mode 100644
index 9af452d..0000000
--- a/recipes-graphics/layer-management/layer-management_git.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "LayerManager"
-
-HOMEPAGE = "https://www.genivi.org/"
-SECTION = "environment/base"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=249d3578d6bba1bb946148d367a28080"
-
-DEPENDS = "virtual/egl dbus libxcomposite"
-
-PR = "r3"
-
-SRCREV = "86c2dc9ef367b52fd5d05b53cbad5e21b9ab042f"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.projects.genivi.org/layer_management.git;protocol=git \
-	   file://point-to-internal-CMakeVersions.patch \
-	   file://include-unistd-for-usleep-in-OpenGLES2App.patch \
-	   file://include-unistd-for-alarm-in-example.patch \
-	   file://layermanager.service \
-          "
-# Needed this for imx6 boards to use precompiled EGL libraries
-python () {
-    if ((d.getVar("MACHINE", True) or "").find("imx6") != -1):
-	flags = d.getVar("OECMAKE_CXX_FLAGS", True)
-	flags += " -DLINUX"
-	d.setVar('OECMAKE_CXX_FLAGS', flags)
-}
-
-S = "${WORKDIR}/git"
-
-inherit autotools gettext cmake
-
-do_install_append() {
-    install -d ${D}/${libdir}/systemd/system
-    install -m 0755 ${WORKDIR}/layermanager.service ${D}/${libdir}/systemd/system
-    install -m 0755 ${WORKDIR}/layermanager_demo.service ${D}/${libdir}/systemd/system
-}
-
-FILES_${PN} += "${libdir}/lib* \
-		${libdir}/layermanager/lib* \
-		${libdir}/layermanager/communicator/lib* \
-		${libdir}/layermanager/ipcmodules/lib* \
-		${libdir}/layermanager/renderer/lib* \
-		${libdir}/layermanager/renderer/renderer* \
-		${libdir}/systemd"
-
-FILES_${PN}-dev = "${includedir}/*"
-FILES_${PN}-staticdev += "${libdir}/layermanager/static/lib*"
-FILES_${PN}-dbg += "${libdir}/layermanager/.debug/ \
-		    ${libdir}/layermanager/communicator/.debug/ \
-		    ${libdir}/layermanager/ipcmodules/.debug/ \
-		    ${libdir}/layermanager/renderer/.debug/ "
-
-WARN_QA = "ldflags useless-rpaths rpaths staticdev"
-- 
1.7.9.5

[meta-ivi][PATCH 18/23] shadow-securetty: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../shadow-securetty_4.1.4.3.bbappend              |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/shadow-securetty/shadow-securetty_4.1.4.3.bbappend b/recipes-extended/shadow-securetty/shadow-securetty_4.1.4.3.bbappend
index e4fdd55..50a6c94 100644
--- a/recipes-extended/shadow-securetty/shadow-securetty_4.1.4.3.bbappend
+++ b/recipes-extended/shadow-securetty/shadow-securetty_4.1.4.3.bbappend
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
-- 
1.7.9.5

[meta-ivi][PATCH 19/23] audiomanager: Remove git version recipe

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../audiomanager/audiomanager_git.bb               |   43 --------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 recipes-multimedia/audiomanager/audiomanager_git.bb

diff --git a/recipes-multimedia/audiomanager/audiomanager_git.bb b/recipes-multimedia/audiomanager/audiomanager_git.bb
deleted file mode 100644
index fc087d4..0000000
--- a/recipes-multimedia/audiomanager/audiomanager_git.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Genivi AudioManager"
-HOMEPAGE = "https://www.genivi.org/"
-SECTION = "multimedia"
-
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=815ca599c9df247a0c7f619bab123dad"
-
-PR = "r4"
-
-DEPENDS = "dlt-daemon sqlite3 dbus"
-
-SRC_URI = "git://git.projects.genivi.org/AudioManager.git;protocol=git;tag=e33f72e932661784affc0f24d56f0e78fbac783f \
-           file://AudioManager.service file://setup_amgr.sh"
-
-S = "${WORKDIR}/git"
-inherit autotools gettext cmake pkgconfig systemd
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "AudioManager.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-EXTRA_OECMAKE += "-DWITH_TESTS=OFF -DUSE_BUILD_LIBS=OFF"
-OECMAKE_CXX_FLAGS +="-ldl"
-
-FILES_${PN} += "${libdir}/audioManager/command/*.so.* \
-                ${libdir}/audioManager/control/*.so.* \
-                ${libdir}/audioManager/routing/*.so.* \
-"
-FILES_${PN}-dev += "${libdir}/audioManager/command/*.so \
-                    ${libdir}/audioManager/control/*.so \
-                    ${libdir}/audioManager/routing/*.so \
-"
-
-FILES_${PN}-dbg += "${libdir}/audioManager/command/.debug/* \
-                    ${libdir}/audioManager/control/.debug/* \
-                    ${libdir}/audioManager/routing/.debug/* \
-"
-FILES_${PN}-systemd += "${systemd_unitdir}/scripts"
-
-do_install_append() {
-        mkdir -p ${D}${systemd_unitdir}/scripts/
-        install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh
-}
-- 
1.7.9.5

[meta-ivi][PATCH 20/23] mesa-dri: egl and gles are added by default in PACKAGECONFIG

[Andrei Gherzan]

oe-core mesa-dri recipe includes egl and gles by default now in
PACKAGECONFIG. Drop this bbappend.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-graphics/mesa/mesa-dri_8.0.5.bbappend |    2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 recipes-graphics/mesa/mesa-dri_8.0.5.bbappend

diff --git a/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend b/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend
deleted file mode 100644
index db4a459..0000000
--- a/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
-PACKAGECONFIG_append_vexpressa9 = " gles egl"
-- 
1.7.9.5

[meta-ivi][PATCH 21/23] tiff: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 recipes-multimedia/libtiff/tiff_4.0.3.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/libtiff/tiff_4.0.3.bbappend b/recipes-multimedia/libtiff/tiff_4.0.3.bbappend
index 54309d7..238795f 100644
--- a/recipes-multimedia/libtiff/tiff_4.0.3.bbappend
+++ b/recipes-multimedia/libtiff/tiff_4.0.3.bbappend
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # xz is GPLv3 so remove it from DEPENDS if INCOMPATIBLE_LICENSE contains GPLv3
 python () {
-- 
1.7.9.5

[meta-ivi][PATCH 22/23] gst-plugins-good: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../gstreamer/gst-plugins-good_0.10.31.bbappend    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend b/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
index acb5086..69d5f20 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
+++ b/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # Remove gconf and soup from dependencies and deactivate these in configure
 DEPENDS := "${@oe_filter_out('libsoup-2.4','${DEPENDS}',d)}"
-- 
1.7.9.5

[meta-ivi][PATCH 23/23] consolekit: Minor file reformatting

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../consolekit/consolekit_0.4.5.bbappend           |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-support-ivi/consolekit/consolekit_0.4.5.bbappend b/recipes-support-ivi/consolekit/consolekit_0.4.5.bbappend
index 378631e..1dccee5 100644
--- a/recipes-support-ivi/consolekit/consolekit_0.4.5.bbappend
+++ b/recipes-support-ivi/consolekit/consolekit_0.4.5.bbappend
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # gnome-common is GPLv3 so we drop this dependency
 # if INCOMPATIBLE_LICENSE contains GPLv3
-- 
1.7.9.5

Re: [meta-ivi][PATCH 01/23] base-passwd: Modify patch as home directory of root user is /root

[ChenQi]

Home directory is now configurable now.
You could specify it in local.conf.

See the following commits for more details.

845c2c0 oprofile: use dynamic root home directory
2af073a base-passwd: use configurable root home directory
07b842f base-files: use dynamic root home directory
de5b44a bitbake.conf: import var ROOT_HOME



On 01/06/2013 07:54 PM, Andrei Gherzan wrote:
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>   .../base-passwd/add-default-root-pass.patch        |    4 ++--
>   .../base-passwd/base-passwd_3.5.26.bbappend        |    2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch b/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
> index 48b0eb3..320841e 100644
> --- a/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
> +++ b/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch
> @@ -3,8 +3,8 @@ Index: base-passwd/passwd.master
>   --- base-passwd.orig/passwd.master	2012-03-15 16:45:58.149968908 +0200
>   +++ base-passwd/passwd.master	2012-03-15 16:47:26.094468934 +0200
>   @@ -1,4 +1,4 @@
> --root::0:0:root:/home/root:/bin/sh
> -+root:\$1\$1DO/lR8M\$f8JOOu4W8GBZzdNzCgSW40:0:0:root:/home/root:/bin/sh
> +-root::0:0:root:/root:/bin/sh
> ++root:\$1\$1DO/lR8M\$f8JOOu4W8GBZzdNzCgSW40:0:0:root:/root:/bin/sh
>    daemon:*:1:1:daemon:/usr/sbin:/bin/sh
>    bin:*:2:2:bin:/bin:/bin/sh
>    sys:*:3:3:sys:/dev:/bin/sh
> diff --git a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
> index 8b73d9d..4e3c8a9 100644
> --- a/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
> +++ b/recipes-core-ivi/base-passwd/base-passwd_3.5.26.bbappend
> @@ -1,4 +1,4 @@
> -PRINC := "${@int(PRINC) + 1}"
> +PRINC := "${@int(PRINC) + 2}"
>   FILESEXTRAPATHS := "${THISDIR}/${PN}"
>   
>   SRC_URI += "file://add-default-root-pass.patch \

Re: [meta-ivi][PATCH 01/23] base-passwd: Modify patch as home directory of root user is /root

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 665 bytes --]

On Mon, Jan 7, 2013 at 5:22 AM, ChenQi <Qi.Chen@windriver.com> wrote:

> Home directory is now configurable now.
> You could specify it in local.conf.
>
> See the following commits for more details.
>
> 845c2c0 oprofile: use dynamic root home directory
> 2af073a base-passwd: use configurable root home directory
> 07b842f base-files: use dynamic root home directory
> de5b44a bitbake.conf: import var ROOT_HOME
>
>
This bbappend was added to modify the default password of root. And we
modify the whole root line from passwd.master which includes the home
directory. And as home directory was moved to /home we had to rebase this
patch too.

ag

[-- Attachment #2: Type: text/html, Size: 1128 bytes --]