diff --git a/patch/misc/general-packaging-4.14.y.patch b/patch/misc/general-packaging-4.14.y.patch index 656bab5b17..ee5b0fd1a4 100644 --- a/patch/misc/general-packaging-4.14.y.patch +++ b/patch/misc/general-packaging-4.14.y.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 8c4bc5a2..30bc0cff 100644 +index 8c4bc5a2c..30bc0cffb 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -114,7 +114,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a @@ -12,7 +12,7 @@ index 8c4bc5a2..30bc0cff 100644 all: Image.gz $(KBUILD_DTBS) diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index e15159d0..d3bfac05 100755 +index e15159d0a..009332700 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -29,6 +29,27 @@ create_package() { @@ -177,7 +177,7 @@ index e15159d0..d3bfac05 100755 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles" if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then -@@ -325,12 +409,15 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then +@@ -325,16 +409,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" @@ -193,7 +193,12 @@ index e15159d0..d3bfac05 100755 cat <> debian/control Package: $kernel_headers_packagename -@@ -343,10 +430,21 @@ EOF + Architecture: any ++Depends: make, gcc, libc6-dev, libssl-dev + Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} + This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} + . +@@ -343,6 +431,16 @@ EOF cat <> debian/control @@ -210,11 +215,6 @@ index e15159d0..d3bfac05 100755 Package: $libc_headers_packagename Section: devel Provides: linux-kernel-headers - Architecture: any -+Depends: make, flex, bison, libssl-dev - Description: Linux support headers for userspace development - This package provides userspaces headers from the Linux kernel. These headers - are used by the installed headers for GNU glibc and other system libraries. @@ -354,7 +452,7 @@ EOF if [ "$ARCH" != "um" ]; then