diff options
author | Awais Belal <awais_belal@mentor.com> | 2014-12-16 15:46:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 18:07:59 +0000 |
commit | 73388a1846c18414c8c499476257367b2b66ea96 (patch) | |
tree | c37a6983480cae3d1503bb43ef166220c749bfac | |
parent | f9ea9382a755841d750490279d98af372ac5fe87 (diff) | |
download | poky-73388a1846c18414c8c499476257367b2b66ea96.tar.gz |
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 <awais_belal@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 aa2de69b55..bf1b87e6de 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | |||
@@ -21,8 +21,9 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ | |||
21 | ${GSTREAMER_1_0_DEBUG} \ | 21 | ${GSTREAMER_1_0_DEBUG} \ |
22 | --cross-prefix='${HOST_PREFIX}'" | 22 | --cross-prefix='${HOST_PREFIX}'" |
23 | 23 | ||
24 | do_configure() { | 24 | do_configure_prepend() { |
25 | cd ${S} | ||
25 | ./autogen.sh --noconfigure | 26 | ./autogen.sh --noconfigure |
26 | oe_runconf | 27 | cd ${B} |
27 | } | 28 | } |
28 | 29 | ||
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" | |||
13 | 13 | ||
14 | SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" | 14 | SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" |
15 | 15 | ||
16 | do_configure() { | 16 | do_configure_prepend() { |
17 | cd ${S} | ||
17 | ./autogen.sh --noconfigure | 18 | ./autogen.sh --noconfigure |
18 | oe_runconf | 19 | cd ${B} |
19 | } | 20 | } |
20 | 21 | ||
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 += " \ | |||
19 | -disable-openjpeg \ | 19 | -disable-openjpeg \ |
20 | " | 20 | " |
21 | 21 | ||
22 | do_configure() { | 22 | do_configure_prepend() { |
23 | cd ${S} | ||
23 | ./autogen.sh --noconfigure | 24 | ./autogen.sh --noconfigure |
24 | oe_runconf | 25 | cd ${B} |
25 | } | 26 | } |
26 | 27 | ||
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" | |||
11 | 11 | ||
12 | SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" | 12 | SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" |
13 | 13 | ||
14 | do_configure() { | 14 | do_configure_prepend() { |
15 | cd ${S} | ||
15 | ./autogen.sh --noconfigure | 16 | ./autogen.sh --noconfigure |
16 | oe_runconf | 17 | cd ${B} |
17 | } | 18 | } |
18 | 19 | ||
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" | |||
10 | 10 | ||
11 | SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" | 11 | SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" |
12 | 12 | ||
13 | do_configure() { | 13 | do_configure_prepend() { |
14 | cd ${S} | ||
14 | ./autogen.sh --noconfigure | 15 | ./autogen.sh --noconfigure |
15 | oe_runconf | 16 | cd ${B} |
16 | } | 17 | } |
17 | 18 | ||
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" | |||
9 | 9 | ||
10 | SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" | 10 | SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" |
11 | 11 | ||
12 | do_configure() { | 12 | do_configure_prepend() { |
13 | cd ${S} | ||
13 | ./autogen.sh --noconfigure | 14 | ./autogen.sh --noconfigure |
14 | oe_runconf | 15 | cd ${B} |
15 | } | 16 | } |
16 | 17 | ||
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" | |||
10 | 10 | ||
11 | SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" | 11 | SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" |
12 | 12 | ||
13 | do_configure() { | 13 | do_configure_prepend() { |
14 | cd ${S} | ||
14 | ./autogen.sh --noconfigure | 15 | ./autogen.sh --noconfigure |
15 | oe_runconf | 16 | cd ${B} |
16 | } | 17 | } |
17 | 18 | ||