From 8e4ca1337072e013514cc95bdfc66c0bd2dd6bd2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Dec 2019 21:55:37 +0100 Subject: [PATCH] package/{pkg-generic, python, python3}: rename .py file exclusion variable to not conflict Fixes: http://autobuild.buildroot.net/results/3b6/3b6280b0b7a9634b747db2865b21c6266007c725/ The PYTHON_KEEP_PY_FILES global variable conflicts with the per-package _KEEP_PY_FILES variable for the python package, causing make to complain: package/zlib/zlib.mk:7: *** Recursive variable 'PYTHON_KEEP_PY_FILES' references itself (eventually). Stop. As a workaround, rename the global variable to KEEP_PYTHON_PY_FILES so it cannot conflict with the per-package variable. Signed-off-by: Peter Korsgaard (cherry picked from commit 0f5ac40374c91e44af8c3806e848f8e62c42b140) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- package/python/python.mk | 2 +- package/python3/python3.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f2442dc637..1ac7f7877e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1043,7 +1043,7 @@ PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) -PYTHON_KEEP_PY_FILES += $$($(2)_KEEP_PY_FILES) +KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/python/python.mk b/package/python/python.mk index 3f9c510fde..29b9e363b1 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -263,7 +263,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) define PYTHON_REMOVE_PY_FILES find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(PYTHON_KEEP_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(PYTHON_KEEP_PY_FILES)) \) ) \ + $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -print0 | \ xargs -0 --no-run-if-empty rm -f endef diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f634b790ef..625c059135 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -281,7 +281,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) define PYTHON3_REMOVE_PY_FILES find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(PYTHON_KEEP_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(PYTHON_KEEP_PY_FILES)) \) ) \ + $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -print0 | \ xargs -0 --no-run-if-empty rm -f endef