[oe] [meta-webserver][PATCH] apache2: Correct the SRC_URI

[Derek Straka]

Thanks for this one.  I must have neglected to do a clean all first.

-Derek

On Feb 17, 2017 4:37 PM, "Peter Kjellerstedt" <peter.kjellerstedt at axis.com>
wrote:

> The change to use ${APACHE_MIRROR} in the SRC_URI in dfbe6cf214 did
> not take into account that ${APACHE_MIRROR} already contains "/dist".
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
> ---
>  meta-webserver/recipes-httpd/apache2/apache2-native_2.4.25.bb | 2 +-
>  meta-webserver/recipes-httpd/apache2/apache2_2.4.25.bb        | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.25.bb
> b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.25.bb
> index fc84872..99717d2 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.25.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.25.bb
> @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0"
>
>  inherit autotools pkgconfig native
>
> -SRC_URI = "${APACHE_MIRROR}/dist/httpd/httpd-${PV}.tar.bz2 \
> +SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>             file://0001-configure-use-pkg-config-for-PCRE-detection.patch
> \
>            "
>
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.25.bb
> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.25.bb
> index b3a2dfd..60f6fb9 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.25.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.25.bb
> @@ -6,7 +6,7 @@ DEPENDS = "libtool-native apache2-native openssl expat
> pcre apr apr-util"
>  SECTION = "net"
>  LICENSE = "Apache-2.0"
>
> -SRC_URI = "${APACHE_MIRROR}/dist/httpd/httpd-${PV}.tar.bz2 \
> +SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>             file://server-makefile.patch \
>             file://httpd-2.4.1-corelimit.patch \
>             file://httpd-2.4.4-export.patch \
> --
> 2.9.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>