From f7f6d2cad69f728769defd6e985349e437953798 Mon Sep 17 00:00:00 2001 From: Masaru Nagai Date: Tue, 19 Dec 2017 23:22:27 +0900 Subject: rcar-gen3: openavnu: Rename to follow upstream project name This commit changes open-avb to openavnu name. Signed-off-by: Masaru Nagai Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- .../images/core-image-renesas-mmp-base.inc | 6 +- .../0001-Fix-QA-issue-when-build-with-Yocto.patch | 34 ----------- .../recipes-multimedia/open-avb/open-avb_git.bb | 70 ---------------------- .../0001-Fix-QA-issue-when-build-with-Yocto.patch | 34 +++++++++++ .../recipes-multimedia/openavnu/openavnu_git.bb | 70 ++++++++++++++++++++++ 5 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-multimedia/open-avb/open-avb/0001-Fix-QA-issue-when-build-with-Yocto.patch delete mode 100644 meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb create mode 100644 meta-rcar-gen3/recipes-multimedia/openavnu/openavnu/0001-Fix-QA-issue-when-build-with-Yocto.patch create mode 100644 meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc index 7c85d04..b8fffd2 100644 --- a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc +++ b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc @@ -64,9 +64,9 @@ AVB_PKGS = " \ ${AVB_KERNEL_PKGS} \ avbtool \ linuxptp \ - open-avb-mrpd \ - open-avb-gptp \ - open-avb-maap \ + openavnu-mrpd \ + openavnu-gptp \ + openavnu-maap \ avb-demoapps-avblauncher \ avb-demoapps-mrpdummy \ avb-demoapps-simple \ 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 deleted file mode 100644 index dbc1ecc..0000000 --- a/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb/0001-Fix-QA-issue-when-build-with-Yocto.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5e9eff188ada13e1c1986d5611a42e0779fe7fd1 Mon Sep 17 00:00:00 2001 -From: Thao Nguyen -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 -Signed-off-by: Masaru Nagai ---- - 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 deleted file mode 100644 index c4f71b4..0000000 --- a/meta-rcar-gen3/recipes-multimedia/open-avb/open-avb_git.bb +++ /dev/null @@ -1,70 +0,0 @@ -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=485c2c585be88b59c3ee70a016f27959 \ - file://examples/LICENSE;md5=81ccd62d4bc28bafc5e1a2576536b927 \ - file://examples/gstreamer-avb-plugins/COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://examples/gstreamer-avb-plugins/COPYING.MIT;md5=bba6cdb9c2b03c849ed4975ed9ed90dc \ -" - -DEPENDS = "libpcap" - -PV = "1.1+git${SRCPV}" - -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" - -EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}'" - -do_compile() { - oe_runmake daemons_all -} - -do_install() { - install -d ${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} -} - -PACKAGES =+ " \ - ${PN}-gptp \ - ${PN}-mrpd \ - ${PN}-maap \ -" - -ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-gptp = " \ - ${bindir}/daemon_cl \ -" - -FILES_${PN}-mrpd = " \ - ${bindir}/mrpd \ - ${bindir}/mrpctl \ -" - -FILES_${PN}-maap = " \ - ${bindir}/maap_daemon \ -" - -RDEPENDS_${PN} = " \ - ${PN}-gptp \ - ${PN}-mrpd \ - ${PN}-maap \ -" - -RDEPENDS_${PN}-maap = " \ - libpcap \ -" diff --git a/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu/0001-Fix-QA-issue-when-build-with-Yocto.patch b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu/0001-Fix-QA-issue-when-build-with-Yocto.patch new file mode 100644 index 0000000..dbc1ecc --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu/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 +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 +Signed-off-by: Masaru Nagai +--- + 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/openavnu/openavnu_git.bb b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb new file mode 100644 index 0000000..c4f71b4 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb @@ -0,0 +1,70 @@ +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=485c2c585be88b59c3ee70a016f27959 \ + file://examples/LICENSE;md5=81ccd62d4bc28bafc5e1a2576536b927 \ + file://examples/gstreamer-avb-plugins/COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://examples/gstreamer-avb-plugins/COPYING.MIT;md5=bba6cdb9c2b03c849ed4975ed9ed90dc \ +" + +DEPENDS = "libpcap" + +PV = "1.1+git${SRCPV}" + +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" + +EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}'" + +do_compile() { + oe_runmake daemons_all +} + +do_install() { + install -d ${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} +} + +PACKAGES =+ " \ + ${PN}-gptp \ + ${PN}-mrpd \ + ${PN}-maap \ +" + +ALLOW_EMPTY_${PN} = "1" + +FILES_${PN}-gptp = " \ + ${bindir}/daemon_cl \ +" + +FILES_${PN}-mrpd = " \ + ${bindir}/mrpd \ + ${bindir}/mrpctl \ +" + +FILES_${PN}-maap = " \ + ${bindir}/maap_daemon \ +" + +RDEPENDS_${PN} = " \ + ${PN}-gptp \ + ${PN}-mrpd \ + ${PN}-maap \ +" + +RDEPENDS_${PN}-maap = " \ + libpcap \ +" -- cgit 1.2.3-korg