[oe,meta-networking] umip: fix recipe location typo

From: Hongxu Jia <hongxu.jia@windriver.com>


Since `36983fe umip: move to meta-networking' applied,
it was moved to invalid location.

Fix prior partial move to meta-networking

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../umip/umip}/0001-Add-format-string-to-fprintf-call.patch     | 0
 ...01-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch | 0
 .../umip/umip}/0001-support-openssl-1.1.x.patch                 | 0
 ...2-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch | 0
 .../umip}/add-dependency-to-support-parallel-compilation.patch  | 0
 .../recipes-connectivity/umip/umip}/mip6d                       | 0
 .../recipes-connectivity/umip/umip}/mip6d.service               | 0
 meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb     | 0
 meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb                | 2 +-
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-Add-format-string-to-fprintf-call.patch (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-support-openssl-1.1.x.patch (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/add-dependency-to-support-parallel-compilation.patch (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d (100%)
 rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d.service (100%)
 rename meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb (100%)

-- 
2.19.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

On 10/08/2018 12:47 PM, Khem Raj wrote:
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb

> index e3b46bc2c8..d0645007c5 100644

> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb

> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb

> @@ -44,7 +44,7 @@ do_configure () {

>      export LD="${CXX}"

>      GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES

>      # $TARGET_ARCH settings don't match --dest-cpu settings

> -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \

> +   ./configure --prefix=${prefix} --with-intl=small-icu --without-snapshot --shared-openssl --shared-zlib \


This hunk shouldn't have been part of this patch.

Thanks,

Anuj
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Thanks for V2, since the troubles introduced by V1, I am testing
V2 with more builds, the build result is OK (glibc and musl)

Hi Khem,

Is nodejs supposed to be here?

//Hongxu

On 2018年10月08日 12:47, Khem Raj wrote:
> From: Hongxu Jia <hongxu.jia@windriver.com>
>
> Since `36983fe umip: move to meta-networking' applied,
> it was moved to invalid location.
>
> Fix prior partial move to meta-networking
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   .../umip/umip}/0001-Add-format-string-to-fprintf-call.patch     | 0
>   ...01-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch | 0
>   .../umip/umip}/0001-support-openssl-1.1.x.patch                 | 0
>   ...2-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch | 0
>   .../umip}/add-dependency-to-support-parallel-compilation.patch  | 0
>   .../recipes-connectivity/umip/umip}/mip6d                       | 0
>   .../recipes-connectivity/umip/umip}/mip6d.service               | 0
>   meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb     | 0
>   meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb                | 2 +-
>   9 files changed, 1 insertion(+), 1 deletion(-)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-Add-format-string-to-fprintf-call.patch (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-support-openssl-1.1.x.patch (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/add-dependency-to-support-parallel-compilation.patch (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d (100%)
>   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d.service (100%)
>   rename meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb (100%)
>
> diff --git a/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch b/meta-networking/recipes-connectivity/umip/umip/0001-Add-format-string-to-fprintf-call.patch
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch
> rename to meta-networking/recipes-connectivity/umip/umip/0001-Add-format-string-to-fprintf-call.patch
> diff --git a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-networking/recipes-connectivity/umip/umip/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> rename to meta-networking/recipes-connectivity/umip/umip/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> diff --git a/meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch b/meta-networking/recipes-connectivity/umip/umip/0001-support-openssl-1.1.x.patch
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch
> rename to meta-networking/recipes-connectivity/umip/umip/0001-support-openssl-1.1.x.patch
> diff --git a/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch b/meta-networking/recipes-connectivity/umip/umip/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> rename to meta-networking/recipes-connectivity/umip/umip/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> diff --git a/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch b/meta-networking/recipes-connectivity/umip/umip/add-dependency-to-support-parallel-compilation.patch
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch
> rename to meta-networking/recipes-connectivity/umip/umip/add-dependency-to-support-parallel-compilation.patch
> diff --git a/meta-oe/recipes-connectivity/umip/files/mip6d b/meta-networking/recipes-connectivity/umip/umip/mip6d
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/mip6d
> rename to meta-networking/recipes-connectivity/umip/umip/mip6d
> diff --git a/meta-oe/recipes-connectivity/umip/files/mip6d.service b/meta-networking/recipes-connectivity/umip/umip/mip6d.service
> similarity index 100%
> rename from meta-oe/recipes-connectivity/umip/files/mip6d.service
> rename to meta-networking/recipes-connectivity/umip/umip/mip6d.service
> diff --git a/meta-networking/recipes-connectivity/umip_1.0.bb b/meta-networking/recipes-connectivity/umip/umip_1.0.bb
> similarity index 100%
> rename from meta-networking/recipes-connectivity/umip_1.0.bb
> rename to meta-networking/recipes-connectivity/umip/umip_1.0.bb
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> index e3b46bc2c8..d0645007c5 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> @@ -44,7 +44,7 @@ do_configure () {
>       export LD="${CXX}"
>       GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
>       # $TARGET_ARCH settings don't match --dest-cpu settings
> -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
> +   ./configure --prefix=${prefix} --with-intl=small-icu --without-snapshot --shared-openssl --shared-zlib \
>                  --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
>                  --dest-os=linux \
>                  ${ARCHFLAGS}

On Sun, Oct 7, 2018 at 10:44 PM Hongxu Jia <hongxu.jia@windriver.com> wrote:
>
> Thanks for V2, since the troubles introduced by V1, I am testing
> V2 with more builds, the build result is OK (glibc and musl)
>
> Hi Khem,
>
> Is nodejs supposed to be here?

This was an oversight on my part thanks to both of you for spotting it

>
> //Hongxu
>
> On 2018年10月08日 12:47, Khem Raj wrote:
> > From: Hongxu Jia <hongxu.jia@windriver.com>
> >
> > Since `36983fe umip: move to meta-networking' applied,
> > it was moved to invalid location.
> >
> > Fix prior partial move to meta-networking
> >
> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >   .../umip/umip}/0001-Add-format-string-to-fprintf-call.patch     | 0
> >   ...01-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch | 0
> >   .../umip/umip}/0001-support-openssl-1.1.x.patch                 | 0
> >   ...2-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch | 0
> >   .../umip}/add-dependency-to-support-parallel-compilation.patch  | 0
> >   .../recipes-connectivity/umip/umip}/mip6d                       | 0
> >   .../recipes-connectivity/umip/umip}/mip6d.service               | 0
> >   meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb     | 0
> >   meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb                | 2 +-
> >   9 files changed, 1 insertion(+), 1 deletion(-)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-Add-format-string-to-fprintf-call.patch (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0001-support-openssl-1.1.x.patch (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/add-dependency-to-support-parallel-compilation.patch (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d (100%)
> >   rename {meta-oe/recipes-connectivity/umip/files => meta-networking/recipes-connectivity/umip/umip}/mip6d.service (100%)
> >   rename meta-networking/recipes-connectivity/{ => umip}/umip_1.0.bb (100%)
> >
> > diff --git a/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch b/meta-networking/recipes-connectivity/umip/umip/0001-Add-format-string-to-fprintf-call.patch
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch
> > rename to meta-networking/recipes-connectivity/umip/umip/0001-Add-format-string-to-fprintf-call.patch
> > diff --git a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-networking/recipes-connectivity/umip/umip/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> > rename to meta-networking/recipes-connectivity/umip/umip/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
> > diff --git a/meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch b/meta-networking/recipes-connectivity/umip/umip/0001-support-openssl-1.1.x.patch
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch
> > rename to meta-networking/recipes-connectivity/umip/umip/0001-support-openssl-1.1.x.patch
> > diff --git a/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch b/meta-networking/recipes-connectivity/umip/umip/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> > rename to meta-networking/recipes-connectivity/umip/umip/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
> > diff --git a/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch b/meta-networking/recipes-connectivity/umip/umip/add-dependency-to-support-parallel-compilation.patch
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch
> > rename to meta-networking/recipes-connectivity/umip/umip/add-dependency-to-support-parallel-compilation.patch
> > diff --git a/meta-oe/recipes-connectivity/umip/files/mip6d b/meta-networking/recipes-connectivity/umip/umip/mip6d
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/mip6d
> > rename to meta-networking/recipes-connectivity/umip/umip/mip6d
> > diff --git a/meta-oe/recipes-connectivity/umip/files/mip6d.service b/meta-networking/recipes-connectivity/umip/umip/mip6d.service
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/umip/files/mip6d.service
> > rename to meta-networking/recipes-connectivity/umip/umip/mip6d.service
> > diff --git a/meta-networking/recipes-connectivity/umip_1.0.bb b/meta-networking/recipes-connectivity/umip/umip_1.0.bb
> > similarity index 100%
> > rename from meta-networking/recipes-connectivity/umip_1.0.bb
> > rename to meta-networking/recipes-connectivity/umip/umip_1.0.bb
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> > index e3b46bc2c8..d0645007c5 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb
> > @@ -44,7 +44,7 @@ do_configure () {
> >       export LD="${CXX}"
> >       GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
> >       # $TARGET_ARCH settings don't match --dest-cpu settings
> > -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
> > +   ./configure --prefix=${prefix} --with-intl=small-icu --without-snapshot --shared-openssl --shared-zlib \
> >                  --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
> >                  --dest-os=linux \
> >                  ${ARCHFLAGS}
>
>