From dbb6cb42a9113038e437cf417f0b9cb25a285e9f Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Tue, 16 Dec 2014 15:46:40 +0000 Subject: gstreamer1.0-* fix configure for out of tree build on git recipes The autogen.sh script lies in the srcdir ($S) and is required to be run on git based checkouts of gstreamer packages in order to generate initial makefiles. So, we fix this by cd'ing to the specific dir, run the required script and then come back to our initial dir which is builddir ($B). Additionally rather than overriding the whole do_configure step we only _prepend to make it clear what we are doing here. (From OE-Core rev: f4a26b72377380e60d1e7058ba40aaf49b6316e5) Signed-off-by: Awais Belal Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index 5ce28ccbe7..b0e6b2ecb8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -20,8 +20,9 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ ${GSTREAMER_1_0_DEBUG}" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb index a390205621..931a7fcc96 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb @@ -13,8 +13,9 @@ S = "${WORKDIR}/git" SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb index e1a5904abf..75859f9a89 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb @@ -19,8 +19,9 @@ EXTRA_OECONF += " \ -disable-openjpeg \ " -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb index a894abe501..fbe3a42cd7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb @@ -11,8 +11,9 @@ S = "${WORKDIR}/git" SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb index 8b11b20b1b..2c0e0efe68 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb @@ -10,8 +10,9 @@ S = "${WORKDIR}/git" SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb index 2f72497363..dcf5ffc3c1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb @@ -9,8 +9,9 @@ S = "${WORKDIR}/git" SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb index 424c90a9e8..cb00d319a7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb @@ -10,8 +10,9 @@ S = "${WORKDIR}/git" SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } -- cgit v1.2.3