CoCalc -- general-packaging-4.4.y-rk3399.patch

Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more,
all in one place. Commercial Alternative to JupyterHub.

GitHub Repository: orangepi-xunlong/orangepi-build
Path: blob/next/external/patch/misc/general-packaging-4.4.y-rk3399.patch
Views: ³⁹⁵⁹
1
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
2
index 6c3b038e..f4166fbe 100755
3
--- a/scripts/package/builddeb
4
+++ b/scripts/package/builddeb
5
@@ -27,6 +27,28 @@ create_package() {
6
 	chown -R root:root "$pdir"
7
 	chmod -R go-w "$pdir"
8
 
9
+	# Create preinstall and post install script to remove dtb
10
+	if [[ "$1" == *dtb* ]]; then
11
+		echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
12
+		echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
13
+		echo "if [ -d /dtb ]; then mv /dtb /dtb.old; fi" >> $pdir/DEBIAN/preinst
14
+		echo "if [ -d /boot/dtb ]; then mv /boot/dtb /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
15
+		echo "exit 0" >> $pdir/DEBIAN/preinst
16
+		chmod 775 $pdir/DEBIAN/preinst
17
+		#
18
+		echo "if [ -d /boot/dtb-$version.old ]; then rm -rf /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/postinst
19
+		echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
20
+		echo "exit 0" >> $pdir/DEBIAN/postinst
21
+		chmod 775 $pdir/DEBIAN/postinst
22
+	fi
23
+
24
+	# Create postinstall script for headers
25
+	if [[ "$1" == *headers* ]]; then
26
+		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; find -type f -exec touch {} +;make -s scripts >/dev/null; make -s M=scripts/mod/ >/dev/null" >> $pdir/DEBIAN/postinst
27
+		echo "exit 0" >> $pdir/DEBIAN/postinst
28
+		chmod 775 $pdir/DEBIAN/postinst
29
+	fi
30
+
31
 	# Create the package
32
 	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
33
 	dpkg --build "$pdir" ..
34
@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
35
 fwdir="$objtree/debian/fwtmp"
36
 kernel_headers_dir="$objtree/debian/hdrtmp"
37
 libc_headers_dir="$objtree/debian/headertmp"
38
+dtb_dir="$objtree/debian/dtbtmp"
39
 dbg_dir="$objtree/debian/dbgtmp"
40
-packagename=linux-image-$version
41
-fwpackagename=linux-firmware-image-$version
42
-kernel_headers_packagename=linux-headers-$version
43
-libc_headers_packagename=linux-libc-dev
44
+packagename=linux-image-"$BRANCH$LOCALVERSION"
45
+fwpackagename=linux-firmware-image-"$BRANCH$LOCALVERSION"
46
+kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
47
+dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
48
+libc_headers_packagename=linux-libc-dev-"$BRANCH$LOCALVERSION"
49
 dbg_packagename=$packagename-dbg
50
 debarch=
51
 forcearch=
52
@@ -114,7 +138,7 @@ case $ARCH in
53
 um)
54
 	installed_image_path="usr/bin/linux-$version"
55
 	;;
56
-parisc|mips|powerpc)
57
+parisc|mips|powerpc|arm64)
58
 	installed_image_path="boot/vmlinux-$version"
59
 	;;
60
 *)
61
@@ -124,7 +148,9 @@ esac
62
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
63
 
64
 # Setup the directory structure
65
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
66
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
67
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
68
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
69
 mkdir -m 755 -p "$tmpdir/DEBIAN"
70
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
71
 mkdir -p "$fwdir/lib/firmware/$version/"
72
@@ -143,9 +169,10 @@ else
73
 fi
74
 # Not all arches include the boot path in KBUILD_IMAGE
75
 if [ -e $KBUILD_IMAGE ]; then
76
-	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
77
+#Forcing KBUILD_MAGE reference to Image instead of zImage.. Armbian LINUX_KERNEL_TYPE=Image not being honored
78
+	cp Image "$tmpdir/$installed_image_path"
79
 else
80
-	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
81
+	cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
82
 fi
83
 
84
 if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
85
@@ -183,6 +210,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
86
 	fi
87
 fi
88
 
89
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
90
+	#mkdir -p "$tmpdir/boot/dtb"
91
+	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
92
+fi
93
+
94
 if [ "$ARCH" != "um" ]; then
95
 	$MAKE headers_check KBUILD_SRC=
96
 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
97
@@ -195,7 +227,7 @@ fi
98
 # so do we; recent versions of dracut and initramfs-tools will obey this.
99
 debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
100
 if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
101
-	want_initrd=Yes
102
+	want_initrd=Yes 
103
 else
104
 	want_initrd=No
105
 fi
106
@@ -207,9 +239,11 @@ for script in postinst postrm preinst prerm ; do
107
 set -e
108
 
109
 # Pass maintainer script parameters to hook scripts
110
+
111
 export DEB_MAINT_PARAMS="\$*"
112
 
113
 # Tell initramfs builder whether it's wanted
114
+
115
 export INITRD=$want_initrd
116
 
117
 test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
118
@@ -218,6 +252,56 @@ EOF
119
 	chmod 755 "$tmpdir/DEBIAN/$script"
120
 done
121
 
122
+##
123
+## Create sym link to kernel image
124
+##
125
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
126
+cat >> $tmpdir/DEBIAN/postinst <<EOT 
127
+if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
128
+mkimage -A arm -O linux -T kernel -C gzip -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
129
+cp /boot/uImage /tmp/uImage
130
+##copy uncompressed Kernel Image w/o Uboot for espressobin--gzip compressed forced above for mkimage
131
+cp $installed_image_path /tmp/Image
132
+sync
133
+mountpoint -q /boot || mount /boot
134
+cp /tmp/uImage /boot/uImage
135
+cp /tmp/Image /boot/Image
136
+rm -f /$installed_image_path
137
+else
138
+ln -sf $(basename $installed_image_path) /boot/Image > /dev/null 2>&1 || mv /$installed_image_path /boot/Image
139
+fi
140
+touch /boot/.next
141
+exit 0
142
+EOT
143
+##
144
+## FAT install workaround
145
+##
146
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
147
+cat >> $tmpdir/DEBIAN/preinst <<EOT 
148
+# exit if we are running chroot
149
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
150
+
151
+check_and_unmount (){
152
+boot_device=\$(mountpoint -d /boot)
153
+
154
+for file in /dev/* ; do
155
+	CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
156
+	if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
157
+		boot_partition=\$file
158
+		break;
159
+	fi
160
+done
161
+
162
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
163
+if [ "\$bootfstype" = "vfat" ]; then 
164
+# we have to keep it mounted! umount /boot
165
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage /boot/Image
166
+fi
167
+}
168
+mountpoint -q /boot && check_and_unmount
169
+EOT
170
+echo "exit 0" >> $tmpdir/DEBIAN/preinst 
171
+
172
 # Try to determine maintainer and email values
173
 if [ -n "$DEBEMAIL" ]; then
174
        email=$DEBEMAIL
175
@@ -328,17 +412,26 @@ fi
176
 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
177
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
178
 mkdir -p "$destdir"
179
+######################## headers patch
180
+ZACNI=$(pwd)
181
+cd $destdir
182
+patch -p1 < /tmp/headers-debian-byteshift.patch
183
+cd $ZACNI
184
+######################## headers patch
185
 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
186
 (cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
187
 (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
188
 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
189
 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
190
 
191
+(cd "$destdir"; make M=scripts clean)
192
+
193
 cat <<EOF >> debian/control
194
 
195
 Package: $kernel_headers_packagename
196
-Provides: linux-headers, linux-headers-2.6
197
+Provides: $kernel_headers_packagename
198
 Architecture: any
199
+Depends: make, gcc, libc6-dev, libssl-dev
200
 Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
201
  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
202
  .
203
@@ -363,6 +456,16 @@ fi
204
 
205
 cat <<EOF >> debian/control
206
 
207
+Package: $dtb_packagename
208
+Architecture: any
209
+Description: Linux DTB, version $version
210
+ This package contains device blobs from the Linux kernel, version $version.
211
+EOF
212
+
213
+create_package "$dtb_packagename" "$dtb_dir"
214
+
215
+cat <<EOF >> debian/control
216
+
217
 Package: $libc_headers_packagename
218
 Section: devel
219
 Provides: $libc_headers_packagename
220
@@ -374,7 +477,7 @@ EOF
221
 
222
 if [ "$ARCH" != "um" ]; then
223
 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
224
-	create_package "$libc_headers_packagename" "$libc_headers_dir"
225
+#	create_package "$libc_headers_packagename" "$libc_headers_dir"
226
 fi
227
 
228
 create_package "$packagename" "$tmpdir"
229

230
Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more,
all in one place. Commercial Alternative to JupyterHub.

Product

Resources

Company

Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more, all in one place. Commercial Alternative to JupyterHub.

Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more,
all in one place. Commercial Alternative to JupyterHub.
