Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

ostro-os: update to latest HEAD #20

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/build-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ else
echo "SSTATE_DIR = \"${BUILD_CACHE_DIR}/sstate\"" >> conf/auto.conf
fi
export BUILD_ID=${CI_BUILD_ID}
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID"
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL"

if [ -z "$BUILD_TARGET" ]; then
# Let's try to fetch build targets from configuration files
Expand Down
2 changes: 1 addition & 1 deletion docker/local-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ echo "$BUILD_NUMBER" > $WORKSPACE/.build_number
CI_BUILD_ID="${BUILD_TIMESTAMP}-build-${BUILD_NUMBER}"

# export other vars
for var in WORKSPACE BASE_DISTRO BUILD_DIR BUILD_CACHE_DIR GIT_PROXY_COMMAND CI_BUILD_ID TARGET_MACHINE BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE; do
for var in WORKSPACE BASE_DISTRO BUILD_DIR BUILD_CACHE_DIR GIT_PROXY_COMMAND GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL CI_BUILD_ID TARGET_MACHINE BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE; do
RUN_ARGS+=(-e "$var=${!var}")
done
# Point HOME to WORKSPACE, don't polute real home.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ glib-networking@core
glmark2@openembedded-layer
glproto@core
gnome-themes-standard@core
gstreamer-vaapi-1.0@intel
gstreamer-vaapi-1.0@ostro-xt
gstreamer1.0-plugins-base@core
gstreamer1.0-plugins-good@core
gstreamer1.0@core
Expand All @@ -52,6 +52,7 @@ iso-codes@core
kbproto@core
libaio@core
libatasmart@openembedded-layer
libcroco@core
libdaemon@core
libdmx@core
libdrm@core
Expand All @@ -73,6 +74,7 @@ libpciaccess@core
libpng12@core
libpthread-stubs@core
librealsense@realsense
librsvg@core
libsdl@core
libsecret@core
libsm@core
Expand Down
4 changes: 4 additions & 0 deletions meta-ostro-xt/conf/distro/ostro-xt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ PREFERRED_VERSION_opencv = "3.%"
# remove them.
CFLAGS_remove = "-Wno-error=misleading-indentation"
CXXFLAGS_remove = "-Wno-error=misleading-indentation"

# Newer gstreamer-vaapi is depends on gstreamer-codes which is part of bad
# plugins
PREFERRED_VERSION_gstreamer-vaapi-1.0 = "0.7.0"
4 changes: 4 additions & 0 deletions meta-ostro-xt/recipes-benchmark/glmark2/glmark2_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Enable C++11 featuresa
# Upstream-status: Submitted[http://lists.openembedded.org/pipermail/openembedded-devel/2016-October/109561.html]
CXXFLAGS += "-std=c++11"

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 13eb823a18c52441fd8231537bf60e7dfdd23925 Mon Sep 17 00:00:00 2001
From: Amarnath Valluri <[email protected]>
Date: Tue, 4 Oct 2016 14:34:58 +0300
Subject: [PATCH] Pass linker flags(LDFLAGS) to compiler

Upstream-status:Submitted
https://github.com/ssvb/tinymembench/pull/9/commits/13eb823a18c52441fd8231537bf60e7dfdd23925

Signed-off-by: Amarnath Valluri <[email protected]>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 31ca60e..024a56f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ ifdef WINDIR
endif

tinymembench: main.c util.o util.h asm-opt.h version.h asm-opt.o x86-sse2.o arm-neon.o mips-32.o aarch64-asm.o
- ${CC} -O2 ${CFLAGS} -o tinymembench main.c util.o asm-opt.o x86-sse2.o arm-neon.o mips-32.o aarch64-asm.o -lm
+ ${CC} -O2 ${CFLAGS} ${LDFLAGS} -o tinymembench main.c util.o asm-opt.o x86-sse2.o arm-neon.o mips-32.o aarch64-asm.o -lm

util.o: util.c util.h
${CC} -O2 ${CFLAGS} -c util.c
--
2.5.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += "file://0001-Pass-linker-flags-LDFLAGS-to-compiler.patch"
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FILES_${PN} = "/lib/modules/${KERNVER}/updates/cfg80211.ko \

EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}"

do_configure() {
do_compile_prepend() {
CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT}
}

Expand Down
11 changes: 11 additions & 0 deletions meta-ostro-xt/recipes-core/ant/ant-native_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# With lack of task dependency between 'do_removebinaries' and 'do_removecruft'
# seen some timing issues on parallel builds, 'find' in do_removebinaries try
# to work on directories already removed by do_removecruft.,
# Hence we make sure that both tasks execute sequentially than parallelly.
#
# Patch status: submitted[http://lists.openembedded.org/pipermail/openembedded-devel/2016-October/109464.html]
#
# Remove existing do_removecruft
deltask removecruft
# Add do_removecruft after do_removebinaries
addtask removecruft before do_patch after do_removebinaries

This file was deleted.

5 changes: 5 additions & 0 deletions meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ SRC_URI_remove = " \
file://0001-iio-tmp006-Set-correct-iio-name.patch \
file://0001-iio-si7020-Set-correct-iio-name.patch \
"

do_patch_prepend() {
export GIT_COMMITTER_NAME="${GIT_COMMITTER_NAME}"
export GIT_COMMITTER_EMAIL="${GIT_COMMITTER_EMAIL}"
}
1 change: 1 addition & 0 deletions meta-ostro-xt/recipes-kernel/perf/perf.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RDEPENDS_${PN}-doc_remove = "man"

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require recipes-multimedia/gstreamer/gstreamer-vaapi.inc

DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base"

SRC_URI[md5sum] = "ce2d4921b8d9c78edd609d95e8c502d3"
SRC_URI[sha256sum] = "abe8ea4dfb3177d038b38610537c651b943707ed110882782a19b95a9ea04a92"

SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.bz2"

SRC_URI =+ "file://0001-decoder-h265-Fix-offset-calculation-in-codec_data-pa.patch"

EXTRA_OECONF += "--disable-builtin-libvpx"
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From dd227da41e953e79c8e05cd6f838a0e267d2d9b5 Mon Sep 17 00:00:00 2001
From: Sreerenj Balachandran <[email protected]>
Date: Fri, 11 Mar 2016 17:44:07 +0200
Subject: [PATCH] decoder: h265: Fix offset calculation in codec_data parsing

Upstream-status: Backport

https://bugzilla.gnome.org/show_bug.cgi?id=762922

Signed-off-by: Sreerenj Balachandran <[email protected]>
Signed-off-by: Azril Ahmad <[email protected]>
Signed-off-by: Chang Rebecca Swee Fun <[email protected]>
---
gst-libs/gst/vaapi/gstvaapidecoder_h265.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
index 3c5a9d9..fd8250a 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
@@ -2688,6 +2688,7 @@ gst_vaapi_decoder_h265_decode_codec_data (GstVaapiDecoder *
goto cleanup;
break;
}
+ ofs = pi->nalu.offset + pi->nalu.size;
gst_vaapi_parser_info_h265_replace (&pi, NULL);
}
}
--
1.9.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 2791dfde0de0abe8100fa833dfe1a9c2e74c2629 Mon Sep 17 00:00:00 2001
From: Jianxun Zhang <[email protected]>
Date: Thu, 21 Jan 2016 16:25:44 -0800
Subject: [PATCH] Install tests

This patch is updated for 0.6.1

Upstream-Status: Inappropriate

Signed-off-by: Jianxun Zhang <[email protected]>
---
tests/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3637d92..7cc6a97 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = \
+bin_PROGRAMS = \
simple-decoder \
test-decode \
test-display \
@@ -9,13 +9,13 @@ noinst_PROGRAMS = \
$(NULL)

if USE_ENCODERS
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
simple-encoder \
$(NULL)
endif

if USE_GLX
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
test-textures \
$(NULL)
endif
--
1.9.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 9824c3bed4676c9a17adbfc8178d7f3e96c60670 Mon Sep 17 00:00:00 2001
From: Amarnath Valluri <[email protected]>
Date: Mon, 26 Sep 2016 13:35:54 +0300
Subject: [PATCH] Added configure option(--enable/disable-doc) for manpage
generation.

This allows to build without documentation even in case of asccidoc,a2x,xmlto
tools availabe.

Upstream-Status: Inappropriate[embedded-specific]

Signed-off-by: Amarnath Valluri <[email protected]>
---
configure.ac | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch must have proper origin header, to clearly specify where it comes from, who is author, upstream status, etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kad, Thanks for pointing out, I was in impression that git formatted patch fail to apply on non-git source, now I git formatted the patch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@avalluri what were the other patches git apply failed and f089278 was needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mythi, Currently there are two patches in kernel patch series on XT:

  1. librealsense_formats_linux-yocto_4.4.patch
  2. 0001-ovl-setxattr-don-t-deadlock-when-called-from-ima_fix.patch

Both fail to apply if we not provide committer details either via environment or via global git config.
This is not visible on non-docker builds as, usually host .gitconfig set properly, But not the case with docker container.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

  1. we have reported to meta-intel-realsense. 2. is ours but it looks correct. Any idea why it fails?

Copy link
Contributor Author

@avalluri avalluri Sep 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost all git actions(atleast in this context am,apply) look for committer details before applying the patch. That's what i observed with this exercise :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's the reason for clean build inside container: catch inconsistencies in data and patches :)

index 264d6e0..eb54bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,17 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AM_PROG_CC_C_O

-AC_PATH_PROG([ASCIIDOC], [asciidoc], [])
-AC_PATH_PROG([A2X], [a2x], [])
-AC_PATH_PROG([XMLTO], [xmlto], [])
+AC_ARG_ENABLE([doc],
+ [AS_HELP_STRING([--enable-doc],
+ [Generate documentation])],
+ [generate_doc=$enableval],
+ [generate_doc=no])
+
+if test "x$generate_doc" = "xyes"; then
+ AC_PATH_PROG([ASCIIDOC], [asciidoc], [])
+ AC_PATH_PROG([A2X], [a2x], [])
+ AC_PATH_PROG([XMLTO], [xmlto], [])
+fi
AM_CONDITIONAL([GEN_DOC], [\
test x"$ASCIIDOC" != x && \
test x"$A2X" != x && \
--
2.5.0

7 changes: 6 additions & 1 deletion meta-ostro-xt/recipes-opencl/ocl-icd/ocl-icd_2.2.9.bb
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab"

SRC_URI = "https://forge.imag.fr/frs/download.php/716/${BP}.tar.gz"
SRC_URI = " \
https://forge.imag.fr/frs/download.php/716/${BP}.tar.gz \
file://configurable-doc-generation.patch \
"
SRC_URI[md5sum] = "7dab1a9531ea79c19a414a9ee229504e"
SRC_URI[sha256sum] = "0c8ac13e2c5b737c34de49f9aca6cad3c4d33dd0bbb149b01238d76e798feae5"

inherit autotools

EXTRA_OECONF = "--disable-doc"

DEPENDS += "ruby-native"

BBCLASSEXTEND = "native"
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 42f7e9b359a2704372fa0d6278086f0cac010535 Mon Sep 17 00:00:00 2001
From: Amarnath Valluri <[email protected]>
Date: Tue, 27 Sep 2016 14:36:23 +0300
Subject: [PATCH] Make use of LDFLAGS

Upstream-status:Not-Submitted[Upstream is moving to cmake build]

Signed-off-by: Amarnath Valluri <[email protected]>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 27f1f39..4224624 100644
--- a/Makefile
+++ b/Makefile
@@ -93,14 +93,14 @@ obj obj/libuvc lib bin:

# Rules for building the sample programs
bin/c-%: examples/c-%.c lib/librealsense.so | bin
- $(CC) $< $(REALSENSE_FLAGS) $(GLFW3_FLAGS) -o $@
+ $(CC) $< $(REALSENSE_FLAGS) $(GLFW3_FLAGS) $(LDFLAGS) -o $@

bin/cpp-%: examples/cpp-%.cpp lib/librealsense.so | bin
- $(CXX) $< -std=c++11 $(REALSENSE_FLAGS) $(GLFW3_FLAGS) -o $@
+ $(CXX) $< -std=c++11 $(REALSENSE_FLAGS) $(GLFW3_FLAGS) $(LDFLAGS) -o $@

# Rules for building the library itself
lib/librealsense.so: $(OBJECTS) | lib
- $(CXX) -std=c++11 -shared $(OBJECTS) $(LIBUSB_FLAGS) -o $@
+ $(CXX) -std=c++11 -shared $(OBJECTS) $(LIBUSB_FLAGS) $(LDFLAGS) -o $@

lib/librealsense.a: $(OBJECTS) | lib
ar rvs $@ `find obj/ -name "*.o"`
@@ -124,4 +124,4 @@ obj/verify.o: src/verify.c | obj
all-tests: F200-live-test LR200-live-test R200-live-test SR300-live-test ZR300-live-test offline-test

%-test: unit-tests/* lib/librealsense.so
- $(CXX) unit-tests/*.cpp -std=c++11 -o bin/tests/$@ -D$(if $(findstring live,$@),LIVE_TEST,OFFLINE_TEST) -D$(firstword $(subst -, ,$@))_TEST -DMAKEFILE $(REALSENSE_FLAGS)
+ $(CXX) unit-tests/*.cpp -std=c++11 -o bin/tests/$@ -D$(if $(findstring live,$@),LIVE_TEST,OFFLINE_TEST) -D$(firstword $(subst -, ,$@))_TEST -DMAKEFILE $(REALSENSE_FLAGS) $(LDFLAGS)
--
2.5.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI_append = " file://0001-Make-use-of-LDFLAGS.patch"
EXTRA_OEMAKE_append = " 'LDFLAGS=${LDFLAGS}'"
2 changes: 1 addition & 1 deletion ostro-os
Submodule ostro-os updated 2435 files