projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper series file support for regular packages
[openwrt.git]
/
include
/
quilt.mk
diff --git
a/include/quilt.mk
b/include/quilt.mk
index
a2cbdf9
..
c156d30
100644
(file)
--- a/
include/quilt.mk
+++ b/
include/quilt.mk
@@
-5,6
+5,9
@@
# See /LICENSE for more information.
#
# See /LICENSE for more information.
#
+ifneq ($(__quilt_inc),1)
+__quilt_inc:=1
+
ifeq ($(TARGET_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
ifeq ($(TARGET_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
@@
-26,7
+29,6
@@
endef
QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
ifneq ($(QUILT),)
QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
ifneq ($(QUILT),)
- STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
override CONFIG_AUTOREBUILD=
define Build/Patch/Default
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
override CONFIG_AUTOREBUILD=
define Build/Patch/Default
@@
-42,7
+44,12
@@
ifneq ($(QUILT),)
else
define Build/Patch/Default
@if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
else
define Build/Patch/Default
@if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
- $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+ if [ -f $(PATCH_DIR)/series ]; then \
+ grep -vE '^#' $(PATCH_DIR)/series | xargs -n1 \
+ $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+ else \
+ $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+ fi; \
fi
endef
endif
fi
endef
endif
@@
-135,3
+142,4
@@
refresh: quilt-check
update: quilt-check
$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
update: quilt-check
$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+endif
This page took
0.02221 seconds
and
4
git commands to generate.