Browse Source

- buildsystem-helpers: add some more patch file masks

master
vanhofen 2 years ago
parent
commit
481683de48
  1. 11
      make/buildsystem-helpers.mk
  2. 2
      make/environment-build.mk

11
make/buildsystem-helpers.mk

@ -64,6 +64,15 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
PATCHES = \
*.patch \
*.patch-$(TARGET_CPU) \
*.patch-$(TARGET_ARCH) \
*.patch-$(BOXTYPE) \
*.patch-$(BOXSERIES) \
*.patch-$(BOXFAMILY) \
*.patch-$(BOXMODEL)
# apply single patches or patch sets # apply single patches or patch sets
define APPLY_PATCHES # (patches or directory) define APPLY_PATCHES # (patches or directory)
@$(call MESSAGE,"Patching") @$(call MESSAGE,"Patching")
@ -75,7 +84,7 @@ define APPLY_PATCHES # (patches or directory)
continue; \ continue; \
fi; \ fi; \
if [ -d $$i ]; then \ if [ -d $$i ]; then \
for p in $$i/*.patch $$i/*.patch-$(TARGET_CPU) $$i/*.patch-$(TARGET_ARCH); do \ for p in $(addprefix $$i/,$(PATCHES)); do \
if [ -e $$p ]; then \ if [ -e $$p ]; then \
$(call MESSAGE,"Applying $${p#$(PKG_PATCHES_DIR)/} (*)"); \ $(call MESSAGE,"Applying $${p#$(PKG_PATCHES_DIR)/} (*)"); \
patch -p1 -i $$p; \ patch -p1 -i $$p; \

2
make/environment-build.mk

@ -98,8 +98,6 @@ CROSS_BASE = $(BASE_DIR)/cross
CROSS_DIR ?= $(CROSS_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION) CROSS_DIR ?= $(CROSS_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)
STATIC_BASE = $(BASE_DIR)/static STATIC_BASE = $(BASE_DIR)/static
STATIC_DIR = $(STATIC_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION) STATIC_DIR = $(STATIC_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)
CONFIGS = $(BASE_DIR)/configs
PATCHES = $(BASE_DIR)/patches
SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES) SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES)
ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus

Loading…
Cancel
Save