From cc6f9da66df3867f434a9a97284f9c65fdc0b3ab Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 27 Mar 2021 21:18:38 +0100 Subject: [PATCH] - rename apply_patches => apply_patchset --- make/buildsystem-helpers.mk | 4 ++-- make/host-tools.mk | 16 ++++++++-------- make/linux-drivers.mk | 6 +++--- make/linux-kernel.mk | 2 +- make/target-development.mk | 2 +- make/target-ffmpeg.mk | 2 +- make/target-libs-unused.mk | 10 +++++----- make/target-libs.mk | 16 ++++++++-------- make/target-lua.mk | 6 +++--- make/target-neutrino-plugins.mk | 2 +- make/target-tools-unused.mk | 6 +++--- make/target-tools.mk | 28 ++++++++++++++-------------- package/crosstool-ng/crosstool-ng.mk | 2 +- package/pkg-autotools.mk | 4 ++-- package/pkg-cmake.mk | 4 ++-- 15 files changed, 55 insertions(+), 55 deletions(-) diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk index b2f12d32..70ac5fbd 100644 --- a/make/buildsystem-helpers.mk +++ b/make/buildsystem-helpers.mk @@ -138,7 +138,7 @@ endef # ----------------------------------------------------------------------------- # apply patch sets -define apply_patches +define apply_patchset l=$(strip $(2)); test -z $$l && l=1; \ for i in $(1); do \ if [ -e $$i -o -e $(PKG_PATCHES_DIR)/$$i ]; then \ @@ -164,7 +164,7 @@ define apply_patches endef # apply patch sets automatically -APPLY_PATCHES = $(call apply_patches,$(PKG_PATCHES_DIR)) +APPLY_PATCHSET = $(call apply_patchset,$(PKG_PATCHES_DIR)) # ----------------------------------------------------------------------------- diff --git a/make/host-tools.mk b/make/host-tools.mk index 84a61a74..c8b51701 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -71,7 +71,7 @@ host-zic: $(DL_DIR)/$(HOST_ZIC_SOURCE) | $(HOST_DIR) $(MKDIR)/$(PKG_DIR) $(CHDIR)/$(PKG_DIR); \ tar -xf $(DL_DIR)/$(PKG_SOURCE); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) zic $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/zic $(HOST_ZIC) $(REMOVE)/$(PKG_DIR) @@ -139,7 +139,7 @@ host-meson: $(HOST_MESON_DEPENDENCIES) $(DL_DIR)/$(HOST_MESON_SOURCE) | $(HOST_D $(REMOVE)/$(HOST_MESON_DIR) $(UNTAR)/$(HOST_MESON_SOURCE) $(CHDIR)/$(HOST_MESON_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_PYTHON_BUILD); \ $(HOST_PYTHON_INSTALL) $(REMOVE)/$(HOST_MESON_DIR) @@ -161,7 +161,7 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_CMAKE); \ $(MAKE) $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/ninja $(HOST_NINJA) @@ -227,7 +227,7 @@ host-python3: $(HOST_PYTHON3_DEPENDENCIES) $(DL_DIR)/$(HOST_PYTHON3_SOURCE) | $( $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - #$(APPLY_PATCHES); \ + #$(APPLY_PATCHSET); \ autoconf; \ $(HOST_CONFIGURE);\ $(MAKE); \ @@ -251,7 +251,7 @@ host-python3-setuptools: $(HOST_PYTHON3_SETUPTOOLS_DEPENDENCIES) $(DL_DIR)/$(HOS $(REMOVE)/$(PKG_DIR) $(UNZIP)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_PYTHON_BUILD); \ $(HOST_PYTHON_INSTALL) $(REMOVE)/$(PKG_DIR) @@ -271,7 +271,7 @@ host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_CONFIGURE);\ $(MAKE); \ $(MAKE) install @@ -297,7 +297,7 @@ host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ + $(call apply_patchset,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ $(MAKE) linux; \ $(MAKE) install INSTALL_TOP=$(HOST_DIR) INSTALL_MAN=$(HOST_DIR)/share/man/man1 $(REMOVE)/$(PKG_DIR) @@ -337,7 +337,7 @@ host-luarocks: $(HOST_LUAROCKS_DEPENDENCIES) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_CONFIGURE);\ $(MAKE); \ $(MAKE) install diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index a3d59d5c..a1bd7d28 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -33,7 +33,7 @@ rtl8812au: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8812AU_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(RTL8812AU_DIR) $(UNZIP)/$(RTL8812AU_SOURCE) $(CHDIR)/$(RTL8812AU_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) $(KERNEL_MAKE_VARS); \ $(INSTALL_DATA) 8812au.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ $(LINUX_RUN_DEPMOD) @@ -54,7 +54,7 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(RTL8822BU_DIR) $(UNZIP)/$(RTL8822BU_SOURCE) $(CHDIR)/$(RTL8822BU_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) $(KERNEL_MAKE_VARS); \ $(INSTALL_DATA) 88x2bu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ $(LINUX_RUN_DEPMOD) @@ -85,7 +85,7 @@ hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x_MALI_ $(REMOVE)/$(HD6x_MALI_DRIVERS_DIR) $(UNTAR)/$(HD6x_MALI_DRIVERS_SOURCE) $(CHDIR)/$(HD6x_MALI_DRIVERS_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) -C $(KERNEL_OBJ_DIR) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS); \ $(MAKE) -C $(KERNEL_OBJ_DIR) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install $(LINUX_RUN_DEPMOD) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 42f69547..2902324a 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -228,7 +228,7 @@ kernel.do_prepare_tar: $(DL_DIR)/$(KERNEL_SOURCE) $(REMOVE)/$(KERNEL_DIR) $(UNTAR)/$(KERNEL_SOURCE) $(CHDIR)/$(KERNEL_DIR); \ - $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(KERNEL_PATCH))) + $(call apply_patchset,$(addprefix $(PKG_PATCHES_DIR)/,$(KERNEL_PATCH))) kernel.do_compile: kernel.do_prepare $(MAKE) -C $(BUILD_DIR)/$(KERNEL_DIR) $(KERNEL_MAKE_VARS) modules $(KERNEL_MAKE_TARGETS) diff --git a/make/target-development.mk b/make/target-development.mk index f7b23fce..d910f6a7 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -23,7 +23,7 @@ valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(call apply_patches,$(PKG_PATCH)); \ + $(call apply_patchset,$(PKG_PATCH)); \ $(CONFIGURE); \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 3e5ca4dc..61c4efa6 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -355,7 +355,7 @@ ffmpeg: $(FFMPEG_DEPENDENCIES) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(PKG_SOURCE) ifneq ($($(PKG)_UNPATCHED),yes) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES) + $(APPLY_PATCHSET) endif $(CHDIR)/$(PKG_DIR); \ ./configure $($(PKG)_CONF_OPTS); \ diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 278d2136..f889d2b0 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -22,7 +22,7 @@ libid3tag: $(LIBID3TAG_DEPENDENCIES) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DI $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -52,7 +52,7 @@ fontconfig: $(FONTCONFIG_DEPENDENCIES) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -82,7 +82,7 @@ pixman: $(PIXMAN_DEPENDENCIES) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -119,7 +119,7 @@ cairo: $(CAIRO_DEPENDENCIES) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -158,7 +158,7 @@ harfbuzz: $(HARFBUZZ_DEPENDENCIES) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) diff --git a/make/target-libs.mk b/make/target-libs.mk index c6e199a8..321cc2f0 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -23,7 +23,7 @@ zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) \ ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ @@ -78,7 +78,7 @@ freetype: $(FREETYPE_DEPENDENCIES) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(SED) '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg $(CHDIR)/$(PKG_DIR)/builds/unix; \ libtoolize --force --copy; \ @@ -138,7 +138,7 @@ openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ ./Configure \ $($(PKG)_CONF_OPTS); \ $(SED) 's| build_tests||' Makefile; \ @@ -193,7 +193,7 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE) libs; \ $(MAKE) install.libs DESTDIR=$(TARGET_DIR) @@ -237,7 +237,7 @@ libdpf: $(LIBDPF_DEPENDENCIES) | $(TARGET_DIR) $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE1) -C dpflib libdpf.a $($(PKG)_MAKE_OPTS) $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/dpflib/libdpf.a $(TARGET_libdir)/libdpf.a $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/dpflib/dpf.h $(TARGET_includedir)/libdpf/libdpf.h @@ -308,7 +308,7 @@ libbluray: $(LIBBLURAY_DEPENDENCIES) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DI $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ ./bootstrap; \ $(CONFIGURE); \ $(MAKE); \ @@ -506,7 +506,7 @@ glib2: $(GLIB2_DEPENDENCIES) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ echo "ac_cv_type_long_long=yes" > arm-linux.cache; \ echo "glib_cv_stack_grows=no" >> arm-linux.cache; \ echo "glib_cv_uscore=no" >> arm-linux.cache; \ @@ -573,7 +573,7 @@ graphlcd-base: $(GRAPHLCD_BASE_DEPENDENCIES) | $(TARGET_DIR) $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ + $(call apply_patchset,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) diff --git a/make/target-lua.mk b/make/target-lua.mk index d8a5df5f..979a7a5c 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -18,7 +18,7 @@ lua: $(LUA_DEPENDENCIES) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUA_DIR) $(UNTAR)/$(LUA_SOURCE) $(CHDIR)/$(LUA_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) linux \ PKG_VERSION=$(LUA_VERSION) \ $(TARGET_MAKE_OPTS) \ @@ -79,7 +79,7 @@ lua-feedparser: $(LUA-DEEDPARSER_DEPENDENCIES) $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(SED) 's|^PREFIX =|PREFIX ?=|' Makefile; \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(MAKE) install PREFIX=$(TARGET_prefix) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -170,7 +170,7 @@ luaposix: $(LUAPOSIX_DEPENDENCIES) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNU $(CHDIR)/$(PKG_DIR); \ tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \ tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ ./bootstrap; \ $(CONFIGURE); \ $(MAKE); \ diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk index 0c9239a2..7d24157f 100644 --- a/make/target-neutrino-plugins.mk +++ b/make/target-neutrino-plugins.mk @@ -259,7 +259,7 @@ links: $(LINKS_DEPENDENCIES) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARG echo "german" >> index.txt; \ ./gen-intl $(CHDIR)/$(LINKS_DIR); \ - $(call apply_patches,$(LINKS_PATCH)); \ + $(call apply_patchset,$(LINKS_PATCH)); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index df8988d7..c506de30 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -18,7 +18,7 @@ usbutils: $(USBUTILS_DEPENDENCIES) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -76,7 +76,7 @@ base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -125,7 +125,7 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ mv Makefile-libbz2_so Makefile; \ $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 43b30e17..a128ed9c 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -151,7 +151,7 @@ busybox: $(BUSYBOX_DEPENDENCIES) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $($(PKG)_INSTALL_CONFIG) $($(PKG)_MODIFY_CONFIG) $(CHDIR)/$(PKG_DIR); \ @@ -197,7 +197,7 @@ sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE) -C src SULOGINLIBS=-lcrypt; \ $(MAKE) install ROOT=$(TARGET_DIR) MANDIR=$(REMOVE_mandir) @@ -237,7 +237,7 @@ xfsprogs: $(XFSPROGS_DEPENDENCIES) $(DL_DIR)/$(XFSPROGS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DIST_ROOT=$(TARGET_DIR) @@ -323,7 +323,7 @@ hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mandir=$(REMOVE_mandir) @@ -462,7 +462,7 @@ djmount: $(DJMOUNT_DEPENDENCIES) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ touch libupnp/config.aux/config.rpath; \ $(CONFIGURE); \ $(MAKE1); \ @@ -496,7 +496,7 @@ ushare: $(USHARE_DEPENDENCIES) $(DL_DIR)/$(USHARE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) ./configure $($(PKG)_CONF_OPTS); \ ln -sf ../config.h src/; \ $(MAKE); \ @@ -526,7 +526,7 @@ vsftpd: $(VSFTPD_DEPENDENCIES) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(SED) 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ $(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ $(MAKE) clean; \ @@ -620,7 +620,7 @@ autofs: $(AUTOFS_DEPENDENCIES) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(SED) "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ $(CONFIGURE); \ $(MAKE) $($(PKG)_MAKE_OPTS) DONTSTRIP=1; \ @@ -689,7 +689,7 @@ samba33: $(SAMBA33_DEPENDENCIES) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CHDIR)/$(PKG_DIR)/source; \ ./autogen.sh; \ $(CONFIGURE); \ @@ -755,7 +755,7 @@ samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(CHDIR)/$(PKG_DIR)/source3; \ ./autogen.sh; \ $(CONFIGURE); \ @@ -831,7 +831,7 @@ fbshot: $(FBSHOT_DEPENDENCIES) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(SED) 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ $(SED) '/strip fbshot/d' Makefile; \ $(MAKE); \ @@ -937,7 +937,7 @@ xupnpd: $(XUPNPD_DEPENDENCIES) | $(TARGET_DIR) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ git checkout $($(PKG)_CHECKOUT); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE) -C src $($(PKG)_MAKE_OPTS) embedded ; \ $(INSTALL_EXEC) -D src/xupnpd $(TARGET_bindir)/xupnpd; \ @@ -1050,7 +1050,7 @@ dvb-apps: $(DVB_APPS_DEPENDENCIES) | $(TARGET_DIR) $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) LDLIBS="-liconv" \ $(MAKE) $($(PKG)_MAKE_OPTS); \ $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) @@ -1107,7 +1107,7 @@ gptfdisk: $(GPTFDISK_DEPENDENCIES) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE_ENV) \ $(MAKE) $($(PKG)_SBINARIES); \ for sbin in $($(PKG)_SBINARIES); do \ diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk index 21b3727b..bc4b6dc6 100644 --- a/package/crosstool-ng/crosstool-ng.mk +++ b/package/crosstool-ng/crosstool-ng.mk @@ -45,7 +45,7 @@ crosstool-ng: $(CROSSTOOL_NG_DEPS) | $(BUILD_DIR) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) $(CHDIR)/$($(PKG)_DIR); \ git checkout 1dbb06f2; \ - $(APPLY_PATCHES) + $(APPLY_PATCHSET) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) $(INSTALL_COPY) $(PKG_PATCHES_DIR)/gcc/* $(PKG_BUILD_DIR)/patches/gcc/linaro-6.3-2017.02 endif diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index db5d3738..0f6575f5 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -10,7 +10,7 @@ define autotools-package $(call STARTUP) $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -23,7 +23,7 @@ define host-autotools-package $(call STARTUP) $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_CONFIGURE); \ $(MAKE); \ $(MAKE) install diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index ddffdecc..ab078011 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -10,7 +10,7 @@ define cmake-package $(call STARTUP) $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(TARGET_CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -24,7 +24,7 @@ define host-cmake-package $(call STARTUP) $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ - $(APPLY_PATCHES); \ + $(APPLY_PATCHSET); \ $(HOST_CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR)