CoCalc -- general-packaging-5.6.y.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-5.6.y.patch
Views: ³⁹⁵⁹
1
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
2
index 5858d6e44..e81b8a6fc 100644
3
--- a/arch/arm64/Makefile
4
+++ b/arch/arm64/Makefile
5
@@ -142,7 +142,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
6
 
7
 # Default target when executing plain make
8
 boot		:= arch/arm64/boot
9
-KBUILD_IMAGE	:= $(boot)/Image.gz
10
+KBUILD_IMAGE	:= $(boot)/Image
11
 
12
 all:	Image.gz
13
 
14
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
15
index 6df3c9f..d33e1f3 100755
16
--- a/scripts/package/builddeb
17
+++ b/scripts/package/builddeb
18
@@ -41,9 +41,46 @@ create_package() {
19
 	# in case we are in a restrictive umask environment like 0077
20
 	chmod -R a+rX "$pdir"
21
 
22
+	# Create preinstall and post install script to remove dtb
23
+	if [ "$3" = "dtb" ]; then
24
+
25
+	cat >> $pdir/DEBIAN/preinst <<EOT
26
+rm -rf /boot/dtb-$version; rm -rf /boot/dtb
27
+exit 0
28
+EOT
29
+
30
+	cat >> $pdir/DEBIAN/postinst <<EOT
31
+cd /boot
32
+ln -sfT dtb-$version dtb 2> /dev/null || mv dtb-$version dtb
33
+exit 0
34
+EOT
35
+
36
+	chmod 775 $pdir/DEBIAN/preinst ; chmod 775 $pdir/DEBIAN/postinst
37
+	fi
38
+
39
+	# Create postinst prerm scripts for headers
40
+	if [ "$3" = "headers" ]; then
41
+
42
+cat >> $pdir/DEBIAN/postinst << EOT
43
+cd /usr/src/linux-headers-$version
44
+echo "Compiling headers - please wait ..."
45
+find -type f -exec touch {} +
46
+make -s scripts >/dev/null
47
+make -s M=scripts/mod/ >/dev/null
48
+exit 0
49
+EOT
50
+
51
+cat >> $pdir/DEBIAN/prerm << EOT
52
+cd /usr/src/linux-headers-$version
53
+rm -rf scripts .config.old
54
+EOT
55
+
56
+	chmod 775 $pdir/DEBIAN/postinst ; chmod 775 $pdir/DEBIAN/prerm
57
+	fi
58
+
59
 	# Create the package
60
-	dpkg-gencontrol -p$pname -P"$pdir"
61
-	dpkg-deb ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --build "$pdir" ..
62
+	dpkg-gencontrol -p$pname -P"$pdir"
63
+	dpkg-deb --build "$pdir" ..
64
 }
65
 
66
 deploy_kernel_headers () {
67
@@ -100,9 +122,15 @@ deploy_libc_headers () {
68
 }
69
 
70
 version=$KERNELRELEASE
71
-tmpdir=debian/linux-image
72
-dbg_dir=debian/linux-image-dbg
73
-packagename=linux-image-$version
74
+tmpdir="$objtree/debian/tmp"
75
+kernel_headers_dir="$objtree/debian/hdrtmp"
76
+libc_headers_dir="$objtree/debian/headertmp"
77
+dbg_dir="$objtree/debian/dbgtmp"
78
+dtb_dir="$objtree/debian/dtbtmp"
79
+packagename=linux-image-"$BRANCH$LOCALVERSION"
80
+kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
81
+dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
82
+libc_headers_packagename=linux-libc-dev-"$BRANCH$LOCALVERSION"
83
 dbg_packagename=$packagename-dbg
84
 
85
 if [ "$ARCH" = "um" ] ; then
86
@@ -113,6 +141,15 @@ fi
87
 # XXX: have each arch Makefile export a variable of the canonical image install
88
 # path instead
89
 case $ARCH in
90
+aarch64|arm64)
91
+	image_name=Image
92
+	installed_image_path="boot/vmlinuz-$version"
93
+
94
+	;;
95
+arm*)
96
+	image_name=zImage
97
+	installed_image_path="boot/vmlinuz-$version"
98
+	;;
99
 um)
100
 	installed_image_path="usr/bin/linux-$version"
101
 	;;
102
@@ -126,13 +163,17 @@ esac
103
 BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
104
 
105
 # Setup the directory structure
106
-rm -rf "$tmpdir" "$dbg_dir" debian/files
107
+rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
108
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
109
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
110
 mkdir -m 755 -p "$tmpdir/DEBIAN"
111
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
112
+mkdir -p "$kernel_headers_dir/lib/modules/$version/"
113
 
114
-# Install the kernel
115
+# Build and install the kernel
116
 if [ "$ARCH" = "um" ] ; then
117
 	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" "$tmpdir/usr/share/doc/$packagename"
118
+	$MAKE linux
119
 	cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
120
 	cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
121
 	gzip "$tmpdir/usr/share/doc/$packagename/config"
122
@@ -176,6 +217,21 @@ if is_enabled CONFIG_MODULES; then
123
 	fi
124
 fi
125
 
126
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
127
+	#mkdir -p "$tmpdir/boot/dtb"
128
+	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
129
+fi
130
+
131
+if [ "$ARCH" != "um" ]; then
132
+	$MAKE -f $srctree/Makefile headers
133
+	$MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
134
+	# move asm headers to /usr/include/<libc-machine>/asm to match the structure
135
+	# used by Debian-based distros (to support multi-arch)
136
+	host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH)
137
+	mkdir $libc_headers_dir/usr/include/$host_arch
138
+	mv $libc_headers_dir/usr/include/asm $libc_headers_dir/usr/include/$host_arch/
139
+fi
140
+
141
 # Install the maintainer scripts
142
 # Note: hook scripts under /etc/kernel are also executed by official Debian
143
 # kernel packages, as well as kernel packages built using make-kpkg.
144
@@ -185,7 +241,7 @@ debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
145
 for script in postinst postrm preinst prerm ; do
146
 	mkdir -p "$tmpdir$debhookdir/$script.d"
147
 	cat <<EOF > "$tmpdir/DEBIAN/$script"
148
-#!/bin/sh
149
+#!/bin/bash
150
 
151
 set -e
152
 
153
@@ -201,12 +257,81 @@ EOF
154
 	chmod 755 "$tmpdir/DEBIAN/$script"
155
 done
156
 
157
-if [ "$ARCH" != "um" ]; then
158
-	deploy_kernel_headers debian/linux-headers
159
-	create_package linux-headers-$version debian/linux-headers
160
+##
161
+## Create sym link to kernel image
162
+##
163
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
164
+cat >> $tmpdir/DEBIAN/postinst <<EOT
165
+if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
166
+	mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
167
+	cp /boot/uImage /tmp/uImage
168
+	sync
169
+	mountpoint -q /boot || mount /boot
170
+	cp /tmp/uImage /boot/uImage
171
+	rm -f /$installed_image_path
172
+else
173
+	ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
174
+fi
175
+touch /boot/.next
176
+exit 0
177
+EOT
178
+
179
+##
180
+## FAT install workaround
181
+##
182
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
183
+cat >> $tmpdir/DEBIAN/preinst <<EOT
184
+# exit if we are running chroot
185
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
186
+
187
+check_and_unmount (){
188
+	boot_device=\$(mountpoint -d /boot)
189
+
190
+	for file in /dev/* ; do
191
+		CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
192
+		if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
193
+			boot_partition=\$file
194
+			break
195
+		fi
196
+	done
197
 
198
-	deploy_libc_headers debian/linux-libc-dev
199
-	create_package linux-libc-dev debian/linux-libc-dev
200
+	bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
201
+	if [ "\$bootfstype" = "vfat" ]; then
202
+		# we have to keep it mounted! umount /boot
203
+		rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
204
+	fi
205
+}
206
+mountpoint -q /boot && check_and_unmount
207
+EOT
208
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
209
+
210
+# Build kernel header package
211
+(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
212
+(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
213
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
214
+(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
215
+(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
216
+if is_enabled CONFIG_STACK_VALIDATION; then
217
+	(cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles"
218
+fi
219
+(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
220
+if is_enabled CONFIG_GCC_PLUGINS; then
221
+	(cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles"
222
+fi
223
+destdir=$kernel_headers_dir/usr/src/linux-headers-$version
224
+mkdir -p "$destdir"
225
+(cd $destdir; patch -p1 < /tmp/headers-debian-byteshift.patch)
226
+(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
227
+(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
228
+(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
229
+ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
230
+rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
231
+
232
+(cd $destdir; make M=scripts clean)
233
+
234
+if [ "$ARCH" != "um" ]; then
235
+	create_package "$kernel_headers_packagename" "$kernel_headers_dir" "headers"
236
+	create_package "$dtb_packagename" "$dtb_dir" "dtb"
237
 fi
238
 
239
 create_package "$packagename" "$tmpdir"
240
--- a/scripts/package/mkdebian
241
+++ b/scripts/package/mkdebian
242
@@ -94,10 +94,12 @@ else
243
 	packageversion=$version-$revision
244
 fi
245
 sourcename=$KDEB_SOURCENAME
246
-packagename=linux-image-$version
247
-kernel_headers_packagename=linux-headers-$version
248
+packagename=linux-image-$BRANCH$LOCALVERSION
249
+kernel_headers_packagename=linux-headers-$BRANCH$LOCALVERSION
250
+dtb_packagename=linux-dtb-$BRANCH$LOCALVERSION
251
 dbg_packagename=$packagename-dbg
252
 debarch=
253
+image_name=
254
 set_debarch
255
 
256
 if [ "$ARCH" = "um" ] ; then
257
@@ -183,8 +185,14 @@ Description: Linux kernel, version $version
258
  This package contains the Linux kernel, modules and corresponding other
259
  files, version: $version.
260
 
261
+Package: $dtb_packagename
262
+Architecture: $debarch
263
+Description: Linux DTB, version $version
264
+ This package contains device blobs from the Linux kernel, version $version
265
+
266
 Package: $kernel_headers_packagename
267
 Architecture: $debarch
268
+Depends: make, gcc, libc6-dev, bison, flex, libssl-dev
269
 Description: Linux kernel headers for $version on $debarch
270
  This package provides kernel header files for $version on $debarch
271
  .
272

273
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.
