GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-03-22 06:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Odroid C1 packaging patch

Browse source
This commit is contained in:
Igor Pecovnik 2018-08-12 14:19:51 +02:00
parent efe63dbe7f
commit de13bfa234
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
patch/kernel/odroidc1-default/packaging-3.10-DEFAULT-with-postinstall-scripts.patch
View file

@ -27,7 +27,7 @@ index 3001ec5..dc76d3c
@@ -61,8 +63,30 @@ create_package() { @@ -61,8 +63,30 @@ create_package() {
forcearch="-DArchitecture=$debarch" forcearch="-DArchitecture=$debarch"
fi fi
+ # Create preinstall and post install script to remove dtb + # Create preinstall and post install script to remove dtb
+ if [[ "$1" == *dtb* ]]; then + if [[ "$1" == *dtb* ]]; then
+ echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst + echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
@ -42,20 +42,20 @@ index 3001ec5..dc76d3c
+ echo "exit 0" >> $pdir/DEBIAN/postinst + echo "exit 0" >> $pdir/DEBIAN/postinst
+ chmod 775 $pdir/DEBIAN/postinst + chmod 775 $pdir/DEBIAN/postinst
+ fi + fi
+ +
+ # Create postinstall script for headers + # Create postinstall script for headers
+ if [[ "$1" == *headers* ]]; then + if [[ "$1" == *headers* ]]; then
+ echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; find -type f -exec touch {} +;make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst + echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; find -type f -exec touch {} +;make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
+ echo "exit 0" >> $pdir/DEBIAN/postinst + echo "exit 0" >> $pdir/DEBIAN/postinst
+ chmod 775 $pdir/DEBIAN/postinst + chmod 775 $pdir/DEBIAN/postinst
+ fi + fi
+ +
# Create the package # Create the package
- dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir" - 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-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
dpkg --build "$pdir" .. dpkg --build "$pdir" ..
} }
@@ -78,49 +102,76 @@ tmpdir="$objtree/debian/tmp" @@ -78,49 +102,76 @@ tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp" fwdir="$objtree/debian/fwtmp"
kernel_headers_dir="$objtree/debian/hdrtmp" kernel_headers_dir="$objtree/debian/hdrtmp"
@ -72,11 +72,11 @@ index 3001ec5..dc76d3c
+dtb_packagename=linux-dtb"$LOCALVERSION" +dtb_packagename=linux-dtb"$LOCALVERSION"
+libc_headers_packagename=linux-libc-dev"$LOCALVERSION" +libc_headers_packagename=linux-libc-dev"$LOCALVERSION"
+dbg_packagename=$packagename-dbg +dbg_packagename=$packagename-dbg
if [ "$ARCH" = "um" ] ; then if [ "$ARCH" = "um" ] ; then
packagename=user-mode-linux-$version packagename=user-mode-linux-$version
fi fi
+# Not all arches have the same installed path in debian +# Not all arches have the same installed path in debian
+# XXX: have each arch Makefile export a variable of the canonical image install +# XXX: have each arch Makefile export a variable of the canonical image install
+# path instead +# path instead
@ -116,7 +116,7 @@ index 3001ec5..dc76d3c
+ mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename" + mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename"
+ mkdir -m 755 -p "$dbg_dir/DEBIAN" + mkdir -m 755 -p "$dbg_dir/DEBIAN"
+fi +fi
# Build and install the kernel # Build and install the kernel
if [ "$ARCH" = "um" ] ; then if [ "$ARCH" = "um" ] ; then
$MAKE linux $MAKE linux
@ -125,7 +125,7 @@ index 3001ec5..dc76d3c
+ cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" + cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
gzip "$tmpdir/usr/share/doc/$packagename/config" gzip "$tmpdir/usr/share/doc/$packagename/config"
- cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" - cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
-else -else
+else +else
cp System.map "$tmpdir/boot/System.map-$version" cp System.map "$tmpdir/boot/System.map-$version"
- cp .config "$tmpdir/boot/config-$version" - cp .config "$tmpdir/boot/config-$version"
@ -143,7 +143,7 @@ index 3001ec5..dc76d3c
+else +else
+ cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" + cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
fi fi
-if grep -q '^CONFIG_MODULES=y' .config ; then -if grep -q '^CONFIG_MODULES=y' .config ; then
+if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then +if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
@ -172,10 +172,10 @@ index 3001ec5..dc76d3c
+ cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version + cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
+ #INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install + #INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
fi fi
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
@@ -137,8 +206,15 @@ fi @@ -137,8 +206,15 @@ fi
# Install the maintainer scripts # Install the maintainer scripts
# Note: hook scripts under /etc/kernel are also executed by official Debian # Note: hook scripts under /etc/kernel are also executed by official Debian
-# kernel packages, as well as kernel packages built using make-kpkg -# kernel packages, as well as kernel packages built using make-kpkg
@ -193,11 +193,11 @@ index 3001ec5..dc76d3c
cat <<EOF > "$tmpdir/DEBIAN/$script" cat <<EOF > "$tmpdir/DEBIAN/$script"
@@ -147,14 +223,61 @@ for script in postinst postrm preinst prerm ; do @@ -147,14 +223,61 @@ for script in postinst postrm preinst prerm ; do
set -e set -e
# Pass maintainer script parameters to hook scripts # Pass maintainer script parameters to hook scripts
+ +
export DEB_MAINT_PARAMS="\$*" export DEB_MAINT_PARAMS="\$*"
-test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d -test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
+# Tell initramfs builder whether it's wanted +# Tell initramfs builder whether it's wanted
+ +
@ -208,17 +208,17 @@ index 3001ec5..dc76d3c
EOF EOF
chmod 755 "$tmpdir/DEBIAN/$script" chmod 755 "$tmpdir/DEBIAN/$script"
done done
+## +##
+## Create sym link to kernel image +## Create sym link to kernel image
+## +##
+kernel_tmp_version="${installed_image_path////\\/}" +kernel_tmp_version="${installed_image_path////\\/}"
+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
+cat >> $tmpdir/DEBIAN/postinst <<EOT +cat >> $tmpdir/DEBIAN/postinst <<EOT
+ln -sf $(basename $kernel_tmp_version) /boot/zImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage +ln -sf $(basename $kernel_tmp_version) /boot/zImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage
+rm -f /boot/.next
+ +
+rm -f /boot/.next
+exit 0 +exit 0
+EOT +EOT
+## +##
@ -226,7 +226,7 @@ index 3001ec5..dc76d3c
+## +##
+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
+cat >> $tmpdir/DEBIAN/preinst <<EOT +cat >> $tmpdir/DEBIAN/preinst <<EOT
+# exit if we are running chroot +# exit if we are running chroot
+if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi +if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
+ +
@ -242,13 +242,13 @@ index 3001ec5..dc76d3c
+done +done
+ +
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition) +bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then +if [ "\$bootfstype" = "vfat" ]; then
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage +rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
+fi +fi
+} +}
+mountpoint -q /boot && check_and_unmount +mountpoint -q /boot && check_and_unmount
+EOT +EOT
+echo "exit 0" >> $tmpdir/DEBIAN/preinst +echo "exit 0" >> $tmpdir/DEBIAN/preinst
+ +
+ +
# Try to determine maintainer and email values # Try to determine maintainer and email values
@ -257,7 +257,7 @@ index 3001ec5..dc76d3c
@@ -172,9 +299,19 @@ else @@ -172,9 +299,19 @@ else
fi fi
maintainer="$name <$email>" maintainer="$name <$email>"
+# Try to determine distribution +# Try to determine distribution
+if [ -n "$KDEB_CHANGELOG_DIST" ]; then +if [ -n "$KDEB_CHANGELOG_DIST" ]; then
+ distribution=$KDEB_CHANGELOG_DIST + distribution=$KDEB_CHANGELOG_DIST
@ -272,13 +272,13 @@ index 3001ec5..dc76d3c
cat <<EOF > debian/changelog cat <<EOF > debian/changelog
-linux-upstream ($packageversion) unstable; urgency=low -linux-upstream ($packageversion) unstable; urgency=low
+linux-upstream ($packageversion) $distribution; urgency=low +linux-upstream ($packageversion) $distribution; urgency=low
* Custom built Linux kernel. * Custom built Linux kernel.
@@ -242,21 +379,32 @@ EOF @@ -242,21 +379,32 @@ EOF
fi fi
-# Build header package -# Build header package
-(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") -(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/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
@ -304,11 +304,11 @@ index 3001ec5..dc76d3c
+(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be +(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" ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+(cd "$destdir"; make M=scripts clean) +(cd "$destdir"; make M=scripts clean)
+ +
cat <<EOF >> debian/control cat <<EOF >> debian/control
Package: $kernel_headers_packagename Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6 -Provides: linux-headers, linux-headers-2.6
+Provides: linux-headers +Provides: linux-headers
@ -316,9 +316,9 @@ index 3001ec5..dc76d3c
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@ -282,6 +430,16 @@ fi @@ -282,6 +430,16 @@ fi
cat <<EOF >> debian/control cat <<EOF >> debian/control
+Package: $dtb_packagename +Package: $dtb_packagename
+Architecture: any +Architecture: any
+Description: Linux DTB, version $version +Description: Linux DTB, version $version
@ -333,15 +333,15 @@ index 3001ec5..dc76d3c
Section: devel Section: devel
Provides: linux-kernel-headers Provides: linux-kernel-headers
@@ -293,9 +451,35 @@ EOF @@ -293,9 +451,35 @@ EOF
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
create_package "$kernel_headers_packagename" "$kernel_headers_dir" create_package "$kernel_headers_packagename" "$kernel_headers_dir"
- create_package "$libc_headers_packagename" "$libc_headers_dir" - create_package "$libc_headers_packagename" "$libc_headers_dir"
+# create_package "$libc_headers_packagename" "$libc_headers_dir" +# create_package "$libc_headers_packagename" "$libc_headers_dir"
fi fi
create_package "$packagename" "$tmpdir" create_package "$packagename" "$tmpdir"
-exit 0 -exit 0
+if [ -n "$BUILD_DEBUG" ] ; then +if [ -n "$BUILD_DEBUG" ] ; then
+ # Build debug package + # Build debug package