diff options
Diffstat (limited to 'meta-rcar-gen3')
5 files changed, 148 insertions, 7 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc index 2d2c557..c1f0141 100644 --- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc @@ -6,4 +6,4 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "avb" SRC_URI = "git://github.com/renesas-rcar/avb-applications.git;branch=rcar-gen3" -SRCREV = "e959010b9b26b684a53db536a02b2f96f0d177ac" +SRCREV = "4c4408e12c0cb7bfecdc73ada7639d4bace9273e" diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb index 4e6e4f1..3a309ef 100644 --- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb @@ -12,6 +12,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "kernel-module-avb-streaming libyaml cmake-native" +# Fix install and clean error +SRC_URI_append = " \ + file://0001-make-fix-install-and-clean-error.patch;patchdir=${WORKDIR}/git \ +" S = "${WORKDIR}/git/avb-demoapps" includedir = "${RENESAS_DATADIR}/include" diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps/0001-make-fix-install-and-clean-error.patch b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps/0001-make-fix-install-and-clean-error.patch new file mode 100644 index 0000000..86d87c0 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps/0001-make-fix-install-and-clean-error.patch @@ -0,0 +1,99 @@ +From 183adcb314c960b45db2f35718988020e8ba79fe Mon Sep 17 00:00:00 2001 +From: Masaru Nagai <masaru.nagai.vx@renesas.com> +Date: Fri, 22 Dec 2017 22:28:04 +0900 +Subject: [PATCH] make: fix install and clean error + +install error + +| make[1]: Entering directory `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib' +| make[2]: Entering directory `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib/avtp' +| make[2]: *** No rule to make target `install'. Stop. +| make[2]: Leaving directory `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib/avtp' +| make[1]: *** [install.subdirs] Error 2 +| make[1]: Leaving directory `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib' +| make: *** [install.subdirs] Error 2 + +clean error if no generate makefile of jdksavdecc-c + +| % make clean +| rm -f libavdecc.a libjdksavdecc-c.a avdecc.o common.o avdecc_entity.o +| adp.o aecp.o acmp.o +| cd jdksavdecc-c; make clean +| make[1]: Entering directory +| `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib/avdecc/jdksavdecc-c' +| make[1]: *** No rule to make target `clean'. Stop. +| make[1]: Leaving directory +| `/home/masaru.nagai/proj/git/avb-applications/avb-demoapps/lib/avdecc/jdksavdecc-c' +| make: *** [clean] Error 2 + +Signed-off-by: Masaru Nagai <masaru.nagai.vx@ienesas.com> +--- + avb-demoapps/lib/avdecc/Makefile | 15 +++++++++++---- + avb-demoapps/lib/avtp/Makefile | 3 +++ + avb-demoapps/lib/eavb/Makefile | 3 +++ + avb-demoapps/lib/msrp/Makefile | 3 +++ + 4 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/avb-demoapps/lib/avdecc/Makefile b/avb-demoapps/lib/avdecc/Makefile +index cb68fe0..7006c36 100644 +--- a/avb-demoapps/lib/avdecc/Makefile ++++ b/avb-demoapps/lib/avdecc/Makefile +@@ -41,11 +41,18 @@ libavdecc.a: $(OBJS) + libjdksavdecc-c: + git submodule init + git submodule update ++ ++libjdksavdecc-c/Makefile: + cd jdksavdecc-c; cmake -G "Unix Makefiles" + +-libjdksavdecc-c.a: libjdksavdecc-c +- cd jdksavdecc-c; make ++libjdksavdecc-c.a: libjdksavdecc-c/Makefile ++ $(MAKE) -C jdksavdecc-c + +-clean: ++libjdksavdecc-c.clean: libjdksavdecc-c/Makefile ++ $(MAKE) -C jdksavdecc-c clean ++ ++clean: libjdksavdecc-c.clean + $(RM) $(TARGET) $(OBJS) +- cd jdksavdecc-c; make clean ++ ++install: ++ # no operation +diff --git a/avb-demoapps/lib/avtp/Makefile b/avb-demoapps/lib/avtp/Makefile +index 373ed29..34557e3 100644 +--- a/avb-demoapps/lib/avtp/Makefile ++++ b/avb-demoapps/lib/avtp/Makefile +@@ -34,3 +34,6 @@ $(TARGET): $(OBJS) + + clean: + $(RM) $(TARGET) $(OBJS) ++ ++install: ++ # no operation +diff --git a/avb-demoapps/lib/eavb/Makefile b/avb-demoapps/lib/eavb/Makefile +index 223c1fb..5887665 100644 +--- a/avb-demoapps/lib/eavb/Makefile ++++ b/avb-demoapps/lib/eavb/Makefile +@@ -36,3 +36,6 @@ $(TARGET): $(OBJS) + + clean: + $(RM) $(TARGET) $(OBJS) ++ ++install: ++ # no operation +diff --git a/avb-demoapps/lib/msrp/Makefile b/avb-demoapps/lib/msrp/Makefile +index a8b7300..d00f71a 100644 +--- a/avb-demoapps/lib/msrp/Makefile ++++ b/avb-demoapps/lib/msrp/Makefile +@@ -34,3 +34,6 @@ $(TARGET): $(OBJS) + + clean: + $(RM) $(TARGET) $(OBJS) ++ ++install: ++ # no operation +-- +1.9.1 + diff --git a/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb/0001-Fix-QA-issue-when-build-with-Yocto.patch b/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb/0001-Fix-QA-issue-when-build-with-Yocto.patch new file mode 100644 index 0000000..dbc1ecc --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb/0001-Fix-QA-issue-when-build-with-Yocto.patch @@ -0,0 +1,34 @@ +From 5e9eff188ada13e1c1986d5611a42e0779fe7fd1 Mon Sep 17 00:00:00 2001 +From: Thao Nguyen <thao.nguyen.yb@renesas.com> +Date: Mon, 18 Sep 2017 17:09:21 +0700 +Subject: [PATCH] Fix QA issue when build with Yocto + +Yocto project has updated Linker Hash Style Changed in YP2.4. +Makefile should be updated to avoid QA error. + +ERROR: open-avb-1.1+gitAUTOINC+5e43fa5ae2-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/proj/yocto/gen3/v3.4.0-pt2/build/tmp/work/aarch64-poky-linux/open-avb/1.1+gitAUTOINC+5e43fa5ae2-r0/packages-split/open-avb-gptp/usr/bin/daemon_cl' [ldflags] +ERROR: open-avb-1.1+gitAUTOINC+5e43fa5ae2-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. +ERROR: open-avb-1.1+gitAUTOINC+5e43fa5ae2-r0 do_package_qa: Function failed: do_package_qa + +Signed-off-by: Thao Nguyen <thao.nguyen.yb@renesas.com> +Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com> +--- + daemons/gptp/linux/build/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemons/gptp/linux/build/Makefile b/daemons/gptp/linux/build/Makefile +index 1e00b1a..99fbf84 100644 +--- a/daemons/gptp/linux/build/Makefile ++++ b/daemons/gptp/linux/build/Makefile +@@ -131,7 +131,7 @@ LDFLAGS_G += -lpthread -lrt + + CFLAGS = $(CFLAGS_G) + CPPFLAGS = $(CPPFLAGS_G) +-LDFLAGS = $(LDFLAGS_G) ++LDFLAGS += $(LDFLAGS_G) + + all: $(OBJ_DIR)/daemon_cl + +-- +1.9.1 + diff --git a/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb b/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb index eeb3aa9..c4f71b4 100644 --- a/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb +++ b/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb @@ -1,12 +1,13 @@ -DESCRIPTION = "Open AVB - an AVnu sponsored repository for Audio/Video Bridging technology" -HOMEPAGE = "https://github.com/AVnu/Open-AVB" +DESCRIPTION = "OpenAvnu - an AVnu sponsored repository for Time Sensitive Network (TSN and AVB) technology" +HOMEPAGE = "https://github.com/AVnu/OpenAvnu" LICENSE = "BSD & MIT & GPLv2 & LGPLv2" LIC_FILES_CHKSUM = " \ file://daemons/LICENSE;md5=81ccd62d4bc28bafc5e1a2576536b927 \ + file://daemons/shaper/LICENSE;md5=53e60f7a40864e4c075831415f2ecc59 \ file://kmod/igb/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://kmod/igb/LICENSE;md5=e2c0cd0820d168b0b26e19f13df4dc56 \ file://lib/igb/LICENSE;md5=9bc783ca40be823a8b237df5eed80fc4 \ - file://lib/avtp_pipeline/LICENSE;md5=8f7b370a91d698ed80d2d20e8e01fbb6 \ + file://lib/avtp_pipeline/LICENSE;md5=485c2c585be88b59c3ee70a016f27959 \ file://examples/LICENSE;md5=81ccd62d4bc28bafc5e1a2576536b927 \ file://examples/gstreamer-avb-plugins/COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://examples/gstreamer-avb-plugins/COPYING.MIT;md5=bba6cdb9c2b03c849ed4975ed9ed90dc \ @@ -16,8 +17,11 @@ DEPENDS = "libpcap" PV = "1.1+git${SRCPV}" -SRCREV = "bfa7f9d0c5c8ffe1c0248c6415b3f94e8b7f10c5" -SRC_URI = "git://github.com/AVnu/Open-AVB.git;branch=open-avb-next" +SRCREV = "5e43fa5ae27fbd2b89c320670a32143ce93e0e16" +SRC_URI = "git://github.com/AVnu/OpenAvnu.git;branch=master" + +# Fix QA issue of ldflags +SRC_URI_append = " file://0001-Fix-QA-issue-when-build-with-Yocto.patch" S = "${WORKDIR}/git" @@ -29,7 +33,7 @@ do_compile() { do_install() { install -d ${D}/${bindir} - install -m 755 daemons/maap/linux/maap_daemon ${D}/${bindir} + install -m 755 daemons/maap/linux/build/maap_daemon ${D}/${bindir} install -m 755 daemons/mrpd/mrpd daemons/mrpd/mrpctl ${D}/${bindir} install -m 755 daemons/gptp/linux/build/obj/daemon_cl ${D}/${bindir} } |