aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-29 19:33:22 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-06 11:04:59 +0200
commit0eba4759fab9d093afacac77a0ac31f1f0b3cceb (patch)
treeccebbcb4f86905d319d33da1e4a724a7d41b17f0 /linux
parentea8edb95144456529ad3047bce86b7449438ca42 (diff)
downloadbuildroot-0eba4759fab9d093afacac77a0ac31f1f0b3cceb.tar.gz
buildroot-0eba4759fab9d093afacac77a0ac31f1f0b3cceb.tar.bz2
packages: apply custom patches using *.patch instead of <pkg>-*.patch
Several packages have some logic to apply custom patches that existed before the BR2_GLOBAL_PATCH_DIR mechanism: at91bootstrap, at91bootstrap3, barebox, uboot and linux. Currently, the logic of those packages to apply custom patches is to match <package-name>-*.patch, which is not consistent with what we've done for patches stored in the package directory, and for patches stored in BR2_GLOBAL_PATCH_DIR: in such cases, we simply apply *.patch. Therefore, for consistency reasons, this commit changes these packages to also apply *.patch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'linux')
-rw-r--r--linux/Config.in2
-rw-r--r--linux/linux.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in
index a1113dd904..c83a3f51e6 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -129,7 +129,7 @@ config BR2_LINUX_KERNEL_PATCH
A space-separated list of patches to apply to the
kernel. Each patch can be described as an URL, a local file
path, or a directory. In the case of a directory, all files
- matching linux-*.patch in the directory will be applied.
+ matching *.patch in the directory will be applied.
#
# Configuration selection
diff --git a/linux/linux.mk b/linux/linux.mk
index 22fce3547c..21eb3c9966 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -159,7 +159,7 @@ endif # BR2_LINUX_KERNEL_VMLINUX
define LINUX_APPLY_LOCAL_PATCHES
for p in $(filter-out ftp://% http://% https://%,$(LINUX_PATCHES)) ; do \
if test -d $$p ; then \
- $(APPLY_PATCHES) $(@D) $$p linux-\*.patch || exit 1 ; \
+ $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \
else \
$(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
fi \