diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-03-17 15:21:58 -0700 |
---|---|---|
committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-03-26 08:37:55 -0700 |
commit | bf017fe25f72beff0e323c47ef4c327216eadc2a (patch) | |
tree | 820444bfdd0cef80fc26231426aea1d03075b211 | |
parent | 2032a8a27b5cc0f578d37fa16fa2494b80a0d00a (diff) |
mtr: Build script adjustmentsmoo_2019-04-07
-rw-r--r-- | arch/arm64/Makefile | 2 | ||||
-rw-r--r-- | kernel/locking/lockdep_internals.h | 2 | ||||
-rwxr-xr-x | scripts/package/builddeb | 10 | ||||
-rwxr-xr-x | scripts/package/mkdebian | 14 |
4 files changed, 17 insertions, 11 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index b025304bde46..c1ad2f2cea71 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -131,7 +131,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make boot := arch/arm64/boot -KBUILD_IMAGE := $(boot)/Image.gz +KBUILD_IMAGE := $(boot)/Image all: Image.gz diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h index d4c197425f68..8df2f1e4a243 100644 --- a/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h @@ -84,7 +84,7 @@ enum { #define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS) -#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5) +#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*6) extern struct list_head all_lock_classes; extern struct lock_chain lock_chains[]; diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b03dd56a4782..3160682b110f 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -43,7 +43,7 @@ create_package() { # Create the package dpkg-gencontrol -p$pname -P"$pdir" - dpkg --build "$pdir" .. + dpkg-deb -Znone --build "$pdir" .. } version=$KERNELRELEASE @@ -51,9 +51,9 @@ tmpdir="$objtree/debian/tmp" kernel_headers_dir="$objtree/debian/hdrtmp" libc_headers_dir="$objtree/debian/headertmp" dbg_dir="$objtree/debian/dbgtmp" -packagename=linux-image-$version -kernel_headers_packagename=linux-headers-$version -libc_headers_packagename=linux-libc-dev +packagename=linux-image-mtr$LOCALVERSION +kernel_headers_packagename=linux-headers-mtr$LOCALVERSION +libc_headers_packagename=linux-libc-dev-mtr$LOCALVERSION dbg_packagename=$packagename-dbg if [ "$ARCH" = "um" ] ; then @@ -127,6 +127,8 @@ if is_enabled CONFIG_MODULES; then INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign fi fi + rm -rf "$tmpdir/lib/modules/$version/build" "$tmpdir/lib/modules/$version/source" + ln -sf "/usr/src/linux-headers-$version" "$tmpdir/lib/modules/$version/source" fi if [ "$ARCH" != "um" ]; then diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 8351584cb24e..abe9ef319189 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -94,8 +94,9 @@ else packageversion=$version-$revision fi sourcename=$KDEB_SOURCENAME -packagename=linux-image-$version -kernel_headers_packagename=linux-headers-$version +packagename=linux-image-mtr$LOCALVERSION +kernel_headers_packagename=linux-headers-mtr$LOCALVERSION +libc_headers_packagename=linux-libc-dev-mtr$LOCALVERSION dbg_packagename=$packagename-dbg debarch= set_debarch @@ -143,8 +144,10 @@ extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUST cat <<EOF > debian/changelog $sourcename ($packageversion) $distribution; urgency=low - * Custom built Linux kernel. - + * Custom built Linux kernel with these patches: +EOF +(cd source/ ; stg ser | sed -e '/^-/d' -e 's/^. / * /g') >> debian/changelog +cat <<EOF >> debian/changelog -- $maintainer $(date -R) EOF @@ -179,6 +182,7 @@ Homepage: http://www.kernel.org/ Package: $packagename Architecture: $debarch +Depends: djwong-kernel-support Description: Linux kernel, version $version This package contains the Linux kernel, modules and corresponding other files, version: $version. @@ -190,7 +194,7 @@ Description: Linux kernel headers for $version on $debarch . This is useful for people who need to build external modules -Package: linux-libc-dev +Package: $libc_headers_packagename Section: devel Provides: linux-kernel-headers Architecture: $debarch |