GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-10 23:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update patch removing Provides

Browse source 
Provides is no longer called out in the 4.12 builddeb
This commit is contained in:
Tonymac32 2017-05-16 12:18:09 -04:00 • committed by GitHub
parent fc4841ad6b
commit e97f73af6f
1 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
View file

@ -1,10 +1,10 @@
diff --git a/scripts/package/builddeb b/scripts/package/builddeb diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 6c3b038..cc9b3c0 100755 index 807c9cd..9b9435f 100755
--- a/scripts/package/builddeb --- a/scripts/package/builddeb
+++ b/scripts/package/builddeb +++ b/scripts/package/builddeb
@@ -27,6 +27,28 @@ create_package() { @@ -29,6 +29,28 @@ create_package() {
chown -R root:root "$pdir" # in case we are in a restrictive umask environment like 0077
chmod -R go-w "$pdir" chmod -R a+rX "$pdir"
+ # 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
@ -31,7 +31,7 @@ index 6c3b038..cc9b3c0 100755
# Create the package # Create the package
dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir" dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
dpkg --build "$pdir" .. dpkg --build "$pdir" ..
@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp" @@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp" fwdir="$objtree/debian/fwtmp"
kernel_headers_dir="$objtree/debian/hdrtmp" kernel_headers_dir="$objtree/debian/hdrtmp"
libc_headers_dir="$objtree/debian/headertmp" libc_headers_dir="$objtree/debian/headertmp"
@ -41,15 +41,15 @@ index 6c3b038..cc9b3c0 100755
-fwpackagename=linux-firmware-image-$version -fwpackagename=linux-firmware-image-$version
-kernel_headers_packagename=linux-headers-$version -kernel_headers_packagename=linux-headers-$version
-libc_headers_packagename=linux-libc-dev -libc_headers_packagename=linux-libc-dev
+packagename=linux-image-dev"$LOCALVERSION" +packagename=linux-image-next"$LOCALVERSION"
+fwpackagename=linux-firmware-image-dev"$LOCALVERSION" +fwpackagename=linux-firmware-image-next"$LOCALVERSION"
+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION" +kernel_headers_packagename=linux-headers-next"$LOCALVERSION"
+dtb_packagename=linux-dtb-dev"$LOCALVERSION" +dtb_packagename=linux-dtb-next"$LOCALVERSION"
+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION" +libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
dbg_packagename=$packagename-dbg dbg_packagename=$packagename-dbg
debarch= debarch=
forcearch= forcearch=
@@ -124,7 +148,9 @@ esac @@ -126,7 +150,9 @@ esac
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
# Setup the directory structure # Setup the directory structure
@ -60,7 +60,7 @@ index 6c3b038..cc9b3c0 100755
mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$tmpdir/lib" "$tmpdir/boot"
mkdir -p "$fwdir/lib/firmware/$version/" mkdir -p "$fwdir/lib/firmware/$version/"
@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then @@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
fi fi
fi fi
@ -72,7 +72,7 @@ index 6c3b038..cc9b3c0 100755
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
$MAKE headers_check KBUILD_SRC= $MAKE headers_check KBUILD_SRC=
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
@@ -195,7 +226,7 @@ fi @@ -192,7 +223,7 @@ fi
# so do we; recent versions of dracut and initramfs-tools will obey this. # so do we; recent versions of dracut and initramfs-tools will obey this.
debhookdir=${KDEB_HOOKDIR:-/etc/kernel} debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
@ -81,7 +81,7 @@ index 6c3b038..cc9b3c0 100755
else else
want_initrd=No want_initrd=No
fi fi
@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do @@ -204,9 +235,11 @@ 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
@ -93,7 +93,7 @@ index 6c3b038..cc9b3c0 100755
export INITRD=$want_initrd export INITRD=$want_initrd
test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
@@ -218,6 +251,55 @@ EOF @@ -215,6 +248,55 @@ EOF
chmod 755 "$tmpdir/DEBIAN/$script" chmod 755 "$tmpdir/DEBIAN/$script"
done done
@ -149,8 +149,8 @@ index 6c3b038..cc9b3c0 100755
# Try to determine maintainer and email values # Try to determine maintainer and email values
if [ -n "$DEBEMAIL" ]; then if [ -n "$DEBEMAIL" ]; then
email=$DEBEMAIL email=$DEBEMAIL
@@ -328,16 +414,24 @@ fi @@ -329,12 +411,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" fi
destdir=$kernel_headers_dir/usr/src/linux-headers-$version destdir=$kernel_headers_dir/usr/src/linux-headers-$version
mkdir -p "$destdir" mkdir -p "$destdir"
+######################## headers patch +######################## headers patch
@ -170,12 +170,7 @@ index 6c3b038..cc9b3c0 100755
cat <<EOF >> debian/control cat <<EOF >> debian/control
Package: $kernel_headers_packagename Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6 @@ -363,6 +453,16 @@ fi
+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}
@@ -363,6 +457,16 @@ fi
cat <<EOF >> debian/control cat <<EOF >> debian/control
@ -192,7 +187,7 @@ index 6c3b038..cc9b3c0 100755
Package: $libc_headers_packagename Package: $libc_headers_packagename
Section: devel Section: devel
Provides: linux-kernel-headers Provides: linux-kernel-headers
@@ -374,7 +478,7 @@ EOF @@ -374,7 +474,7 @@ 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"