mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 01:02:19 +00:00
104 lines
4 KiB
Diff
104 lines
4 KiB
Diff
--- a/scripts/package/builddeb
|
|
+++ b/scripts/package/builddeb
|
|
@@ -82,11 +82,11 @@
|
|
libc_headers_dir="$objtree/debian/headertmp"
|
|
dtb_dir="$objtree/debian/dtbtmp"
|
|
dbg_dir="$objtree/debian/dbgtmp"
|
|
-packagename=linux-image-$version
|
|
-fwpackagename=linux-firmware-image-$version
|
|
-kernel_headers_packagename=linux-headers-$version
|
|
-dtb_packagename=linux-dtb-$version
|
|
-libc_headers_packagename=linux-libc-dev
|
|
+packagename=linux-image"$LOCALVERSION"
|
|
+fwpackagename=linux-firmware-image"$LOCALVERSION"
|
|
+kernel_headers_packagename=linux-headers"$LOCALVERSION"
|
|
+dtb_packagename=linux-dtb"$LOCALVERSION"
|
|
+libc_headers_packagename=linux-libc-dev"$LOCALVERSION"
|
|
dbg_packagename=$packagename-dbg
|
|
|
|
if [ "$ARCH" = "um" ] ; then
|
|
@@ -173,7 +173,7 @@
|
|
|
|
if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
|
|
mkdir -p "$tmpdir/boot/dtb"
|
|
- cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb
|
|
+ cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb
|
|
#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
|
|
fi
|
|
|
|
@@ -218,7 +218,8 @@
|
|
## Create sym link to kernel image
|
|
##
|
|
kernel_tmp_version="${installed_image_path////\\/}"
|
|
-sed -e "s/exit 0/ln -sf \/$kernel_tmp_version \/boot\/zImage/g" -i $tmpdir/DEBIAN/postinst
|
|
+sed -e "s/exit 0/ln -sf \/$kernel_tmp_version \/boot\/zImage || cp \/$kernel_tmp_version \/boot\/zImage/g" -i $tmpdir/DEBIAN/postinst
|
|
+#echo "touch /boot/.next" >> $tmpdir/DEBIAN/postinst
|
|
echo "exit 0" >> $tmpdir/DEBIAN/postinst
|
|
|
|
|
|
@@ -239,9 +240,20 @@
|
|
fi
|
|
maintainer="$name <$email>"
|
|
|
|
+# Try to determine distribution
|
|
+if [ -n "$KDEB_CHANGELOG_DIST" ]; then
|
|
+ distribution=$KDEB_CHANGELOG_DIST
|
|
+elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ]; then
|
|
+ : # nothing to do in this case
|
|
+else
|
|
+ distribution="unstable"
|
|
+ echo >&2 "Using default distribution of 'unstable' in the changelog"
|
|
+ echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
|
|
+fi
|
|
+
|
|
# Generate a simple changelog template
|
|
cat <<EOF > debian/changelog
|
|
-linux-upstream ($packageversion) unstable; urgency=low
|
|
+linux-upstream ($packageversion) $distribution; urgency=low
|
|
|
|
* Custom built Linux kernel.
|
|
|
|
@@ -255,10 +267,10 @@
|
|
The sources may be found at most Linux ftp sites, including:
|
|
ftp://ftp.kernel.org/pub/linux/kernel
|
|
|
|
-Copyright: 1991 - 2009 Linus Torvalds and others.
|
|
+Copyright: 1991 - 2015 Linus Torvalds and others.
|
|
|
|
The git repository for mainline kernel development is at:
|
|
-git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
+git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
@@ -317,6 +329,12 @@
|
|
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
|
|
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
|
|
mkdir -p "$destdir"
|
|
+######################## headers patch
|
|
+ZACNI=$(pwd)
|
|
+cd $destdir
|
|
+patch -p1 < /tmp/headers-debian-byteshift.patch
|
|
+cd $ZACNI
|
|
+######################## headers patch
|
|
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
|
|
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
|
|
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
|
|
@@ -326,7 +344,7 @@
|
|
cat <<EOF >> debian/control
|
|
|
|
Package: $kernel_headers_packagename
|
|
-Provides: linux-headers, linux-headers-2.6
|
|
+Provides: linux-headers
|
|
Architecture: any
|
|
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
|
|
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
|
|
@@ -373,7 +391,7 @@
|
|
|
|
if [ "$ARCH" != "um" ]; then
|
|
create_package "$kernel_headers_packagename" "$kernel_headers_dir"
|
|
- create_package "$libc_headers_packagename" "$libc_headers_dir"
|
|
+# create_package "$libc_headers_packagename" "$libc_headers_dir"
|
|
fi
|
|
|
|
create_package "$packagename" "$tmpdir"
|