* [Buildroot] [pull request] Pull request for branch for-2012.02/misc
@ 2012-02-02 22:29 Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2012-02-02 22:29 UTC (permalink / raw)
To: buildroot
The following changes since commit 8c3e2cbb53b0383f5b273a0a0c908b8b232d1072:
Introduce /run directory (2012-02-02 23:03:13 +0100)
are available in the git repository at:
http://free-electrons.com/~thomas/buildroot.git for-2012.02/misc
Thomas Petazzoni (2):
poco: the Zip module depends on XML, Net and Util modules
at91bootstrap: allow specification of a custom patch directory
boot/at91bootstrap/Config.in | 9 +++++++++
boot/at91bootstrap/at91bootstrap.mk | 9 +++++++++
package/poco/Config.in | 3 +++
3 files changed, 21 insertions(+), 0 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules
2012-02-02 22:29 [Buildroot] [pull request] Pull request for branch for-2012.02/misc Thomas Petazzoni
@ 2012-02-02 22:29 ` Thomas Petazzoni
2012-02-06 22:10 ` Arnout Vandecappelle
2012-02-02 22:29 ` [Buildroot] [PATCH 2/2] at91bootstrap: allow specification of a custom patch directory Thomas Petazzoni
2012-02-02 22:42 ` [Buildroot] [pull request] Pull request for branch for-2012.02/misc Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2012-02-02 22:29 UTC (permalink / raw)
To: buildroot
Without this, in a configuration where the Zip module is selected but
not the XML module, the build fails due to missing expat.h. This is
because POCO builds the XML module as soon as the Zip module is
enabled.
This fixes the build breakage visible at:
http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-output.bz2
with the configuration visible at:
http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/poco/Config.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/package/poco/Config.in b/package/poco/Config.in
index 241e304..36d8de9 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -37,6 +37,9 @@ config BR2_PACKAGE_POCO_NETSSL_OPENSSL
config BR2_PACKAGE_POCO_ZIP
bool "zip"
+ select BR2_PACKAGE_POCO_XML
+ select BR2_PACKAGE_POCO_NET
+ select BR2_PACKAGE_POCO_UTIL
config BR2_PACKAGE_POCO_DATA
bool
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules
2012-02-02 22:29 ` [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules Thomas Petazzoni
@ 2012-02-06 22:10 ` Arnout Vandecappelle
2012-02-07 17:48 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2012-02-06 22:10 UTC (permalink / raw)
To: buildroot
On Thursday 02 February 2012 23:29:25 Thomas Petazzoni wrote:
> Without this, in a configuration where the Zip module is selected but
> not the XML module, the build fails due to missing expat.h. This is
> because POCO builds the XML module as soon as the Zip module is
> enabled.
>
> This fixes the build breakage visible at:
>
> http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-output.bz2
>
> with the configuration visible at:
>
> http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-config
Good idea to refer to the test. However, will it exist there forever?
If not, I'm not sure if it should be in the commit message.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/poco/Config.in | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/package/poco/Config.in b/package/poco/Config.in
> index 241e304..36d8de9 100644
> --- a/package/poco/Config.in
> +++ b/package/poco/Config.in
> @@ -37,6 +37,9 @@ config BR2_PACKAGE_POCO_NETSSL_OPENSSL
>
> config BR2_PACKAGE_POCO_ZIP
> bool "zip"
> + select BR2_PACKAGE_POCO_XML
> + select BR2_PACKAGE_POCO_NET
> + select BR2_PACKAGE_POCO_UTIL
>
> config BR2_PACKAGE_POCO_DATA
> bool
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
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: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules
2012-02-06 22:10 ` Arnout Vandecappelle
@ 2012-02-07 17:48 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2012-02-07 17:48 UTC (permalink / raw)
To: buildroot
Le Mon, 6 Feb 2012 23:10:03 +0100,
Arnout Vandecappelle <arnout@mind.be> a ?crit :
> > This fixes the build breakage visible at:
> >
> > http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-output.bz2
> >
> > with the configuration visible at:
> >
> > http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-config
>
> Good idea to refer to the test. However, will it exist there
> forever? If not, I'm not sure if it should be in the commit message.
I can't guarantee it will be there forever, no. So indeed, next time
I'll put it after the ---.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] at91bootstrap: allow specification of a custom patch directory
2012-02-02 22:29 [Buildroot] [pull request] Pull request for branch for-2012.02/misc Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules Thomas Petazzoni
@ 2012-02-02 22:29 ` Thomas Petazzoni
2012-02-02 22:42 ` [Buildroot] [pull request] Pull request for branch for-2012.02/misc Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2012-02-02 22:29 UTC (permalink / raw)
To: buildroot
Fixes bug #4664.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/at91bootstrap/Config.in | 9 +++++++++
boot/at91bootstrap/at91bootstrap.mk | 9 +++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index b232b3b..9cbaf81 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -10,6 +10,15 @@ config BR2_TARGET_AT91BOOTSTRAP
if BR2_TARGET_AT91BOOTSTRAP
+config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR
+ string "custom patch dir"
+ help
+ If your board requires custom patches, add the path to the
+ directory containing the patches here. The patches must be
+ named at91bootstrap-<version>-<something>.patch.
+
+ Most users may leave this empty
+
config BR2_TARGET_AT91BOOTSTRAP_BOARD
string "Bootstrap board"
default ""
diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index a7a856c..5592d37 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -21,6 +21,15 @@ define AT91BOOTSTRAP_EXTRACT_CMDS
rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
endef
+ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),)
+define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+ support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \
+ at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch
+endef
+
+AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+endif
+
define AT91BOOTSTRAP_BUILD_CMDS
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
endef
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2012.02/misc
2012-02-02 22:29 [Buildroot] [pull request] Pull request for branch for-2012.02/misc Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 2/2] at91bootstrap: allow specification of a custom patch directory Thomas Petazzoni
@ 2012-02-02 22:42 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2012-02-02 22:42 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit 8c3e2cbb53b0383f5b273a0a0c908b8b232d1072:
Thomas> Introduce /run directory (2012-02-02 23:03:13 +0100)
Thomas> are available in the git repository at:
Thomas> http://free-electrons.com/~thomas/buildroot.git for-2012.02/misc
Thomas> Thomas Petazzoni (2):
Thomas> poco: the Zip module depends on XML, Net and Util modules
Thomas> at91bootstrap: allow specification of a custom patch directory
Committed both, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-07 17:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-02 22:29 [Buildroot] [pull request] Pull request for branch for-2012.02/misc Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 1/2] poco: the Zip module depends on XML, Net and Util modules Thomas Petazzoni
2012-02-06 22:10 ` Arnout Vandecappelle
2012-02-07 17:48 ` Thomas Petazzoni
2012-02-02 22:29 ` [Buildroot] [PATCH 2/2] at91bootstrap: allow specification of a custom patch directory Thomas Petazzoni
2012-02-02 22:42 ` [Buildroot] [pull request] Pull request for branch for-2012.02/misc Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox