Commit 502465e4 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

at91bootstrap: allow specification of a custom patch directory 



Fixes bug #4664.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1b1fcb63

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
	#3403: libgpg-error: bump to version 1.10

	#3409: libgpg-error: download from gnupg.org

	#3421: nano: make tiny flag optional

	#4664: Cannot patch AT91Bootstrap

	#4700: setlocalversion not working for combination svn/ubuntu 11.10...



2011.11, Released November 30th, 2011:

boot/at91bootstrap/Config.in

+9 −0
Original line number Diff line number Diff line
@@ -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 ""

boot/at91bootstrap/at91bootstrap.mk

+9 −0
Original line number Diff line number Diff line
@@ -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