mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-13 18:34:53 +00:00
9536446965
The current code fails if we have package or host tools with no patches to apply. The error printend is the following: (taking ubus as an example) make[2]: Entering directory '/home/ansuel/openwrt-ansuel/openwrt/scripts/config' make[2]: 'conf' is up to date. make[2]: Leaving directory '/home/ansuel/openwrt-ansuel/openwrt/scripts/config' make[1]: Entering directory '/home/ansuel/openwrt-ansuel/openwrt' make[2]: Entering directory '/home/ansuel/openwrt-ansuel/openwrt/package/system/ubus' The source directory contains no quilt patches. make[2]: *** [Makefile:81: quilt-check] Error 1 make[2]: Leaving directory '/home/ansuel/openwrt-ansuel/openwrt/package/system/ubus' time: package/system/ubus/refresh#0.06#0.00#0.07 ERROR: package/system/ubus failed to build. make[1]: *** [package/Makefile:120: package/system/ubus/refresh] Error 1 make[1]: Leaving directory '/home/ansuel/openwrt-ansuel/openwrt' make: *** [/home/ansuel/openwrt-ansuel/openwrt/include/toplevel.mk:232: package/ubus/refresh] Error 2 We exit 1 after saying that there are no patches because later in the function quilt pop fails to execute. Having no patches for a package and calling refresh should not be a critical error and the function should just do nothing. To handle this improve quilt.mk with the following addition. - If we don't have any patch for the package, we print a warning and we create an empty series. This is useful to trick quilt and make it do nothing. We also create a status file .quilt_no_patch to detect in the other function that we don't have patches to handle. - In refresh makefile target, we check if .quilt_no_patch exist and we skip quilt cleanup if this exist. - In RefreshDir function we change the logic and now we delete the patches directory and not only the content. This is done as a cleanup to clean case with empty patches directory. - In RefreshDir we check if .quilt_no_patch exist and we skip creating the patches directory and copying the refreshed patches. - In RefreshDir we delete at the end any trace of .quilt_no_patch if present. This is needed to support run like package/refresh that will run the refresh process on any package present in the buildroot. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
185 lines
6.0 KiB
Makefile
185 lines
6.0 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# Copyright (C) 2007-2020 OpenWrt.org
|
|
|
|
ifeq ($(TARGET_BUILD),1)
|
|
PKG_BUILD_DIR:=$(LINUX_DIR)
|
|
endif
|
|
|
|
ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
|
|
override QUILT=1
|
|
override HOST_QUILT=1
|
|
endif
|
|
|
|
ifneq ($(PKG_BUILD_DIR),)
|
|
QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
|
|
ifneq ($(QUILT),)
|
|
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
|
|
override CONFIG_AUTOREBUILD=
|
|
override CONFIG_AUTOREMOVE=
|
|
quilt-check: $(STAMP_CHECKED)
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(HOST_BUILD_DIR),)
|
|
HOST_QUILT?=$(if $(findstring command,$(origin QUILT)),$(QUILT),$(if $(wildcard $(HOST_BUILD_DIR)/.quilt_used),y))
|
|
ifneq ($(HOST_QUILT),)
|
|
HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked
|
|
override CONFIG_AUTOREBUILD=
|
|
override CONFIG_AUTOREMOVE=
|
|
host-quilt-check: $(HOST_STAMP_CHECKED)
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(if $(DUMP),1,$(__quilt_inc)),1)
|
|
__quilt_inc:=1
|
|
|
|
PATCH_DIR?=$(CURDIR)/patches
|
|
FILES_DIR?=$(CURDIR)/files
|
|
HOST_PATCH_DIR?=$(PATCH_DIR)
|
|
HOST_FILES_DIR?=$(FILES_DIR)
|
|
|
|
QUILT_CMD:=quilt --quiltrc=-
|
|
|
|
define filter_series
|
|
sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
|
|
endef
|
|
|
|
define PatchDir/Quilt
|
|
@mkdir -p "$(1)/patches$(if $(3),/$(patsubst %/,%,$(3)))"
|
|
@if [ -s "$(2)/series" ]; then \
|
|
mkdir -p "$(1)/patches/$(3)"; \
|
|
cp "$(2)/series" "$(1)/patches/$(3)"; \
|
|
fi
|
|
@for patch in $$$$( (cd "$(2)" && if [ -f series ]; then $(call filter_series,series); else ls | sort; fi; ) 2>/dev/null ); do ( \
|
|
cp "$(2)/$$$$patch" "$(1)/patches/$(3)"; \
|
|
echo "$(3)$$$$patch" >> "$(1)/patches/series"; \
|
|
); done
|
|
$(if $(3),@echo $(3) >> "$(1)/patches/.subdirs")
|
|
endef
|
|
|
|
define PatchDir/Default
|
|
@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 \
|
|
$(KPATCH) "$(1)" "$(2)"; \
|
|
else \
|
|
$(KPATCH) "$(1)" "$(2)"; \
|
|
fi; \
|
|
fi
|
|
endef
|
|
|
|
define PatchDir
|
|
$(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
|
|
endef
|
|
|
|
define HostPatchDir
|
|
$(call PatchDir/$(if $(strip $(HOST_QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
|
|
endef
|
|
|
|
define Host/Patch/Default
|
|
$(if $(HOST_QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches)
|
|
$(call HostPatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),)
|
|
$(if $(HOST_QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
|
|
endef
|
|
|
|
define Build/Patch/Default
|
|
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
|
|
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),)
|
|
$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
|
|
endef
|
|
|
|
kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
|
|
define Kernel/Patch/Default
|
|
$(if $(QUILT),rm -rf $(LINUX_DIR)/patches; mkdir -p $(LINUX_DIR)/patches)
|
|
$(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
|
|
find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
|
|
if [ -d $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) ]; then \
|
|
echo "generic patches directory is present. please move your patches to the pending directory" ; \
|
|
exit 1; \
|
|
fi
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_PATCH_DIR),generic/)
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_HACK_DIR),generic-hack/)
|
|
$(call PatchDir,$(LINUX_DIR),$(PATCH_DIR),platform/)
|
|
endef
|
|
|
|
define Quilt/RefreshDir
|
|
-rm -rf $(2) 2>/dev/null >/dev/null
|
|
[ -f $(1)/.quilt_no_patch ] || mkdir -p $(2)
|
|
@[ -f $(1)/.quilt_no_patch ] || { \
|
|
for patch in $$$$($(if $(3),grep "^$(3)",cat) $(1)/patches/series | awk '{print $$$$1}'); do \
|
|
$(CP) -v "$(1)/patches/$$$$patch" $(2); \
|
|
done; \
|
|
}
|
|
@-rm -f $(1)/.quilt_no_patch 2>/dev/null >/dev/null;
|
|
endef
|
|
|
|
define Quilt/Refresh/Host
|
|
$(call Quilt/RefreshDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR))
|
|
endef
|
|
|
|
define Quilt/Refresh/Package
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR))
|
|
endef
|
|
|
|
define Quilt/Refresh/Kernel
|
|
@[ -z "$$(grep -v '^generic/' $(PKG_BUILD_DIR)/patches/series | grep -v '^platform/')" ] || { \
|
|
echo "All kernel patches must start with either generic/ or platform/"; \
|
|
false; \
|
|
}
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
|
|
endef
|
|
|
|
define Quilt/Template
|
|
$($(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)"; \
|
|
if $(QUILT_CMD) next >/dev/null 2>&1; then \
|
|
$(QUILT_CMD) push -a; \
|
|
else \
|
|
$(QUILT_CMD) top >/dev/null 2>&1; \
|
|
fi \
|
|
); \
|
|
fi
|
|
touch "$$@"
|
|
|
|
$(3)quilt-check: $($(2)STAMP_PREPARED) FORCE
|
|
@[ -f "$(1)/.quilt_used" ] || { \
|
|
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
|
|
false; \
|
|
}
|
|
@[ -f "$(1)/patches/series" ] || { \
|
|
echo "The source directory contains no quilt patches."; \
|
|
touch $(1)/patches/series $(1)/.quilt_no_patch; \
|
|
}
|
|
@[ -n "$$$$(ls $(1)/patches/series)" -o \
|
|
"$$$$(cat $(1)/patches/series | $(MKHASH) md5)" = "$$(sort $(1)/patches/series | $(MKHASH) md5)" ] || { \
|
|
echo "The patches are not sorted in the right order. Please fix."; \
|
|
false; \
|
|
}
|
|
|
|
$(3)refresh: $(3)quilt-check
|
|
@[ -f $(1)/.quilt_no_patch ] || { \
|
|
cd "$(1)"; $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null; \
|
|
while $(QUILT_CMD) next 2>/dev/null >/dev/null && $(QUILT_CMD) push; do \
|
|
QUILT_DIFF_OPTS="-p" $(QUILT_CMD) refresh -p ab --no-index --no-timestamps; \
|
|
done; ! $(QUILT_CMD) next 2>/dev/null >/dev/null; \
|
|
}
|
|
$(Quilt/Refresh/$(4))
|
|
|
|
$(3)update: $(3)quilt-check
|
|
$(Quilt/Refresh/$(4))
|
|
endef
|
|
|
|
Build/Quilt=$(call Quilt/Template,$(PKG_BUILD_DIR),,,$(if $(TARGET_BUILD),Kernel,Package))
|
|
Host/Quilt=$(call Quilt/Template,$(HOST_BUILD_DIR),HOST_,host-,Host)
|
|
|
|
endif
|