summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-20 22:42:09 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-20 22:45:11 +0100
commit0bc32da2769e8fe4d7661e90c68989e2803b0c38 (patch)
treecf29019021235482d3bfb92bc831f154081e9f91
parentb35e30a169fdc089b43f73fd3b113324a82ebfa4 (diff)
Fixes for meta-agl-bsp for rocko
These changes are included: - dra7xx-evm,meta-ti: disable gstreamer-plugins-bad on vayu until fixed - meta-boundary: has no rocko branch, remove the folder - meta-intel: generalize the libva bbappend - general: remove the lua bbappend as it is upstream - general: re-add fix for kernel-devsrc (see https://gerrit.automotivelinux.org/gerrit/#/c/11209/) Documents fixme's in meta-agl-bsp/ROCKO.FIXMEs. Change-Id: I3df32632558d503c3ce343f907a1ee1e15ae7e26 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-bsp/ROCKO.FIXMEs18
-rw-r--r--meta-agl-bsp/conf/include/agl_dra7xx-evm.inc4
-rw-r--r--meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch73
-rw-r--r--meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend6
-rw-r--r--meta-agl-bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.1.15.bbappend1
-rw-r--r--meta-agl-bsp/meta-openembedded-layer/recipes-devtools/lua/lua_%.bbappend1
-rw-r--r--meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend29
-rw-r--r--meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.%.bbappend5
-rw-r--r--meta-agl-bsp/recipes-graphics/wayland/libva_%.bbappend (renamed from meta-agl-bsp/meta-intel/recipes-graphics/wayland/libva_%.bbappend)0
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/kernel-devsrc.bbappend6
10 files changed, 34 insertions, 109 deletions
diff --git a/meta-agl-bsp/ROCKO.FIXMEs b/meta-agl-bsp/ROCKO.FIXMEs
new file mode 100644
index 000000000..c21e2ec3d
--- /dev/null
+++ b/meta-agl-bsp/ROCKO.FIXMEs
@@ -0,0 +1,18 @@
+FIXME:
+
+- ti:
+ - gst and ducati:
+ modified: conf/include/agl_dra7xx-evm.inc
+ modified: meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+
+- i.mx:
+ Thus remove old bsp adaptations.
+ deleted: meta-boundary/recipes-kernel/linux/linux-boundary_4.1.15.bbappend
+
+- meta-oe:
+ - change is upstream
+ deleted: meta-openembedded-layer/recipes-devtools/lua/lua_%.bbappend
+
+- meta-intel:
+ - move libva patch to parent folder (generalize)
+
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index f5e85100d..02ddb6c9d 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -24,7 +24,9 @@ PREFERRED_VERSION_libgbm = "10.0.0"
## Multimedia section ##
#-------------------------------------------------
-GSTREAMER_PLUGINS = " \
+# FIXME
+GSTREAMER_PLUGINS = ""
+DISABLED_ROCKO_GSTREAMER_PLUGINS = " \
gstreamer1.0-plugins-bad-meta \
gstreamer1.0-plugins-ducati \
gstreamer1.0-plugins-vpe \
diff --git a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch b/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch
deleted file mode 100644
index 9eba21a88..000000000
--- a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary/0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f1c5c08ea5606b358b30b459c74aa932796ded3c Mon Sep 17 00:00:00 2001
-From: Mihail Grigorov <michael.grigorov@konsulko.com>
-Date: Wed, 10 Jan 2018 10:30:14 +0200
-Subject: [PATCH] 6x_bootscript: Make bootscript compatible with WIC and SDCARD
- images
-
-a) Get partition 2 UUID,
-in case of error, points the boot directory to /boot
-otherwise /
-
-b) Modify DTB/hdmi to use 1920x1080
-
-Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
----
- .../nitrogen6x/6x_bootscript-yocto-3.14.txt | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-index f6bf2f5289..250310e37f 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-@@ -48,6 +48,17 @@ if itest.s "x" == "x${dtbname}" ; then
- fi
- fi
-
-+setenv cmd_hdmi 'fdt set fb_hdmi status okay;fdt set fb_hdmi mode_str 1920x1080M@60;'
-+
-+setenv p2uuid 'x'
-+part uuid ${dtype} ${disk}:2 p2uuid
-+
-+if itest.s ${p2uuid} == 'x'; then
-+ bpart=1;
-+else
-+ bpart=2;
-+fi
-+
- if itest.s x${bootpart} == x ; then
- bootpart=1
- fi
-@@ -58,7 +69,11 @@ fi
- setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${cpu} board=${board}
-
- if itest.s x == x${bootdir} ; then
-- bootdir=/
-+ bootdir=/;
-+fi
-+
-+if itest.s ${bpart} == '1'; then
-+ bootdir=/boot/;
- fi
-
- if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
-@@ -116,8 +131,6 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then
- echo "!!!!!!!!!!!!!!!!"
- fi
-
--bpart=2
--
- if test "sata" = "${dtype}" ; then
- setenv bootargs "${bootargs} root=/dev/sda${bpart}" ;
- elif test "usb" = "${dtype}" ; then
-@@ -167,7 +180,7 @@ if itest.s "x" != "x${show_env}" ; then
- printenv
- fi
-
--if load ${dtype} ${disk}:${bootpart} ${a_zImage} /zImage ; then
-+if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then
- bootz ${a_zImage} - ${a_fdt}
- fi
- echo "Error loading kernel image"
---
-2.11.0
-
diff --git a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend b/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend
deleted file mode 100644
index ca9cb4f94..000000000
--- a/meta-agl-bsp/meta-boundary/recipes-bsp/u-boot/u-boot-script-boundary_git.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI += " \
- file://0001-6x_bootscript-Make-bootscript-compatible-with-WIC-an.patch \
-"
-
diff --git a/meta-agl-bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.1.15.bbappend b/meta-agl-bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.1.15.bbappend
deleted file mode 100644
index 88ac94b15..000000000
--- a/meta-agl-bsp/meta-boundary/recipes-kernel/linux/linux-boundary_4.1.15.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-kernel/linux/linux-agl.inc
diff --git a/meta-agl-bsp/meta-openembedded-layer/recipes-devtools/lua/lua_%.bbappend b/meta-agl-bsp/meta-openembedded-layer/recipes-devtools/lua/lua_%.bbappend
deleted file mode 100644
index 2a590838b..000000000
--- a/meta-agl-bsp/meta-openembedded-layer/recipes-devtools/lua/lua_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND += "nativesdk"
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index f1fd52d35..8d3e6c7a7 100644
--- a/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -20,35 +20,10 @@ DEPENDS_append_ti33x = " \
"
############## F I X M E #####################
-# FIXME pyro
-SRC_URI_append = " \
+# FIXME rocko
+DISABLED_ROCKO_SRC_URI_append = " \
file://0001-gstdrmallocator-Add-DRM-allocator-support.patch \
"
-DISABLED_SRC_URI_append_ti43x = " \
- file://0002-parsers-Pick-previos-bug-fixes-on-different-parsers.patch \
- file://0003-gstkmssink-Add-support-for-KMS-based-sink.patch \
- file://0004-gstwaylandsink-Add-DRM-support-on-waylandsink.patch \
- file://0002-kmssink-remove-DCE-dependencies.patch \
- file://0003-kmssink-add-YUYV-support.patch \
- file://0001-gstwaylandsink-add-input-format-I420-support.patch \
-"
-
-# FIXME pyro
-DISABLED_SRC_URI_append_ti33x = " \
- file://0001-gstwaylandsink-Add-mouse-drag-and-drop-support.patch \
-"
-
-# FIXME pyro
-DISABLED_SRC_URI_append_omap-a15 = " \
- file://0001-gstdrmallocator-Add-DRM-allocator-support.patch \
- file://0002-parsers-Pick-previos-bug-fixes-on-different-parsers.patch \
- file://0003-gstkmssink-Add-support-for-KMS-based-sink.patch \
- file://0004-gstwaylandsink-Add-DRM-support-on-waylandsink.patch \
- file://0002-kmssink-remove-DCE-dependencies.patch \
- file://0003-kmssink-add-YUYV-support.patch \
- file://0001-gstwaylandsink-add-input-format-I420-support.patch \
- file://0005-gstwaylandsink-Implement-callbacks-for-version-5-of-.patch \
-"
################ F I X M E ####################
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.%.bbappend
new file mode 100644
index 000000000..e9a57d324
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_2.%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+
+SRC_URI_append = "\
+ file://force-type-conversion.patch \
+ "
diff --git a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/libva_%.bbappend b/meta-agl-bsp/recipes-graphics/wayland/libva_%.bbappend
index eda8de38a..eda8de38a 100644
--- a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/libva_%.bbappend
+++ b/meta-agl-bsp/recipes-graphics/wayland/libva_%.bbappend
diff --git a/meta-agl-bsp/recipes-kernel/linux/kernel-devsrc.bbappend b/meta-agl-bsp/recipes-kernel/linux/kernel-devsrc.bbappend
new file mode 100644
index 000000000..52fe69d24
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/kernel-devsrc.bbappend
@@ -0,0 +1,6 @@
+# fix for kernel using hardcoded awk while our filesystem only provides gawk
+do_install_append() {
+ # enforce all scripts to use /usr/bin/awk . This fixes the rpm dependency failure on install of kernel-devsrc
+ cd ${D} || true
+ ( for i in `grep -srI "\!/bin/awk" | cut -d":" -f1 ` ; do sed -i -e "s#\!/bin/awk#\!/usr/bin/env awk#g" $i ; done ) || true
+} \ No newline at end of file