mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-18 22:43:53 +01:00
fix quilt apply for packages that change STAMP_*
SVN-Revision: 9531
This commit is contained in:
parent
98f43a2494
commit
2cb6cbf061
@ -56,7 +56,6 @@ ifneq ($(QUILT),)
|
|||||||
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
|
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
|
||||||
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
|
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
|
||||||
override CONFIG_AUTOREBUILD=
|
override CONFIG_AUTOREBUILD=
|
||||||
$(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
|
|
||||||
prepare: $(STAMP_PATCHED)
|
prepare: $(STAMP_PATCHED)
|
||||||
quilt-check: $(STAMP_CHECKED)
|
quilt-check: $(STAMP_CHECKED)
|
||||||
endif
|
endif
|
||||||
@ -101,32 +100,33 @@ define Quilt/Refresh
|
|||||||
$(if $(TARGET_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
|
$(if $(TARGET_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(STAMP_PATCHED): $(STAMP_PREPARED)
|
define Build/Quilt
|
||||||
|
$(STAMP_PATCHED): $(STAMP_PREPARED)
|
||||||
@( \
|
@( \
|
||||||
cd $(PKG_BUILD_DIR)/patches; \
|
cd $(PKG_BUILD_DIR)/patches; \
|
||||||
quilt pop -a -f >/dev/null 2>/dev/null; \
|
quilt pop -a -f >/dev/null 2>/dev/null; \
|
||||||
if [ -s ".subdirs" ]; then \
|
if [ -s ".subdirs" ]; then \
|
||||||
rm -f series; \
|
rm -f series; \
|
||||||
for file in $$(cat .subdirs); do \
|
for file in $$$$(cat .subdirs); do \
|
||||||
if [ -f $$file/series ]; then \
|
if [ -f $$$$file/series ]; then \
|
||||||
echo "Converting $$file/series"; \
|
echo "Converting $$file/series"; \
|
||||||
$(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' | sed -e s,//,/,g >> series; \
|
$$(call filter_series,$$$$file/series) | awk -v file="$$$$file/" '$$$$0 !~ /^#/ { print file $$$$0 }' | sed -e s,//,/,g >> series; \
|
||||||
else \
|
else \
|
||||||
echo "Sorting patches in $$file"; \
|
echo "Sorting patches in $$$$file"; \
|
||||||
find $$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \
|
find $$$$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \
|
||||||
fi; \
|
fi; \
|
||||||
done; \
|
done; \
|
||||||
else \
|
else \
|
||||||
find * -type f \! -name series | sort > series; \
|
find * -type f \! -name series | sort > series; \
|
||||||
fi; \
|
fi; \
|
||||||
)
|
)
|
||||||
touch $@
|
touch $$@
|
||||||
|
|
||||||
$(STAMP_CHECKED): $(STAMP_PATCHED)
|
$(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
|
||||||
|
$(STAMP_CHECKED): $(STAMP_PATCHED)
|
||||||
if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt next >/dev/null 2>&1 && quilt push -a || quilt top >/dev/null 2>&1); fi
|
if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt next >/dev/null 2>&1 && quilt push -a || quilt top >/dev/null 2>&1); fi
|
||||||
touch $@
|
touch $$@
|
||||||
|
|
||||||
define Build/Quilt
|
|
||||||
quilt-check: $(STAMP_PREPARED) FORCE
|
quilt-check: $(STAMP_PREPARED) FORCE
|
||||||
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
|
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
|
||||||
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
|
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
|
||||||
|
Loading…
Reference in New Issue
Block a user