* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir
@ 2015-07-19 13:15 Yann E. MORIN
2015-07-19 20:38 ` Arnout Vandecappelle
2015-07-20 13:31 ` Thomas Petazzoni
0 siblings, 2 replies; 6+ messages in thread
From: Yann E. MORIN @ 2015-07-19 13:15 UTC (permalink / raw)
To: buildroot
When a package has both a target and a host variants, and there is an
override-srcdir set for the target variant, the host variant should
inherit the target's override-srcdir, unless explicitly set, like we do
for all other target-variant properties.
However, do not override it if expressly set to empty (i.e. when the
user wants to override only the target variant).
Also, as we do for the other variables, the target variant never
inherits from the host variant.
Reported-by: Mike <mikez@OpenPlayer.org>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
Changes v1 -> v2:
- really do not override the host variant if expressly set to empty
(Arnout)
---
package/pkg-generic.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 75dc8b7..6a7d97e 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -340,6 +340,10 @@ else
endif
$(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION))
+ifdef $(3)_OVERRIDE_SRCDIR
+ $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR)
+endif
+
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir 2015-07-19 13:15 [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir Yann E. MORIN @ 2015-07-19 20:38 ` Arnout Vandecappelle 2015-07-20 8:48 ` Maxime Hadjinlian 2015-07-20 13:31 ` Thomas Petazzoni 1 sibling, 1 reply; 6+ messages in thread From: Arnout Vandecappelle @ 2015-07-19 20:38 UTC (permalink / raw) To: buildroot On 07/19/15 15:15, Yann E. MORIN wrote: > When a package has both a target and a host variants, and there is an > override-srcdir set for the target variant, the host variant should > inherit the target's override-srcdir, unless explicitly set, like we do > for all other target-variant properties. > > However, do not override it if expressly set to empty (i.e. when the > user wants to override only the target variant). > > Also, as we do for the other variables, the target variant never > inherits from the host variant. > > Reported-by: Mike <mikez@OpenPlayer.org> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > --- > Changes v1 -> v2: > - really do not override the host variant if expressly set to empty > (Arnout) > --- > package/pkg-generic.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 75dc8b7..6a7d97e 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -340,6 +340,10 @@ else > endif > $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) > > +ifdef $(3)_OVERRIDE_SRCDIR > + $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) > +endif > + > $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) > $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) > $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir 2015-07-19 20:38 ` Arnout Vandecappelle @ 2015-07-20 8:48 ` Maxime Hadjinlian 2015-07-20 9:08 ` Baruch Siach 0 siblings, 1 reply; 6+ messages in thread From: Maxime Hadjinlian @ 2015-07-20 8:48 UTC (permalink / raw) To: buildroot Reviewed-and-tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> On Sun, Jul 19, 2015 at 10:38 PM, Arnout Vandecappelle <arnout@mind.be> wrote: > On 07/19/15 15:15, Yann E. MORIN wrote: >> When a package has both a target and a host variants, and there is an >> override-srcdir set for the target variant, the host variant should >> inherit the target's override-srcdir, unless explicitly set, like we do >> for all other target-variant properties. >> >> However, do not override it if expressly set to empty (i.e. when the >> user wants to override only the target variant). >> >> Also, as we do for the other variables, the target variant never >> inherits from the host variant. >> >> Reported-by: Mike <mikez@OpenPlayer.org> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> >> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >> Cc: Arnout Vandecappelle <arnout@mind.be> > > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > >> >> --- >> Changes v1 -> v2: >> - really do not override the host variant if expressly set to empty >> (Arnout) >> --- >> package/pkg-generic.mk | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk >> index 75dc8b7..6a7d97e 100644 >> --- a/package/pkg-generic.mk >> +++ b/package/pkg-generic.mk >> @@ -340,6 +340,10 @@ else >> endif >> $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) >> >> +ifdef $(3)_OVERRIDE_SRCDIR >> + $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) >> +endif >> + >> $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) >> $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) >> $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) >> > > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir 2015-07-20 8:48 ` Maxime Hadjinlian @ 2015-07-20 9:08 ` Baruch Siach 2015-07-20 9:11 ` Maxime Hadjinlian 0 siblings, 1 reply; 6+ messages in thread From: Baruch Siach @ 2015-07-20 9:08 UTC (permalink / raw) To: buildroot Hi Maxime, On Mon, Jul 20, 2015 at 10:48:33AM +0200, Maxime Hadjinlian wrote: > Reviewed-and-tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> It seems patchwork doesn't recognize this combined tag. To make the patchwork R and T columns reflect your tag you'll have to add them in separate lines. baruch > On Sun, Jul 19, 2015 at 10:38 PM, Arnout Vandecappelle <arnout@mind.be> wrote: > > On 07/19/15 15:15, Yann E. MORIN wrote: > >> When a package has both a target and a host variants, and there is an > >> override-srcdir set for the target variant, the host variant should > >> inherit the target's override-srcdir, unless explicitly set, like we do > >> for all other target-variant properties. > >> > >> However, do not override it if expressly set to empty (i.e. when the > >> user wants to override only the target variant). > >> > >> Also, as we do for the other variables, the target variant never > >> inherits from the host variant. > >> > >> Reported-by: Mike <mikez@OpenPlayer.org> > >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > >> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > >> Cc: Arnout Vandecappelle <arnout@mind.be> > > > > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > > >> > >> --- > >> Changes v1 -> v2: > >> - really do not override the host variant if expressly set to empty > >> (Arnout) > >> --- > >> package/pkg-generic.mk | 4 ++++ > >> 1 file changed, 4 insertions(+) > >> > >> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > >> index 75dc8b7..6a7d97e 100644 > >> --- a/package/pkg-generic.mk > >> +++ b/package/pkg-generic.mk > >> @@ -340,6 +340,10 @@ else > >> endif > >> $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) > >> > >> +ifdef $(3)_OVERRIDE_SRCDIR > >> + $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) > >> +endif > >> + > >> $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) > >> $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) > >> $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il - ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir 2015-07-20 9:08 ` Baruch Siach @ 2015-07-20 9:11 ` Maxime Hadjinlian 0 siblings, 0 replies; 6+ messages in thread From: Maxime Hadjinlian @ 2015-07-20 9:11 UTC (permalink / raw) To: buildroot Hi Baruch, all On Mon, Jul 20, 2015 at 11:08 AM, Baruch Siach <baruch@tkos.co.il> wrote: > Hi Maxime, > > On Mon, Jul 20, 2015 at 10:48:33AM +0200, Maxime Hadjinlian wrote: >> Reviewed-and-tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> > > It seems patchwork doesn't recognize this combined tag. To make the patchwork > R and T columns reflect your tag you'll have to add them in separate lines. Damn, I was being lazy, now I have to do double the works. Damn you patchwork ! :) Thank you for pointing that out. Reviewed-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> > > baruch > >> On Sun, Jul 19, 2015 at 10:38 PM, Arnout Vandecappelle <arnout@mind.be> wrote: >> > On 07/19/15 15:15, Yann E. MORIN wrote: >> >> When a package has both a target and a host variants, and there is an >> >> override-srcdir set for the target variant, the host variant should >> >> inherit the target's override-srcdir, unless explicitly set, like we do >> >> for all other target-variant properties. >> >> >> >> However, do not override it if expressly set to empty (i.e. when the >> >> user wants to override only the target variant). >> >> >> >> Also, as we do for the other variables, the target variant never >> >> inherits from the host variant. >> >> >> >> Reported-by: Mike <mikez@OpenPlayer.org> >> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> >> >> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >> >> Cc: Arnout Vandecappelle <arnout@mind.be> >> > >> > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >> > >> >> >> >> --- >> >> Changes v1 -> v2: >> >> - really do not override the host variant if expressly set to empty >> >> (Arnout) >> >> --- >> >> package/pkg-generic.mk | 4 ++++ >> >> 1 file changed, 4 insertions(+) >> >> >> >> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk >> >> index 75dc8b7..6a7d97e 100644 >> >> --- a/package/pkg-generic.mk >> >> +++ b/package/pkg-generic.mk >> >> @@ -340,6 +340,10 @@ else >> >> endif >> >> $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) >> >> >> >> +ifdef $(3)_OVERRIDE_SRCDIR >> >> + $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) >> >> +endif >> >> + >> >> $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) >> >> $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) >> >> $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il - ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir 2015-07-19 13:15 [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir Yann E. MORIN 2015-07-19 20:38 ` Arnout Vandecappelle @ 2015-07-20 13:31 ` Thomas Petazzoni 1 sibling, 0 replies; 6+ messages in thread From: Thomas Petazzoni @ 2015-07-20 13:31 UTC (permalink / raw) To: buildroot Dear Yann E. MORIN, On Sun, 19 Jul 2015 15:15:28 +0200, Yann E. MORIN wrote: > When a package has both a target and a host variants, and there is an > override-srcdir set for the target variant, the host variant should > inherit the target's override-srcdir, unless explicitly set, like we do > for all other target-variant properties. > > However, do not override it if expressly set to empty (i.e. when the > user wants to override only the target variant). > > Also, as we do for the other variables, the target variant never > inherits from the host variant. > > Reported-by: Mike <mikez@OpenPlayer.org> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > > --- > Changes v1 -> v2: > - really do not override the host variant if expressly set to empty > (Arnout) > --- > package/pkg-generic.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-20 13:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-19 13:15 [Buildroot] [PATCHv2] core/pkg-generic: host variants inherits target's override-srcdir Yann E. MORIN 2015-07-19 20:38 ` Arnout Vandecappelle 2015-07-20 8:48 ` Maxime Hadjinlian 2015-07-20 9:08 ` Baruch Siach 2015-07-20 9:11 ` Maxime Hadjinlian 2015-07-20 13:31 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox