Patchwork [meta-networking] traceroute: filter-out patches dir

login
register
mail settings
Submitter Robert Yang
Date Jan. 20, 2014, 12:52 p.m.
Message ID <1390222355-9757-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/65261/
State Not Applicable, archived
Headers show

Comments

Robert Yang - Jan. 20, 2014, 12:52 p.m.
The $(subdirs) contains all the dirs under the ${B}, and this one:

do_unpack[cleandirs] = "${S}/patches"

will create a "patches" dir, then there will be compile errors, filter
out the patches will fix the problem.

Note: poky doesn't have this problem since it separates the ${S} and
${B}

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../filter-out-the-patches-from-subdirs.patch      | 47 ++++++++++++++++++++++
 .../traceroute/traceroute_2.0.18.bb                |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
Otavio Salvador - Jan. 22, 2014, 2:21 p.m.
On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> The $(subdirs) contains all the dirs under the ${B}, and this one:
>
> do_unpack[cleandirs] = "${S}/patches"
>
> will create a "patches" dir, then there will be compile errors, filter
> out the patches will fix the problem.
>
> Note: poky doesn't have this problem since it separates the ${S} and
> ${B}
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Couldn't we change it for OE-Core as well? So we avoid having to patch
the build system.
Joe MacDonald - Feb. 13, 2014, 12:59 a.m.
[Re: [oe] [meta-networking] [PATCH] traceroute: filter-out patches dir] On 14.01.22 (Wed 12:21) Otavio Salvador wrote:

> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> > The $(subdirs) contains all the dirs under the ${B}, and this one:
> >
> > do_unpack[cleandirs] = "${S}/patches"
> >
> > will create a "patches" dir, then there will be compile errors, filter
> > out the patches will fix the problem.
> >
> > Note: poky doesn't have this problem since it separates the ${S} and
> > ${B}
> >
> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> 
> Couldn't we change it for OE-Core as well? So we avoid having to patch
> the build system.

That seems sensible.  I've not seen any follow-up on this, so I'm going
to drop this patch and assume this is a change being done in OE-Core (if
it hasn't already been done there).
Robert Yang - Feb. 13, 2014, 3:03 a.m.
On 01/22/2014 10:21 PM, Otavio Salvador wrote:
> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> The $(subdirs) contains all the dirs under the ${B}, and this one:
>>
>> do_unpack[cleandirs] = "${S}/patches"
>>
>> will create a "patches" dir, then there will be compile errors, filter
>> out the patches will fix the problem.
>>
>> Note: poky doesn't have this problem since it separates the ${S} and
>> ${B}
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>
> Couldn't we change it for OE-Core as well? So we avoid having to patch
> the build system.
>

Hi Otavio,

I'm sorry, I don't quite understand what do you mean, this patch didn't
change the build system, it changed the Make.rules.

// Robert
Otavio Salvador - Feb. 13, 2014, 10:40 a.m.
On Thu, Feb 13, 2014 at 1:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
>
>
> On 01/22/2014 10:21 PM, Otavio Salvador wrote:
>>
>> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com>
>> wrote:
>>>
>>> The $(subdirs) contains all the dirs under the ${B}, and this one:
>>>
>>> do_unpack[cleandirs] = "${S}/patches"
>>>
>>> will create a "patches" dir, then there will be compile errors, filter
>>> out the patches will fix the problem.
>>>
>>> Note: poky doesn't have this problem since it separates the ${S} and
>>> ${B}
>>>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>
>>
>> Couldn't we change it for OE-Core as well? So we avoid having to patch
>> the build system.
>>
>
> I'm sorry, I don't quite understand what do you mean, this patch didn't
> change the build system, it changed the Make.rules.


To be sincere I didn't understand my comment as well ...  don't recall
what I thought... I'd say to ignore it.
Joe MacDonald - Feb. 14, 2014, 3:29 a.m.
[Re: [oe] [meta-networking] [PATCH] traceroute: filter-out patches dir] On 14.02.13 (Thu 08:40) Otavio Salvador wrote:

> On Thu, Feb 13, 2014 at 1:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> >
> >
> > On 01/22/2014 10:21 PM, Otavio Salvador wrote:
> >>
> >> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com>
> >> wrote:
> >>>
> >>> The $(subdirs) contains all the dirs under the ${B}, and this one:
> >>>
> >>> do_unpack[cleandirs] = "${S}/patches"
> >>>
> >>> will create a "patches" dir, then there will be compile errors, filter
> >>> out the patches will fix the problem.
> >>>
> >>> Note: poky doesn't have this problem since it separates the ${S} and
> >>> ${B}
> >>>
> >>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> >>
> >>
> >> Couldn't we change it for OE-Core as well? So we avoid having to patch
> >> the build system.
> >>
> >
> > I'm sorry, I don't quite understand what do you mean, this patch didn't
> > change the build system, it changed the Make.rules.
> 
> 
> To be sincere I didn't understand my comment as well ...  don't recall
> what I thought... I'd say to ignore it.

Oh.  Heh.  I thought you were proposing a change to oe-core's build
approach that would mean we didn't need to have a patch here to
traceroute to separate $(B) and $(S).  At least that's what I got from
it based on the commit log.  I'm still a bit confused about what's so
different about traceroute's build system that it needs special handling
...
Robert Yang - Feb. 14, 2014, 6:32 a.m.
On 02/14/2014 11:29 AM, Joe MacDonald wrote:
> [Re: [oe] [meta-networking] [PATCH] traceroute: filter-out patches dir] On 14.02.13 (Thu 08:40) Otavio Salvador wrote:
>
>> On Thu, Feb 13, 2014 at 1:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
>>>
>>>
>>> On 01/22/2014 10:21 PM, Otavio Salvador wrote:
>>>>
>>>> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com>
>>>> wrote:
>>>>>
>>>>> The $(subdirs) contains all the dirs under the ${B}, and this one:
>>>>>
>>>>> do_unpack[cleandirs] = "${S}/patches"
>>>>>
>>>>> will create a "patches" dir, then there will be compile errors, filter
>>>>> out the patches will fix the problem.
>>>>>
>>>>> Note: poky doesn't have this problem since it separates the ${S} and
>>>>> ${B}
>>>>>
>>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>>
>>>>
>>>> Couldn't we change it for OE-Core as well? So we avoid having to patch
>>>> the build system.
>>>>
>>>
>>> I'm sorry, I don't quite understand what do you mean, this patch didn't
>>> change the build system, it changed the Make.rules.
>>
>>
>> To be sincere I didn't understand my comment as well ...  don't recall
>> what I thought... I'd say to ignore it.
>
> Oh.  Heh.  I thought you were proposing a change to oe-core's build
> approach that would mean we didn't need to have a patch here to
> traceroute to separate $(B) and $(S).  At least that's what I got from
> it based on the commit log.  I'm still a bit confused about what's so
> different about traceroute's build system that it needs special handling

traceroute uses this:

EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))

the "patches" dir will be included in EXEDIRS which will cause errors, so
we need filter out it.

// Robert


> ...
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Robert Yang - March 18, 2014, 9:24 a.m.
ping.

// Robert

On 02/14/2014 02:32 PM, Robert Yang wrote:
>
>
> On 02/14/2014 11:29 AM, Joe MacDonald wrote:
>> [Re: [oe] [meta-networking] [PATCH] traceroute: filter-out patches dir] On
>> 14.02.13 (Thu 08:40) Otavio Salvador wrote:
>>
>>> On Thu, Feb 13, 2014 at 1:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
>>>>
>>>>
>>>> On 01/22/2014 10:21 PM, Otavio Salvador wrote:
>>>>>
>>>>> On Mon, Jan 20, 2014 at 10:52 AM, Robert Yang <liezhi.yang@windriver.com>
>>>>> wrote:
>>>>>>
>>>>>> The $(subdirs) contains all the dirs under the ${B}, and this one:
>>>>>>
>>>>>> do_unpack[cleandirs] = "${S}/patches"
>>>>>>
>>>>>> will create a "patches" dir, then there will be compile errors, filter
>>>>>> out the patches will fix the problem.
>>>>>>
>>>>>> Note: poky doesn't have this problem since it separates the ${S} and
>>>>>> ${B}
>>>>>>
>>>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>>>
>>>>>
>>>>> Couldn't we change it for OE-Core as well? So we avoid having to patch
>>>>> the build system.
>>>>>
>>>>
>>>> I'm sorry, I don't quite understand what do you mean, this patch didn't
>>>> change the build system, it changed the Make.rules.
>>>
>>>
>>> To be sincere I didn't understand my comment as well ...  don't recall
>>> what I thought... I'd say to ignore it.
>>
>> Oh.  Heh.  I thought you were proposing a change to oe-core's build
>> approach that would mean we didn't need to have a patch here to
>> traceroute to separate $(B) and $(S).  At least that's what I got from
>> it based on the commit log.  I'm still a bit confused about what's so
>> different about traceroute's build system that it needs special handling
>
> traceroute uses this:
>
> EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
>
> the "patches" dir will be included in EXEDIRS which will cause errors, so
> we need filter out it.
>
> // Robert
>
>
>> ...
>>
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
Joe MacDonald - March 27, 2014, 8:28 p.m.
Merged, thanks.
-J.

[[oe] [meta-networking] [PATCH] traceroute: filter-out patches dir] On 14.01.20 (Mon 20:52) Robert Yang wrote:

> The $(subdirs) contains all the dirs under the ${B}, and this one:
> 
> do_unpack[cleandirs] = "${S}/patches"
> 
> will create a "patches" dir, then there will be compile errors, filter
> out the patches will fix the problem.
> 
> Note: poky doesn't have this problem since it separates the ${S} and
> ${B}
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../filter-out-the-patches-from-subdirs.patch      | 47 ++++++++++++++++++++++
>  .../traceroute/traceroute_2.0.18.bb                |  1 +
>  2 files changed, 48 insertions(+)
>  create mode 100644 meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
> 
> diff --git a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
> new file mode 100644
> index 0000000..2c030b5
> --- /dev/null
> +++ b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
> @@ -0,0 +1,47 @@
> +From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Fri, 17 Jan 2014 03:17:44 -0500
> +Subject: [PATCH] Make.rules: filter-out the patches from subdirs
> +
> +The $(subdirs) contains all the dirs under the ${B}, and this one:
> +
> +do_unpack[cleandirs] = "${S}/patches"
> +
> +will create a "patches" dir, then there will be compile errors, filter
> +out the patches will fix the problem.
> +
> +Note: poky doesn't have this problem since it separates the ${S} and
> +${B}
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + Make.rules |    4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/Make.rules b/Make.rules
> +index b077cd5..0bfce2d 100644
> +--- a/Make.rules
> ++++ b/Make.rules
> +@@ -97,7 +97,7 @@ endif
> + subdirs := $(filter-out $(SKIPDIRS), $(subdirs))
> + endif
> + 
> +-install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs))
> ++install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs))
> + 
> + 
> + override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
> +@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
> + INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs))
> + LIBDIRS := $(filter $(LIBDIRS), $(subdirs))
> + MODDIRS := $(filter $(MODDIRS), $(subdirs))
> +-EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
> ++EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs))
> + MODUSERS := $(filter $(MODUSERS), $(subdirs))
> + SBINUSERS := $(filter $(SBINUSERS), $(subdirs))
> + 
> +-- 
> +1.7.10.4
> +
> diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> index e6718db..31c16aa 100644
> --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
> @@ -16,6 +16,7 @@ PR = "r1"
>  inherit update-alternatives
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
> +           file://filter-out-the-patches-from-subdirs.patch \
>  "
>  
>  SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef"

Patch

diff --git a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
new file mode 100644
index 0000000..2c030b5
--- /dev/null
+++ b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
@@ -0,0 +1,47 @@ 
+From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Fri, 17 Jan 2014 03:17:44 -0500
+Subject: [PATCH] Make.rules: filter-out the patches from subdirs
+
+The $(subdirs) contains all the dirs under the ${B}, and this one:
+
+do_unpack[cleandirs] = "${S}/patches"
+
+will create a "patches" dir, then there will be compile errors, filter
+out the patches will fix the problem.
+
+Note: poky doesn't have this problem since it separates the ${S} and
+${B}
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Make.rules |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Make.rules b/Make.rules
+index b077cd5..0bfce2d 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -97,7 +97,7 @@ endif
+ subdirs := $(filter-out $(SKIPDIRS), $(subdirs))
+ endif
+ 
+-install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs))
++install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs))
+ 
+ 
+ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
+@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
+ INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs))
+ LIBDIRS := $(filter $(LIBDIRS), $(subdirs))
+ MODDIRS := $(filter $(MODDIRS), $(subdirs))
+-EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
++EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs))
+ MODUSERS := $(filter $(MODUSERS), $(subdirs))
+ SBINUSERS := $(filter $(SBINUSERS), $(subdirs))
+ 
+-- 
+1.7.10.4
+
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
index e6718db..31c16aa 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb
@@ -16,6 +16,7 @@  PR = "r1"
 inherit update-alternatives
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
+           file://filter-out-the-patches-from-subdirs.patch \
 "
 
 SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef"