kernel: bump 5.15 to 5.15.110

[openwrt/openwrt.git] / include / package-bin.mk

diff --git a/include/package-bin.mk b/include/package-bin.mk
index 68f5831340949105280c3dc66718e143ab3dd556..4ca49218e95a27229926595cfa8317ee0ded2cf6 100644 (file)
--- a/include/package-bin.mk
+++ b/include/package-bin.mk
@@ -1,13 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2007-2020 OpenWrt.org
 
 ifeq ($(DUMP),)
   define BuildTarget/bin
-    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
+    TARGET_VARIANT=$(if $(ALL_VARIANTS),$(if $(VARIANT),$(filter-out *,$(VARIANT)),$(firstword $(ALL_VARIANTS))))
+    ifeq ($(if $(TARGET_VARIANT),$(BUILD_VARIANT)),$(TARGET_VARIANT))
     ifdef Package/$(1)/install
       ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
         $(_pkg_target)compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
@@ -29,10 +27,10 @@ ifeq ($(DUMP),)
     install-bin-$(1): $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
        rm -rf $(BIN_DIR)/$(1)
        -rmdir $(PKG_BUILD_DIR)/.pkgdir/$(1) >/dev/null 2>/dev/null
-       [ -d $(PKG_BUILD_DIR)/.pkgdir/$(1) ] && { \
+       if [ -d $(PKG_BUILD_DIR)/.pkgdir/$(1) ]; then \
                $(INSTALL_DIR) $(BIN_DIR)/$(1) && \
                $(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(BIN_DIR)/$(1)/; \
-       }
+       fi
 
     clean-$(1):
          rm -rf $(BIN_DIR)/$(1)