From 5378c856779c590e26910639e28b95a22aa2b9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 27 Mar 2017 17:21:12 +0200 Subject: build: remove absolute path to perl and replace with /usr/bin/env perl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bastian Köcher --- scripts/cleanpatch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/cleanpatch') diff --git a/scripts/cleanpatch b/scripts/cleanpatch index 9680d03ad2b..ab5ebddded2 100755 --- a/scripts/cleanpatch +++ b/scripts/cleanpatch @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # # Clean a patch file -- or directory of patch files -- of stealth whitespace. # WARNING: this can be a highly destructive operation. Use with caution. @@ -6,6 +6,7 @@ use bytes; use File::Basename; +use warnings; # Default options $max_width = 79; -- cgit v1.2.3 ass='main'>index : openwrt/upstream
upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.13/970-remove-unsane-filenames-from-deps_initramfs-list.patch
blob: ac13c9e673680a6bdd06ea0cb941b8c61d11f44b (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

--- a/usr/Makefile
+++ b/usr/Makefile
@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
 	include $(obj)/.initramfs_data.cpio.d
 endif
 
+deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
+
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
 	initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
 	initramfs_data.cpio
 # do not try to update files included in initramfs
-$(deps_initramfs): ;
+$(deps_initramfs_sane): ;
 
-$(deps_initramfs): klibcdirs
+$(deps_initramfs_sane): klibcdirs
 # We rebuild initramfs_data.cpio if:
 # 1) Any included file is newer then initramfs_data.cpio
 # 2) There are changes in which files are included (added or deleted)
 # 3) If gen_init_cpio are newer than initramfs_data.cpio
 # 4) arguments to gen_initramfs.sh changes
-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
+$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
 	$(call if_changed,initfs)