From 562a1601c8036aa9cf05d789b2b56fb7879aac8c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 25 Dec 2018 23:10:28 +0000 Subject: [PATCH] [powerpc,powerpcspe,ppc64] linux-config: Eliminate config.*_bootwrapper.gz files On powerpc architectures that may use a bootwrapper, we create a temporary build____bootwrapper directory for each kernel configuration to hold the related tools which we won't install for real (because they are always native). This directory is then matched by the wildcard used in building linux-config, causing linux-config packages to contain spurious (empty) kconfig files based on these directories in addition to the real kconfig files. Rename the temporary directory to avoid matching that wildcard. --- debian/changelog | 2 ++ debian/rules.real | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c32da138..e3b529a15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ linux (4.19.12-2) UNRELEASED; urgency=medium * linux-image-*-unsigned: Remove Provides field (Closes: #916927) * [ia64,m68k] libbpf: Don't build on architectures without performance events * [riscv64] tools/include/.../bitsperlong.h: Add support for riscv + * [powerpc,powerpcspe,ppc64] linux-config: Eliminate config.*_bootwrapper.gz + files -- Uwe Kleine-König Sun, 23 Dec 2018 17:28:52 +0100 diff --git a/debian/rules.real b/debian/rules.real index 2d6c88c95..ce909d7e0 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -479,12 +479,12 @@ ifneq ($(filter powerpc powerpcspe ppc64,$(ARCH)),) # the executables it calls. Kbuild will always build these executable # as native code, which is wrong for a cross-built package. Install # symlinks to the versions in the linux-bootwrapper package instead. - rm -rf '$(DIR)_bootwrapper' + rm -rf '$(BUILD_DIR)/bootwrapper_$(ARCH)_$(FEATURESET)_$(FLAVOUR)' +$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \ WRAPPER_OBJDIR='$(CURDIR)/$(DT_INSTALL_DIR)' \ WRAPPER_DTSDIR='$(CURDIR)/$(DT_INSTALL_DIR)/dts' \ - WRAPPER_BINDIR='$(CURDIR)/$(DIR)_bootwrapper' - for prog in '$(DIR)_bootwrapper'/*; do \ + WRAPPER_BINDIR='$(CURDIR)/$(BUILD_DIR)/bootwrapper_$(ARCH)_$(FEATURESET)_$(FLAVOUR)' + for prog in '$(BUILD_DIR)/bootwrapper_$(ARCH)_$(FEATURESET)_$(FLAVOUR)'/*; do \ prog="$$(basename $$prog)"; \ ln -s ../linux-bootwrapper-$(ABINAME)/$$prog \ '$(DT_INSTALL_DIR)'/$$prog; \