projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
package-ipkg: do not include feeds.mk at metadata dump time to speed up scanning
[openwrt/staging/lynxis/omap.git]
/
include
/
quilt.mk
diff --git
a/include/quilt.mk
b/include/quilt.mk
index 9691dc3276c68dc8664ac38bd73d7c6afff1e628..b18b6364fe27b3aff1d58c35eede55f38cdc676d 100644
(file)
--- a/
include/quilt.mk
+++ b/
include/quilt.mk
@@
-1,4
+1,4
@@
-#
+#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@
-17,6
+17,7
@@
HOST_FILES_DIR?=$(FILES_DIR)
ifeq ($(MAKECMDGOALS),refresh)
override QUILT=1
ifeq ($(MAKECMDGOALS),refresh)
override QUILT=1
+ override HOST_QUILT=1
endif
QUILT_CMD:=quilt --quiltrc=-
endif
QUILT_CMD:=quilt --quiltrc=-
@@
-39,7
+40,7
@@
define PatchDir/Quilt
endef
define PatchDir/Default
endef
define PatchDir/Default
- @if [ -d "$(2)"
-a
"$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+ @if [ -d "$(2)"
] && [
"$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
export PATCH="$(PATCH)"; \
if [ -s "$(2)/series" ]; then \
$(call filter_series,$(2)/series) | xargs -n1 \
export PATCH="$(PATCH)"; \
if [ -s "$(2)/series" ]; then \
$(call filter_series,$(2)/series) | xargs -n1 \
@@
-125,7
+126,8
@@
define Quilt/Refresh/Kernel
endef
define Quilt/Template
endef
define Quilt/Template
- $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED) FORCE
+ $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED)
+ $(if $(NO_RECONFIGURE),$($(2)STAMP_BUILT),$($(2)STAMP_CONFIGURED)): FORCE
$($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED)
if [ -s "$(1)/patches/series" ]; then \
(cd "$(1)"; \
$($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED)
if [ -s "$(1)/patches/series" ]; then \
(cd "$(1)"; \