80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
--- a/scripts/package/builddeb
|
|
+++ b/scripts/package/builddeb
|
|
@@ -64,25 +64,6 @@
|
|
chmod -R a+rX "$pdir"
|
|
# in case we build in a setuid/setgid directory
|
|
chmod -R ug-s "$pdir"
|
|
-
|
|
- # Create preinstall and post install script to remove dtb
|
|
- if [ "$3" = "dtb" ]; then
|
|
-
|
|
- cat >> $pdir/DEBIAN/preinst <<- EOT
|
|
- rm -rf /boot/dtb
|
|
- rm -rf /boot/dtb-$version
|
|
- exit 0
|
|
- EOT
|
|
-
|
|
- cat >> $pdir/DEBIAN/postinst <<- EOT
|
|
- cd /boot
|
|
- ln -sfT dtb-$version dtb 2> /dev/null || mv dtb-$version dtb
|
|
- exit 0
|
|
- EOT
|
|
-
|
|
- chmod 775 $pdir/DEBIAN/preinst
|
|
- chmod 775 $pdir/DEBIAN/postinst
|
|
- fi
|
|
|
|
# Create postinst prerm script for headers
|
|
if [ "$3" = "headers" ]; then
|
|
@@ -187,7 +168,6 @@
|
|
kernel_headers_dir="debian/hdrtmp"
|
|
libc_headers_dir="debian/headertmp"
|
|
dbg_dir="debian/dbgtmp"
|
|
-dtb_dir="debian/dtbtmp"
|
|
packagename=linux-image-"$BRANCH$LOCALVERSION"
|
|
kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
|
dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
|
@@ -225,11 +205,9 @@
|
|
BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
|
|
|
|
# Setup the directory structure
|
|
-rm -rf "$tmpdir" "$dbg_dir" "$dtb_dir" debian/files
|
|
+rm -rf "$tmpdir" "$dbg_dir" debian/files
|
|
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
|
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
|
|
-mkdir -m 755 -p "$dtb_dir/DEBIAN"
|
|
-mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
|
|
mkdir -m 755 -p "$kernel_headers_dir/lib/modules/$version/"
|
|
mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
|
|
|
|
@@ -249,7 +227,7 @@
|
|
if is_enabled CONFIG_OF_EARLY_FLATTREE; then
|
|
# Only some architectures with OF support have this target
|
|
if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
|
|
- $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/linux-image-$version" dtbs_install
|
|
+ $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/boot/dtb/" dtbs_install
|
|
fi
|
|
fi
|
|
|
|
@@ -346,6 +324,7 @@
|
|
rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
|
|
fi
|
|
}
|
|
+ if [ -d /boot/dtb ]; then rm -rf /boot/dtb; fi
|
|
mountpoint -q /boot && check_boot_dev
|
|
exit 0
|
|
EOT
|
|
@@ -353,11 +332,6 @@
|
|
create_package "$packagename" "$tmpdir"
|
|
|
|
if [ "$ARCH" != "um" ]; then
|
|
-
|
|
- if [ "$(cat debian/arch)" != "amd64" ]; then # No DTB for amd64 target
|
|
- create_package "$dtb_packagename" "$dtb_dir" "dtb"
|
|
- fi
|
|
-
|
|
deploy_libc_headers $libc_headers_dir
|
|
create_package $libc_headers_packagename $libc_headers_dir
|
|
|
|
|