[meta-raspberrypi][fido][PATCH 0/4] Backport of various fixes

[meta-raspberrypi][fido][PATCH 0/4] Backport of various fixes

[Petter Mabäcker]

Backport of various fixes and important updates (backward compatible) from
meta-raspberrypi:master to meta-raspberrypi:fido

The following changes since commit b896a7da70dd7a16ba7ffd664f7747cb37e1d142:

  .gitignore: Ignore some stuff (2015-03-12 22:20:51 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib petmab/rpi_fido_fixes
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/rpi_fido_fixes

Andrei Gherzan (1):
  rpi-default-providers: Let users overwrite the default providers

Khem Raj (1):
  userland: Fix POSIX compliance expectation

Petter Mabäcker (1):
  linux-raspberrypi: Update 3.18 branch to 3.18.11

Thomas Perrot (1):
  If SERIAL_CONSOLE is already define by another layer, this value may
    not be good.

 conf/machine/include/rpi-base.inc                  |  2 +-
 conf/machine/include/rpi-default-providers.inc     |  8 ++---
 .../userland/0001-Use-newer-POSIX-macro.patch      | 35 ++++++++++++++++++++++
 recipes-graphics/userland/userland_git.bb          |  1 +
 recipes-kernel/linux/linux-raspberrypi_3.18.bb     |  8 ++---
 5 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch

-- 
1.9.1

[meta-raspberrypi][fido][PATCH 1/4] linux-raspberrypi: Update 3.18 branch to 3.18.11

[Petter Mabäcker]

Update linux-raspberrypi_3.18 to latest version.
Remove sl030raspberrypii2ckernel.patch since it will not apply anymore
and its content seems to be obsolite in later kernel versions.

[Support #56]

Change-Id: I91e57f4e65d9c1c9d12014f5d11b0acd950e2d1d
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>

(cherry picked from commit c9f29df249b80ab488e4ea6eddc01a6522a28c09)
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 recipes-kernel/linux/linux-raspberrypi_3.18.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
index 921e702..6d8b155 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
@@ -1,8 +1,6 @@
-LINUX_VERSION ?= "3.18.5"
+LINUX_VERSION ?= "3.18.11"
 
-SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRCREV = "d64fa8121fca9883d6fb14ca06d2abf66496195e"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y"
 
 require linux-raspberrypi.inc
-- 
1.9.1

[meta-raspberrypi][fido][PATCH 2/4] If SERIAL_CONSOLE is already define by another layer, this value may not be good.

[Petter Mabäcker]

From: Thomas Perrot <thomas.perrot@tupi.fr>

Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>

(cherry picked from commit c8532df1c2e4812b3520d32ed49be943bea2edd9)
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 conf/machine/include/rpi-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index a26803a..1dda207 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -7,7 +7,7 @@ include conf/machine/include/soc-family.inc
 
 IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"
 
-SERIAL_CONSOLE ?= "115200 ttyAMA0"
+SERIAL_CONSOLE = "115200 ttyAMA0"
 
 XSERVER = " \
     xserver-xorg \
-- 
1.9.1

[meta-raspberrypi][fido][PATCH 3/4] userland: Fix POSIX compliance expectation

[Petter Mabäcker]

From: Khem Raj <raj.khem@gmail.com>

We have errors like below with glibc 2.22+

net_sockets_common.c:139:20: error: storage size of 'hints' isn't known
    struct addrinfo hints, *info, *p;
                        ^

newer glibc has now fixed the definitions of getaddrinfo and ilk to be
enabled with correct posix version.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

(cherry picked from commit f188f3d756f59fb4dc64cc1a64263c2251f76ae5)
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 .../userland/0001-Use-newer-POSIX-macro.patch      | 35 ++++++++++++++++++++++
 recipes-graphics/userland/userland_git.bb          |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch

diff --git a/recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch b/recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch
new file mode 100644
index 0000000..2a092c2
--- /dev/null
+++ b/recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch
@@ -0,0 +1,35 @@
+From 12f7718bb0e08e2c06825c7ab7541b3c5bfe74c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 9 Aug 2015 08:55:05 -0700
+Subject: [PATCH] Use newer POSIX macro
+
+Define _POSIX_C_SOURCE such that it demands correct
+posix interfaces, netdb.h declares interfaces such as
+getaddrinfo if __USE_POSIX, i.e. POSIX.1:1990 or later.
+However, these interfaces were new in the 2001 edition of POSIX
+therefore ask for Extension from POSIX.1:2001 since we use addrinfo
+structure here.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ containers/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/containers/CMakeLists.txt b/containers/CMakeLists.txt
+index a29a885..5570038 100644
+--- a/containers/CMakeLists.txt
++++ b/containers/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_definitions(-DDL_PATH_PREFIX="${VMCS_PLUGIN_DIR}/")
+ 
+ SET( GCC_COMPILER_FLAGS -Wall -g -O2 -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wcast-qual -Wwrite-strings -Wundef )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wextra )#-Wno-missing-field-initializers )
+-SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -std=c99 -D_POSIX_C_SOURCE=199309L )
++SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wno-missing-field-initializers )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wno-unused-value )
+ 
+-- 
+2.1.4
+
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 729c42a..861029d 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -16,6 +16,7 @@ SRCFORK = "raspberrypi"
 SRCREV = "3b81b91c18ff19f97033e146a9f3262ca631f0e9"
 
 SRC_URI = "git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
+           file://0001-Use-newer-POSIX-macro.patch \
           "
 S = "${WORKDIR}/git"
 
-- 
1.9.1

[meta-raspberrypi][fido][PATCH 4/4] rpi-default-providers: Let users overwrite the default providers

[Petter Mabäcker]

From: Andrei Gherzan <andrei@gherzan.ro>

[Feature #65]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Pierre FICHEUX <pierre.ficheux@gmail.com>

(cherry picked from commit ade923f17d242f9a043b1714deb584929a2ffe8e)
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 conf/machine/include/rpi-default-providers.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index ee3a3ac..cabbd43 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -1,10 +1,10 @@
 # RaspberryPi BSP default providers
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi"
-PREFERRED_PROVIDER_u-boot = "u-boot-rpi"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-rpi"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "userland"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
-PREFERRED_PROVIDER_jpeg = "jpeg"
+PREFERRED_PROVIDER_jpeg ?= "jpeg"
-- 
1.9.1

Re: [meta-raspberrypi][fido][PATCH 0/4] Backport of various fixes

[Andrei Gherzan]

On Thu, Aug 13, 2015 at 03:12:20PM +0200, Petter Mabäcker wrote:
> Backport of various fixes and important updates (backward compatible) from
> meta-raspberrypi:master to meta-raspberrypi:fido
>
> The following changes since commit b896a7da70dd7a16ba7ffd664f7747cb37e1d142:
>
>   .gitignore: Ignore some stuff (2015-03-12 22:20:51 +0100)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib petmab/rpi_fido_fixes
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/rpi_fido_fixes
>
> Andrei Gherzan (1):
>   rpi-default-providers: Let users overwrite the default providers
>
> Khem Raj (1):
>   userland: Fix POSIX compliance expectation
>
> Petter Mabäcker (1):
>   linux-raspberrypi: Update 3.18 branch to 3.18.11
>
> Thomas Perrot (1):
>   If SERIAL_CONSOLE is already define by another layer, this value may
>     not be good.
>

Merged to fido branch.

Thank you,
--
Andrei Gherzan