Skip to contentSkip to conversation

core/pkg-generic: host variants inherits target's override-srcdir

PATCH New Yann E. MORIN 5 participants 6 messages Jul 19, 2015 – Jul 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

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.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>

---
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(+)
package/pkg-generic.mk +4 -0
index 75dc8b7..6a7d97e 100644
@@ -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)
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

Quoted 8 lines · Yann E. MORIN

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).

Quoted 7 lines

Also, as we do for the other variables, the target variant never inherits from the host variant.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 25 lines

---
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(+)
package/pkg-generic.mk +4 -0
index 75dc8b7..6a7d97e 100644
@@ -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)
Signature · 6 lines
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
#2 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

Quoted 57 lines · Arnout Vandecappelle
Quoted 8 lines · Yann E. MORIN

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).

Quoted 7 lines

Also, as we do for the other variables, the target variant never inherits from the host variant.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 15 lines

---
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(+)
package/pkg-generic.mk +0 -0
index 75dc8b7..6a7d97e 100644

package/pkg-generic.mk else · line 349

Quoted 10 lines
package/pkg-generic.mk +4 -0
@@ -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

#3 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

Hi Maxime,

Quoted 1 line · Maxime Hadjinlian

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

Quoted 44 lines · Arnout Vandecappelle
Quoted 43 lines · Yann E. MORIN
Quoted 8 lines

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).

Quoted 7 lines

Also, as we do for the other variables, the target variant never inherits from the host variant.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 24 lines

---
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(+)
package/pkg-generic.mk +4 -0
index 75dc8b7..6a7d97e 100644
@@ -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)
Signature · 3 lines
     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 -
#4 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

Hi Baruch, all

Quoted 7 lines · Baruch Siach

Hi Maxime,

Quoted 1 line · Maxime Hadjinlian

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.

Quoted 52 lines

baruch

Quoted 37 lines · Arnout Vandecappelle
Quoted 36 lines · Yann E. MORIN
Quoted 8 lines

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).

Quoted 7 lines

Also, as we do for the other variables, the target variant never inherits from the host variant.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 17 lines

---
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(+)
package/pkg-generic.mk +0 -0
index 75dc8b7..6a7d97e 100644
@@ -340,6 +340,10 @@ else
 endif
 $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION))
 
Quoted 7 lines
Quoted 7 lines

package/pkg-generic.mk else · line 349

Quoted 7 lines
package/pkg-generic.mk +4 -0
+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 -

#5 lore raw

PATCH v2 1/1 core/pkg-generic: host variants inherits target's override-srcdir

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 16 lines · Yann E. MORIN

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.

Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
Quoted 7 lines

---
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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com