mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-20 22:01:31 +00:00
244 lines
9.3 KiB
Diff
244 lines
9.3 KiB
Diff
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
|
index 3001ec5a..071b38bd 100644
|
|
--- a/scripts/package/builddeb
|
|
+++ b/scripts/package/builddeb
|
|
@@ -42,6 +42,8 @@ create_package() {
|
|
debarch=hppa ;;
|
|
mips*)
|
|
debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;
|
|
+ arm64)
|
|
+ debarch=arm64 ;;
|
|
arm*)
|
|
debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;
|
|
*)
|
|
@@ -61,8 +63,30 @@ create_package() {
|
|
forcearch="-DArchitecture=$debarch"
|
|
fi
|
|
|
|
+ # Create preinstall and post install script to remove dtb
|
|
+ if [[ "$1" == *dtb* ]]; then
|
|
+ echo "if [ -d /boot/dtb-$version ]; then rm -rf /boot/dtb-$version.old; mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
|
|
+ echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
|
|
+ echo "if [ -d /dtb ]; then mv /dtb /dtb.old; fi" >> $pdir/DEBIAN/preinst
|
|
+ echo "if [ -d /boot/dtb ]; then mv /boot/dtb /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
|
|
+ echo "exit 0" >> $pdir/DEBIAN/preinst
|
|
+ chmod 775 $pdir/DEBIAN/preinst
|
|
+ #
|
|
+ echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/postinst
|
|
+ echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
|
|
+ echo "exit 0" >> $pdir/DEBIAN/postinst
|
|
+ chmod 775 $pdir/DEBIAN/postinst
|
|
+ fi
|
|
+
|
|
+ # Create postinstall script for headers
|
|
+ if [[ "$1" == *headers* ]]; then
|
|
+ echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
|
|
+ echo "exit 0" >> $pdir/DEBIAN/postinst
|
|
+ chmod 775 $pdir/DEBIAN/postinst
|
|
+ fi
|
|
+
|
|
# Create the package
|
|
- dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
|
|
+ dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
|
|
dpkg --build "$pdir" ..
|
|
}
|
|
|
|
@@ -78,17 +102,29 @@ tmpdir="$objtree/debian/tmp"
|
|
fwdir="$objtree/debian/fwtmp"
|
|
kernel_headers_dir="$objtree/debian/hdrtmp"
|
|
libc_headers_dir="$objtree/debian/headertmp"
|
|
-packagename=linux-image-$version
|
|
-fwpackagename=linux-firmware-image
|
|
-kernel_headers_packagename=linux-headers-$version
|
|
-libc_headers_packagename=linux-libc-dev
|
|
+dtb_dir="$objtree/debian/dtbtmp"
|
|
+dbg_dir="$objtree/debian/dbgtmp"
|
|
+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
|
|
packagename=user-mode-linux-$version
|
|
fi
|
|
|
|
+# Not all arches have the same installed path in debian
|
|
+# XXX: have each arch Makefile export a variable of the canonical image install
|
|
+# path instead
|
|
+case $ARCH in
|
|
+arm64)
|
|
+ installed_image_path="boot/Image-$version"
|
|
+esac
|
|
+
|
|
# Setup the directory structure
|
|
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
|
|
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir"
|
|
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
|
mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
|
|
mkdir -m 755 -p "$fwdir/DEBIAN"
|
|
@@ -98,6 +134,8 @@ mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
|
|
mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
|
|
mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
|
|
mkdir -p "$kernel_headers_dir/lib/modules/$version/"
|
|
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
|
|
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
|
|
if [ "$ARCH" = "um" ] ; then
|
|
mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
|
|
fi
|
|
@@ -113,14 +151,10 @@ else
|
|
cp System.map "$tmpdir/boot/System.map-$version"
|
|
cp .config "$tmpdir/boot/config-$version"
|
|
# Not all arches include the boot path in KBUILD_IMAGE
|
|
- if [ -e $KBUILD_IMAGE ]; then
|
|
- cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
|
|
- else
|
|
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
|
|
- fi
|
|
+ cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
|
|
fi
|
|
|
|
-if grep -q '^CONFIG_MODULES=y' .config ; then
|
|
+if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
|
INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
|
|
rm -f "$tmpdir/lib/modules/$version/build"
|
|
rm -f "$tmpdir/lib/modules/$version/source"
|
|
@@ -130,6 +164,12 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
|
|
fi
|
|
fi
|
|
|
|
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
|
|
+ mkdir -p "$tmpdir/boot/dtb-""$version"
|
|
+ cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
|
|
+ #INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
|
|
+fi
|
|
+
|
|
if [ "$ARCH" != "um" ]; then
|
|
$MAKE headers_check KBUILD_SRC=
|
|
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
|
|
@@ -149,12 +189,59 @@ set -e
|
|
# Pass maintainer script parameters to hook scripts
|
|
export DEB_MAINT_PARAMS="\$*"
|
|
|
|
-test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
|
|
+export INITRD=$want_initrd
|
|
+
|
|
+test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
|
|
+
|
|
exit 0
|
|
EOF
|
|
chmod 755 "$tmpdir/DEBIAN/$script"
|
|
done
|
|
|
|
+##
|
|
+## Create sym link to kernel image
|
|
+##
|
|
+kernel_tmp_version="${installed_image_path////\\/}"
|
|
+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
|
|
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
|
|
+cat >> $tmpdir/DEBIAN/postinst <<EOT
|
|
+ln -sf $(basename $kernel_tmp_version) /boot/Image > /dev/null 2>&1 || cp /$kernel_tmp_version /boot/Image
|
|
+
|
|
+if [ -f "/boot/initrd.img-$version" ]; then
|
|
+cp /boot/initrd.img-$version /boot/initrd.img > /dev/null 2>&1
|
|
+fi
|
|
+
|
|
+exit 0
|
|
+EOT
|
|
+##
|
|
+## FAT install workaround
|
|
+##
|
|
+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
|
|
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
|
|
+cat >> $tmpdir/DEBIAN/preinst <<EOT
|
|
+# exit if we are running chroot
|
|
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
|
|
+
|
|
+check_and_unmount (){
|
|
+boot_device=\$(mountpoint -d /boot)
|
|
+
|
|
+for file in /dev/* ; do
|
|
+ CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
|
|
+ if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
|
|
+ boot_partition=\$file
|
|
+ break;
|
|
+ fi
|
|
+done
|
|
+
|
|
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
|
|
+if [ "\$bootfstype" = "vfat" ]; then
|
|
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/Image*
|
|
+fi
|
|
+}
|
|
+mountpoint -q /boot && check_and_unmount
|
|
+EOT
|
|
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
|
|
+
|
|
# Try to determine maintainer and email values
|
|
if [ -n "$DEBEMAIL" ]; then
|
|
email=$DEBEMAIL
|
|
@@ -243,20 +330,31 @@ EOF
|
|
fi
|
|
|
|
# Build header package
|
|
-(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
|
|
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
|
|
-(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
|
|
+(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
|
|
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
+(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"
|
|
+(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"
|
|
-(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 -)
|
|
+######################## 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
|
|
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
|
|
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
|
|
|
|
+(cd "$destdir"; make M=scripts clean)
|
|
+
|
|
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}
|
|
@@ -282,6 +380,16 @@ fi
|
|
|
|
cat <<EOF >> debian/control
|
|
|
|
+Package: $dtb_packagename
|
|
+Architecture: any
|
|
+Description: Linux DTB, version $version
|
|
+ This package contains device blobs from the Linux kernel, version $version.
|
|
+EOF
|
|
+
|
|
+create_package "$dtb_packagename" "$dtb_dir"
|
|
+
|
|
+cat <<EOF >> debian/control
|
|
+
|
|
Package: $libc_headers_packagename
|
|
Section: devel
|
|
Provides: linux-kernel-headers
|
|
@@ -293,7 +401,7 @@ EOF
|
|
|
|
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"
|