rpi-default-providers: Let users overwrite the default providers

[Feature #65] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Pierre FICHEUX <pierre.ficheux@gmail.com> (cherry picked from commit ade923f17d) Signed-off-by: Petter Mabäcker <petter@technux.se>
userland: Fix POSIX compliance expectation
2015-12-09 12:46:56 +01:00 · 2015-12-09 12:46:54 +01:00 · 2015-12-09 12:46:53 +01:00 · 2015-12-09 12:46:51 +01:00
5 changed files with 44 additions and 10 deletions
--- 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 \
--- 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"
--- a/recipes-graphics/userland/userland/0001-Use-newer-POSIX-macro.patch
+++ 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
+
--- 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"

--- 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
Author	SHA1	Message	Date
Andrei Gherzan	428602b2f9	rpi-default-providers: Let users overwrite the default providers [Feature #65] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Pierre FICHEUX <pierre.ficheux@gmail.com> (cherry picked from commit `ade923f17d`) Signed-off-by: Petter Mabäcker <petter@technux.se>	2015-12-09 12:46:56 +01:00
Khem Raj	2348e267f7	userland: Fix POSIX compliance expectation 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 `f188f3d756`) Signed-off-by: Petter Mabäcker <petter@technux.se>	2015-12-09 12:46:54 +01:00
Thomas Perrot	d273a90c39	If SERIAL_CONSOLE is already define by another layer, this value may not be good. Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> (cherry picked from commit `c8532df1c2`) Signed-off-by: Petter Mabäcker <petter@technux.se>	2015-12-09 12:46:53 +01:00
Petter Mabäcker	a00a6998a6	linux-raspberrypi: Update 3.18 branch to 3.18.11 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 `c9f29df249`) Signed-off-by: Petter Mabäcker <petter@technux.se>	2015-12-09 12:46:51 +01:00