mirror of
https://github.com/torvalds/linux
synced 2024-07-21 02:23:16 +00:00
Kbuild misc updates for 4.12
- Clean up builddeb script - Use full path for KBUILD_IMAGE to fix rpm-pkg build - Fix objdiff tool to ignore debug info -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZE6tOAAoJED2LAQed4NsG2o4P/ii2YuHMrxUh5J6KbC1ilLLC aGcapg+CQ+pFqMeVIbofaEdJI/+vofajG8Eh5vVr8R4Hj3i7PA+2AFgg3cNe2hFE OSHJbb3YTkYJJzG+s+BynF1dla03Yyo/sOHoV4yRst/hiEJHpLlOJgieIM9bv8pq 1DjBseHSrPGqUtvBuLoNwCbylhgyHiL5FycH//dpVbpNpoiy+HzSrcmXgT+rtbwJ qPEdf5QqapM0T83uxaYDko6VRYBIHOu9kQnVMUKS9+Qsqxm0NzO7Q8fFMdZpA8QY HCTFCQszeJid4VZO7VqKVCV40g3KGdAuCPPW7lZZO0H/AVEVqUv9PWOnuPCiyhJc ZXX7fmehvToHC0lbpC4GCHEQ9VxKF3KiNJUusDkFm63oSmvoaiRR2GGzWidpQ0eq l/lWB2/YygCQjs+kucDLhdIQjW89lkIBehXtZ28gkRYiLCbvQBpINHXrvZ/ai5uO hJ8hVyWnCkghm7alQDCktohMgRmcgUMPTByYcfbQG03vYBVITS9FBzvfSJgmRksQ DhPLakWq2Wlsx7DjjedELmO4JFn17oyi3av71lgiN5FjW9TBLxq3XmeHKu+avjEk LHisT5lCzh0YjyEhfSSkBtz2iyDBZhNUJKmw1Tf89owbKUMPnlxGjZtbmvQkv/qk 5GdCH7YJG+XchdlDi70b =vptn -----END PGP SIGNATURE----- Merge tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 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
This commit is contained in:
Linus Torvalds
commit
23ea3f62f3
|
|
@ -123,9 +123,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)
|
|||
boot := arch/arc/boot
|
||||
|
||||
#default target for make without any arguments.
|
||||
KBUILD_IMAGE := bootpImage
|
||||
KBUILD_IMAGE := $(boot)/bootpImage
|
||||
|
||||
all: $(KBUILD_IMAGE)
|
||||
all: bootpImage
|
||||
bootpImage: vmlinux
|
||||
|
||||
boot_targets += uImage uImage.bin uImage.gz
|
||||
|
|
|
|||
|
|
@ -297,10 +297,11 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/
|
|||
libs-y := arch/arm/lib/ $(libs-y)
|
||||
|
||||
# Default target when executing plain make
|
||||
boot := arch/arm/boot
|
||||
ifeq ($(CONFIG_XIP_KERNEL),y)
|
||||
KBUILD_IMAGE := xipImage
|
||||
KBUILD_IMAGE := $(boot)/xipImage
|
||||
else
|
||||
KBUILD_IMAGE := zImage
|
||||
KBUILD_IMAGE := $(boot)/zImage
|
||||
endif
|
||||
|
||||
# Build the DT binary blobs if we have OF configured
|
||||
|
|
@ -308,9 +309,8 @@ ifeq ($(CONFIG_USE_OF),y)
|
|||
KBUILD_DTBS := dtbs
|
||||
endif
|
||||
|
||||
all: $(KBUILD_IMAGE) $(KBUILD_DTBS)
|
||||
all: $(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS)
|
||||
|
||||
boot := arch/arm/boot
|
||||
|
||||
archheaders:
|
||||
$(Q)$(MAKE) $(build)=arch/arm/tools uapi
|
||||
|
|
|
|||
|
|
@ -102,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)/$@
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux
|
|||
defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE) := vmlinux
|
||||
|
||||
# Set some sensible Kbuild defaults
|
||||
KBUILD_IMAGE := $(defaultimage-y)
|
||||
boot := arch/sh/boot
|
||||
KBUILD_IMAGE := $(boot)/$(defaultimage-y)
|
||||
|
||||
#
|
||||
# Choosing incompatible machines durings configuration will result in
|
||||
|
|
@ -186,8 +187,6 @@ cpuincdir-y += cpu-common # Must be last
|
|||
drivers-y += arch/sh/drivers/
|
||||
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
|
||||
|
||||
boot := arch/sh/boot
|
||||
|
||||
cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \
|
||||
$(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
|
||||
|
||||
|
|
@ -211,7 +210,7 @@ BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \
|
|||
romImage
|
||||
PHONY += $(BOOT_TARGETS)
|
||||
|
||||
all: $(KBUILD_IMAGE)
|
||||
all: $(notdir $(KBUILD_IMAGE))
|
||||
|
||||
$(BOOT_TARGETS): vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ boot := arch/unicore32/boot
|
|||
|
||||
# Default defconfig and target when executing plain make
|
||||
KBUILD_DEFCONFIG := $(ARCH)_defconfig
|
||||
KBUILD_IMAGE := zImage
|
||||
KBUILD_IMAGE := $(boot)/zImage
|
||||
|
||||
all: $(KBUILD_IMAGE)
|
||||
all: zImage
|
||||
|
||||
zImage Image uImage: vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
|
||||
|
|
|
|||
|
|
@ -57,13 +57,15 @@ get_output_dir() {
|
|||
do_objdump() {
|
||||
dir=$(get_output_dir $1)
|
||||
base=${1##*/}
|
||||
stripped=$dir/${base%.o}.stripped
|
||||
dis=$dir/${base%.o}.dis
|
||||
|
||||
[ ! -d "$dir" ] && mkdir -p $dir
|
||||
|
||||
# remove addresses for a cleaner diff
|
||||
# http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-scientificlinux-and
|
||||
$OBJDUMP -D $1 | sed "s/^[[:space:]]\+[0-9a-f]\+//" > $dis
|
||||
$STRIP -g $1 -R __bug_table -R .note -R .comment -o $stripped
|
||||
$OBJDUMP -D $stripped | sed -e "s/^[[:space:]]\+[0-9a-f]\+//" -e "s:^$stripped:$1:" > $dis
|
||||
}
|
||||
|
||||
dorecord() {
|
||||
|
|
@ -73,6 +75,7 @@ dorecord() {
|
|||
|
||||
CMT="`git rev-parse --short HEAD`"
|
||||
|
||||
STRIP="${CROSS_COMPILE}strip"
|
||||
OBJDUMP="${CROSS_COMPILE}objdump"
|
||||
|
||||
for d in $FILES; do
|
||||
|
|
|
|||
|
|
@ -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 @@ else
|
|||
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
|
||||
|
|
@ -265,7 +260,7 @@ This is a packacked upstream version of the 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 @@ Section: kernel
|
|||
Priority: optional
|
||||
Maintainer: $maintainer
|
||||
Build-Depends: $build_depends
|
||||
Standards-Version: 3.8.4
|
||||
Homepage: http://www.kernel.org/
|
||||
EOF
|
||||
|
||||
|
|
@ -296,7 +290,6 @@ if [ "$ARCH" = "um" ]; then
|
|||
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 @@ else
|
|||
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 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
|
|||
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 @@ if [ -n "$BUILD_DEBUG" ] ; then
|
|||
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue