Merge tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi...

Pull misc Kbuild updates from Masahiro Yamada:

 - clean up builddeb script

 - use full path for KBUILD_IMAGE to fix rpm-pkg build

 - fix objdiff tool to ignore debug info

* tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  builddeb: fix typo
  builddeb: Update a few outdated and hardcoded strings
  deb-pkg: Remove the KBUILD_IMAGE workaround
  unicore32: Use full path in KBUILD_IMAGE definition
  sh: Use full path in KBUILD_IMAGE definition
  arc: Use full path in KBUILD_IMAGE definition
  arm: Use full path in KBUILD_IMAGE definition
  arm64: Use full path in KBUILD_IMAGE definition
  scripts: objdiff: Ignore debug info when comparing

diff --combined arch/arm64/Makefile
index 7dedf2d8494e368865e0f18c0095f53c499f2649,adf977fd39f19917da0c63dad5ac2dc0e23ee4ac..f839ecd919f934c54a73d8e9f8179aff3d3cba26
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -37,12 -37,10 +37,12 @@@ $(warning LSE atomics not supported by 
    endif
  endif
  
 +ifeq ($(CONFIG_ARM64), y)
  brokengasinst := $(call as-instr,1:\n.inst 0\n.rept . - 1b\n\nnop\n.endr\n,,-DCONFIG_BROKEN_GAS_INST=1)
  
 -ifneq ($(brokengasinst),)
 +  ifneq ($(brokengasinst),)
  $(warning Detected assembler with broken .inst; disassembly will be unreliable)
 +  endif
  endif
  
  KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst)
@@@ -102,12 -100,12 +102,12 @@@ libs-y          := arch/arm64/lib/ $(libs-y
  core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
  
  # Default target when executing plain make
- KBUILD_IMAGE  := Image.gz
+ boot          := arch/arm64/boot
+ KBUILD_IMAGE  := $(boot)/Image.gz
  KBUILD_DTBS   := dtbs
  
- all:  $(KBUILD_IMAGE) $(KBUILD_DTBS)
+ all:  Image.gz $(KBUILD_DTBS)
  
- boot := arch/arm64/boot
  
  Image: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

diff --combined scripts/package/builddeb
index 676fc10c9514c5370bcb2ecf2901e03baaf432a6,3407826f2a99d46fa1e4e85a6e144fdc7e420f0b..aad67000e4dd76796894cbd1975d087c559ecc5c
--- 1/scripts/package/builddeb
--- 2/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@@ -69,7 -69,7 +69,7 @@@ set_debarch() 
                echo "" >&2
                echo "** ** **  WARNING  ** ** **" >&2
                echo "" >&2
-               echo "Your architecture doesn't have it's equivalent" >&2
+               echo "Your architecture doesn't have its equivalent" >&2
                echo "Debian userspace architecture defined!" >&2
                echo "Falling back to using your current userspace instead!" >&2
                echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
@@@ -143,12 -143,7 +143,7 @@@ els
        cp System.map "$tmpdir/boot/System.map-$version"
        cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
  fi
- # Not all arches include the boot path in KBUILD_IMAGE
- if [ -e $KBUILD_IMAGE ]; then
-       cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
- else
-       cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
- fi
+ cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
  
  if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
        # Only some architectures with OF support have this target
@@@ -262,10 -257,10 +257,10 @@@ EO
  cat <<EOF > debian/copyright
  This is a packacked upstream version of the Linux kernel.
  
 -The sources may be found at most Linux ftp sites, including:
 -ftp://ftp.kernel.org/pub/linux/kernel
 +The sources may be found at most Linux archive sites, including:
 +https://www.kernel.org/pub/linux/kernel
  
- Copyright: 1991 - 2015 Linus Torvalds and others.
+ Copyright: 1991 - 2017 Linus Torvalds and others.
  
  The git repository for mainline kernel development is at:
  git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
@@@ -288,7 -283,6 +283,6 @@@ Section: kerne
  Priority: optional
  Maintainer: $maintainer
  Build-Depends: $build_depends
- Standards-Version: 3.8.4
  Homepage: http://www.kernel.org/
  EOF
  
@@@ -296,7 -290,6 +290,6 @@@ if [ "$ARCH" = "um" ]; the
        cat <<EOF >> debian/control
  
  Package: $packagename
- Provides: linux-image, linux-image-2.6, linux-modules-$version
  Architecture: any
  Description: User Mode Linux kernel, version $version
   User-mode Linux is a port of the Linux kernel to its own system call
@@@ -313,7 -306,6 +306,6 @@@ els
        cat <<EOF >> debian/control
  
  Package: $packagename
- Provides: linux-image, linux-image-2.6, linux-modules-$version
  Suggests: $fwpackagename
  Architecture: any
  Description: Linux kernel, version $version
@@@ -346,7 -338,6 +338,6 @@@ rm -f "$objtree/debian/hdrsrcfiles" "$o
  cat <<EOF >> debian/control
  
  Package: $kernel_headers_packagename
- Provides: linux-headers, linux-headers-2.6
  Architecture: any
  Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
   This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@@ -404,7 -395,6 +395,6 @@@ if [ -n "$BUILD_DEBUG" ] ; the
  
  Package: $dbg_packagename
  Section: debug
- Provides: linux-debug, linux-debug-$version
  Architecture: any
  Description: Linux kernel debugging symbols for $version
   This package will come in handy if you need to debug the kernel. It provides