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; \