From ddc13a07f1080f784a85cf3a478ccb077f765121 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Wed, 23 Oct 2019 14:22:00 +0700 Subject: rcar-gen3: gstreamer/avb-application: Use gitsm fetcher The code repositories of Gstreamer and avb-application contain git submodule, this updates recipes to use gitsm fetcher instead of git which needs an additional function to handle git submodule. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Iee69ef8bd312519b9a2d4471340089df244cd0eb --- .../avb-applications/avb-applications.inc | 2 +- .../recipes-multimedia/avb-applications/avb-demoapps.bb | 13 ------------- .../gstreamer/gstreamer1.0-omx_1.16.0.bbappend | 6 +----- .../gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb | 15 +-------------- .../gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend | 15 +-------------- .../gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend | 15 +-------------- 6 files changed, 5 insertions(+), 61 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 0a46e7b..55bd13d 100644 --- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc @@ -4,5 +4,5 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "avb" -SRC_URI = "git://github.com/renesas-rcar/avb-applications.git;branch=rcar-gen3" +SRC_URI = "gitsm://github.com/renesas-rcar/avb-applications.git;branch=rcar-gen3" SRCREV = "8398f6e66eaf487eaf8e9a2a8d60f222456c06a6" 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 e668d13..455768b 100644 --- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb @@ -16,19 +16,6 @@ S = "${WORKDIR}/git/avb-demoapps" includedir = "${RENESAS_DATADIR}/include" -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}'" do_install_append() { diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend index ab87897..5f1fd82 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" SRC_URI_append = " \ - git://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.16.0 \ + gitsm://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.16.0 \ file://gstomx.conf \ " @@ -23,10 +23,6 @@ GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so" EXTRA_OECONF_append = " --enable-experimental" do_configure_prepend() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} cd ${S} install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/ sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb index 59dadab..dda9900 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb @@ -17,7 +17,7 @@ VSPFILTER_CONF_r8a77965 = "gstvspfilter-${MACHINE}_r8a77965.conf" VSPFILTER_CONF_r8a77990 = "gstvspfilter-${MACHINE}_r8a77990.conf" SRC_URI = " \ - git://github.com/renesas-rcar/gst-plugin-vspfilter.git;branch=RCAR-GEN3/1.0.1 \ + gitsm://github.com/renesas-rcar/gst-plugin-vspfilter.git;branch=RCAR-GEN3/1.0.1 \ file://${VSPFILTER_CONF} \ " @@ -25,19 +25,6 @@ SRCREV = "e94cf40ab5515abd716b21f77caa48db0d077927" S = "${WORKDIR}/git" -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - FILES_${PN} = " \ ${libdir}/gstreamer-1.0/libgstvspfilter.so \ ${sysconfdir}/gstvspfilter.conf" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend index 1b42fd1..fce5d09 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend @@ -1,5 +1,5 @@ SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" -SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.16.0" +SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.16.0" SRCREV = "7f334f733534a3a64d848df110da12af9650eaed" @@ -7,19 +7,6 @@ DEPENDS += "weston" S = "${WORKDIR}/git" -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - do_configure_prepend() { cd ${S} ./autogen.sh --noconfigure diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend index 402afa5..db223ba 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend @@ -1,5 +1,5 @@ SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" -SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.16.0" +SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.16.0" SRCREV = "8e4b5c16a9197219b66e167dd03d0a8800a95ed4" @@ -12,19 +12,6 @@ EXTRA_OECONF_append = " \ --enable-ignore-fps-of-video-standard \ " -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - do_configure_prepend() { cd ${S} ./autogen.sh --noconfigure -- cgit 1.2.3-korg