kernel: bump 6.1 to 6.1.56

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

diff --git a/include/package-bin.mk b/include/package-bin.mk
index 96c1aeffcfb0b59c1d4811b75288de3a1e28df1d..4ca49218e95a27229926595cfa8317ee0ded2cf6 100644 (file)
--- a/include/package-bin.mk
+++ b/include/package-bin.mk
@@ -1,28 +1,36 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# 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))$(SDK)$(DEVELOPER),)
+      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+        $(_pkg_target)compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
         compile: install-bin-$(1)
       else
         compile: $(1)-disabled
         $(1)-disabled:
-               @echo "WARNING: skipping $(1) -- package not selected"
+               @echo "WARNING: skipping $(1) -- package not selected" >&2
       endif
     endif
     endif
 
-    install-bin-$(1): $(STAMP_BUILT)
-         rm -rf $(BIN_DIR)/$(1)
-         $(INSTALL_DIR) $(BIN_DIR)/$(1)
-         $(call Package/$(1)/install,$(BIN_DIR)/$(1))
+    $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT)
+               rm -rf $(PKG_BUILD_DIR)/.pkgdir/$(1) $$@
+               mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1)
+               $(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1))
+               touch $$@
+
+    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
+       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)