@@ -119,6 +119,9 @@ clean: debian/control
# Install the copyright information.
cp $(DEBIAN)/copyright debian/copyright
+ # Install the retpoline extractor.
+ cp $(DROOT)/scripts/retpoline-extract-one scripts/ubuntu-retpoline-extract-one
+
# If we have a reconstruct script use it.
[ -f $(DEBIAN)/reconstruct ] && bash $(DEBIAN)/reconstruct
@@ -127,7 +130,8 @@ clean: debian/control
distclean: clean
rm -rf $(DROOT)/control debian/changelog \
- debian/control debian/control.stub debian/copyright
+ debian/control debian/control.stub debian/copyright \
+ scripts/ubuntu-retpoline-extract-one
# Builds the image, arch headers and debug packages
include $(DROOT)/rules.d/2-binary-arch.mk
@@ -327,6 +327,8 @@ ifeq ($(build_arch),powerpc)
mkdir -p $(hdrdir)/arch/powerpc/lib
cp $(builddir)/build-$*/arch/powerpc/lib/*.o $(hdrdir)/arch/powerpc/lib
endif
+ # Copy over the new retpoline extractor.
+ cp scripts/ubuntu-retpoline-extract-one $(hdrdir)/scripts
# Script to symlink everything up
$(SHELL) $(DROOT)/scripts/link-headers "$(hdrdir)" "$(indeppkg)" "$*"
# The build symlink
@@ -298,7 +298,7 @@ objtool_dep = $(objtool_obj) \
include/config/stack/validation.h)
ifdef CONFIG_RETPOLINE
-cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/debian/scripts/retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))";
+cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/scripts/ubuntu-retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))";
else
cmd_ubuntu_retpoline =
endif
BugLink: http://bugs.launchpad.net/bugs/1760876 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian/rules | 6 +++++- debian/rules.d/2-binary-arch.mk | 2 ++ scripts/Makefile.build | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)