diff --git a/config/boards/miqi.conf b/config/boards/miqi.conf index ae1c76cb8d..b5c57afc91 100644 --- a/config/boards/miqi.conf +++ b/config/boards/miqi.conf @@ -6,13 +6,13 @@ BOOTCONFIG="miqi-rk3288_defconfig" MODULES="" MODULES_NEXT="" # -KERNEL_TARGET="default,dev" -CLI_TARGET="xenial:default" -CLI_BETA_TARGET="xenial:dev" -DESKTOP_TARGET="xenial:default" -DESKTOP_BETA_TARGET="xenial:dev" +KERNEL_TARGET="default,next" +CLI_TARGET="xenial:default,next" +CLI_BETA_TARGET="" +DESKTOP_TARGET="xenial:default,next" +DESKTOP_BETA_TARGET="xenial,next" # -RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_dev_nightly:33" +RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_next_desktop:90" # BOARDRATING="" CHIP="https://en.wikipedia.org/wiki/Rockchip_RK3288" diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf index c7000a4c6f..5d888b7ce3 100644 --- a/config/boards/tinkerboard.conf +++ b/config/boards/tinkerboard.conf @@ -6,13 +6,13 @@ BOOTCONFIG="tinker-rk3288_defconfig" MODULES="hci_uart rfcomm hidp 8723bs" MODULES_NEXT="" # -KERNEL_TARGET="default,dev" -CLI_TARGET="xenial:default" +KERNEL_TARGET="default,next" +CLI_TARGET="xenial:default,next" CLI_BETA_TARGET="" -DESKTOP_TARGET="xenial:default" -DESKTOP_BETA_TARGET="xenial:dev" +DESKTOP_TARGET="xenial:default,next" +DESKTOP_BETA_TARGET="xenial,next" # -RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_dev_desktop_nightly:75" +RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_next_desktop:90" # BOARDRATING="" CHIP="https://en.wikipedia.org/wiki/Rockchip_RK3288" diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-next.config similarity index 100% rename from config/kernel/linux-rockchip-dev.config rename to config/kernel/linux-rockchip-next.config diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf index 8e24055691..9cfb1d62ca 100644 --- a/config/sources/rockchip.conf +++ b/config/sources/rockchip.conf @@ -20,7 +20,7 @@ case $BRANCH in KERNELBRANCH='branch:miqi/release-4.4' KERNELDIR='linux-rockchip' ;; - dev) + next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELBRANCH='branch:master' KERNELDIR=$MAINLINE_KERNEL_DIR diff --git a/patch/kernel/rockchip-dev/0000-mali-r16p0-00rel0.patch b/patch/kernel/rockchip-next/0000-mali-r16p0-00rel0.patch similarity index 100% rename from patch/kernel/rockchip-dev/0000-mali-r16p0-00rel0.patch rename to patch/kernel/rockchip-next/0000-mali-r16p0-00rel0.patch diff --git a/patch/kernel/rockchip-dev/0001-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch b/patch/kernel/rockchip-next/0001-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch similarity index 100% rename from patch/kernel/rockchip-dev/0001-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch rename to patch/kernel/rockchip-next/0001-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch diff --git a/patch/kernel/rockchip-dev/0001-Readaptation-of-Rockchip-DRM-patches-provided-by-ARM.patch b/patch/kernel/rockchip-next/0001-Readaptation-of-Rockchip-DRM-patches-provided-by-ARM.patch similarity index 100% rename from patch/kernel/rockchip-dev/0001-Readaptation-of-Rockchip-DRM-patches-provided-by-ARM.patch rename to patch/kernel/rockchip-next/0001-Readaptation-of-Rockchip-DRM-patches-provided-by-ARM.patch diff --git a/patch/kernel/rockchip-dev/0002-Adaptation-ARM-dts-rockchip-fix-the-MiQi-board-s-LED.patch b/patch/kernel/rockchip-next/0002-Adaptation-ARM-dts-rockchip-fix-the-MiQi-board-s-LED.patch similarity index 100% rename from patch/kernel/rockchip-dev/0002-Adaptation-ARM-dts-rockchip-fix-the-MiQi-board-s-LED.patch rename to patch/kernel/rockchip-next/0002-Adaptation-ARM-dts-rockchip-fix-the-MiQi-board-s-LED.patch diff --git a/patch/kernel/rockchip-dev/0002-Integrate-the-Mali-GPU-address-to-the-rk3288-and-rk3.patch b/patch/kernel/rockchip-next/0002-Integrate-the-Mali-GPU-address-to-the-rk3288-and-rk3.patch similarity index 100% rename from patch/kernel/rockchip-dev/0002-Integrate-the-Mali-GPU-address-to-the-rk3288-and-rk3.patch rename to patch/kernel/rockchip-next/0002-Integrate-the-Mali-GPU-address-to-the-rk3288-and-rk3.patch diff --git a/patch/kernel/rockchip-dev/0003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch b/patch/kernel/rockchip-next/0003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch similarity index 100% rename from patch/kernel/rockchip-dev/0003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch rename to patch/kernel/rockchip-next/0003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch diff --git a/patch/kernel/rockchip-dev/0003-Post-Mali-Kernel-device-drivers-modifications.patch b/patch/kernel/rockchip-next/0003-Post-Mali-Kernel-device-drivers-modifications.patch similarity index 100% rename from patch/kernel/rockchip-dev/0003-Post-Mali-Kernel-device-drivers-modifications.patch rename to patch/kernel/rockchip-next/0003-Post-Mali-Kernel-device-drivers-modifications.patch diff --git a/patch/kernel/rockchip-dev/0004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch b/patch/kernel/rockchip-next/0004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch similarity index 100% rename from patch/kernel/rockchip-dev/0004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch rename to patch/kernel/rockchip-next/0004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch diff --git a/patch/kernel/rockchip-dev/0005-ARM-dts-rockchip-miqi-throttle-only-at-92-degrees.patch b/patch/kernel/rockchip-next/0005-ARM-dts-rockchip-miqi-throttle-only-at-92-degrees.patch similarity index 100% rename from patch/kernel/rockchip-dev/0005-ARM-dts-rockchip-miqi-throttle-only-at-92-degrees.patch rename to patch/kernel/rockchip-next/0005-ARM-dts-rockchip-miqi-throttle-only-at-92-degrees.patch diff --git a/patch/kernel/rockchip-dev/0005-Post-Mali-UMP-integration.patch b/patch/kernel/rockchip-next/0005-Post-Mali-UMP-integration.patch similarity index 100% rename from patch/kernel/rockchip-dev/0005-Post-Mali-UMP-integration.patch rename to patch/kernel/rockchip-next/0005-Post-Mali-UMP-integration.patch diff --git a/patch/kernel/rockchip-dev/0006-clk-rockchip-add-all-known-operating-points-to-the-a.patch b/patch/kernel/rockchip-next/0006-clk-rockchip-add-all-known-operating-points-to-the-a.patch similarity index 100% rename from patch/kernel/rockchip-dev/0006-clk-rockchip-add-all-known-operating-points-to-the-a.patch rename to patch/kernel/rockchip-next/0006-clk-rockchip-add-all-known-operating-points-to-the-a.patch diff --git a/patch/kernel/rockchip-dev/0007-ARM-dts-rockchip-miqi-add-turbo-mode-operating-point.patch b/patch/kernel/rockchip-next/0007-ARM-dts-rockchip-miqi-add-turbo-mode-operating-point.patch similarity index 100% rename from patch/kernel/rockchip-dev/0007-ARM-dts-rockchip-miqi-add-turbo-mode-operating-point.patch rename to patch/kernel/rockchip-next/0007-ARM-dts-rockchip-miqi-add-turbo-mode-operating-point.patch diff --git a/patch/kernel/rockchip-dev/0012-arm-dts-Adding-and-enabling-VPU-services-addresses-f.patch b/patch/kernel/rockchip-next/0012-arm-dts-Adding-and-enabling-VPU-services-addresses-f.patch similarity index 100% rename from patch/kernel/rockchip-dev/0012-arm-dts-Adding-and-enabling-VPU-services-addresses-f.patch rename to patch/kernel/rockchip-next/0012-arm-dts-Adding-and-enabling-VPU-services-addresses-f.patch diff --git a/patch/kernel/rockchip-dev/0013-Export-rockchip_pmu_set_idle_request-for-out-of-tree.patch b/patch/kernel/rockchip-next/0013-Export-rockchip_pmu_set_idle_request-for-out-of-tree.patch similarity index 100% rename from patch/kernel/rockchip-dev/0013-Export-rockchip_pmu_set_idle_request-for-out-of-tree.patch rename to patch/kernel/rockchip-next/0013-Export-rockchip_pmu_set_idle_request-for-out-of-tree.patch diff --git a/patch/kernel/rockchip-dev/2001-Midgard-daptation-to-Linux-4.10.0-rcX-signatures.patch b/patch/kernel/rockchip-next/2001-Midgard-daptation-to-Linux-4.10.0-rcX-signatures.patch similarity index 100% rename from patch/kernel/rockchip-dev/2001-Midgard-daptation-to-Linux-4.10.0-rcX-signatures.patch rename to patch/kernel/rockchip-next/2001-Midgard-daptation-to-Linux-4.10.0-rcX-signatures.patch diff --git a/patch/kernel/rockchip-dev/2002-UMP-Adapt-get_user_pages-calls.patch b/patch/kernel/rockchip-next/2002-UMP-Adapt-get_user_pages-calls.patch similarity index 100% rename from patch/kernel/rockchip-dev/2002-UMP-Adapt-get_user_pages-calls.patch rename to patch/kernel/rockchip-next/2002-UMP-Adapt-get_user_pages-calls.patch diff --git a/patch/kernel/rockchip-dev/2003-Renamed-Kernel-DMA-Fence-structures-and-functions.patch b/patch/kernel/rockchip-next/2003-Renamed-Kernel-DMA-Fence-structures-and-functions.patch similarity index 100% rename from patch/kernel/rockchip-dev/2003-Renamed-Kernel-DMA-Fence-structures-and-functions.patch rename to patch/kernel/rockchip-next/2003-Renamed-Kernel-DMA-Fence-structures-and-functions.patch diff --git a/patch/kernel/rockchip-dev/2004-Few-modifications-after-v4.11-headers-and-signatures.patch b/patch/kernel/rockchip-next/2004-Few-modifications-after-v4.11-headers-and-signatures.patch similarity index 100% rename from patch/kernel/rockchip-dev/2004-Few-modifications-after-v4.11-headers-and-signatures.patch rename to patch/kernel/rockchip-next/2004-Few-modifications-after-v4.11-headers-and-signatures.patch diff --git a/patch/kernel/rockchip-dev/9000-Add-Tinkerboard-DTS.patch b/patch/kernel/rockchip-next/9000-Add-Tinkerboard-DTS.patch similarity index 100% rename from patch/kernel/rockchip-dev/9000-Add-Tinkerboard-DTS.patch rename to patch/kernel/rockchip-next/9000-Add-Tinkerboard-DTS.patch diff --git a/patch/kernel/rockchip-dev/9101-First-Mali-integration-test-for-ASUS-Tinkerboards.patch b/patch/kernel/rockchip-next/9101-First-Mali-integration-test-for-ASUS-Tinkerboards.patch similarity index 100% rename from patch/kernel/rockchip-dev/9101-First-Mali-integration-test-for-ASUS-Tinkerboards.patch rename to patch/kernel/rockchip-next/9101-First-Mali-integration-test-for-ASUS-Tinkerboards.patch diff --git a/patch/kernel/rockchip-dev/bash_to_afterinstall.patch b/patch/kernel/rockchip-next/bash_to_afterinstall.patch similarity index 100% rename from patch/kernel/rockchip-dev/bash_to_afterinstall.patch rename to patch/kernel/rockchip-next/bash_to_afterinstall.patch diff --git a/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/rockchip-next/packaging-4.x-NEXT-with-postinstall-scripts.patch similarity index 79% rename from patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch rename to patch/kernel/rockchip-next/packaging-4.x-NEXT-with-postinstall-scripts.patch index e66f4fed6e..91c2faad2e 100644 --- a/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch +++ b/patch/kernel/rockchip-next/packaging-4.x-NEXT-with-postinstall-scripts.patch @@ -1,10 +1,10 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 3c575cd0..91d7a19b 100755 +index 6c3b038..cc9b3c0 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb -@@ -29,6 +29,28 @@ create_package() { - # in case we are in a restrictive umask environment like 0077 - chmod -R a+rX "$pdir" +@@ -27,6 +27,28 @@ create_package() { + chown -R root:root "$pdir" + chmod -R go-w "$pdir" + # Create preinstall and post install script to remove dtb + if [[ "$1" == *dtb* ]]; then @@ -20,18 +20,18 @@ index 3c575cd0..91d7a19b 100755 + echo "exit 0" >> $pdir/DEBIAN/postinst + chmod 775 $pdir/DEBIAN/postinst + fi -+ ++ + # Create postinstall script for headers + if [[ "$1" == *headers* ]]; then + echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst + echo "exit 0" >> $pdir/DEBIAN/postinst + chmod 775 $pdir/DEBIAN/postinst + fi -+ ++ # Create the package dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir" dpkg --build "$pdir" .. -@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp" +@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp" fwdir="$objtree/debian/fwtmp" kernel_headers_dir="$objtree/debian/hdrtmp" libc_headers_dir="$objtree/debian/headertmp" @@ -41,15 +41,15 @@ index 3c575cd0..91d7a19b 100755 -fwpackagename=linux-firmware-image-$version -kernel_headers_packagename=linux-headers-$version -libc_headers_packagename=linux-libc-dev -+packagename=linux-image-dev"$LOCALVERSION" -+fwpackagename=linux-firmware-image-dev"$LOCALVERSION" -+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION" -+dtb_packagename=linux-dtb-dev"$LOCALVERSION" -+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION" ++packagename=linux-image-next"$LOCALVERSION" ++fwpackagename=linux-firmware-image-next"$LOCALVERSION" ++kernel_headers_packagename=linux-headers-next"$LOCALVERSION" ++dtb_packagename=linux-dtb-next"$LOCALVERSION" ++libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION" dbg_packagename=$packagename-dbg debarch= forcearch= -@@ -126,7 +150,9 @@ esac +@@ -124,7 +148,9 @@ esac BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" # Setup the directory structure @@ -60,7 +60,7 @@ index 3c575cd0..91d7a19b 100755 mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$fwdir/lib/firmware/$version/" -@@ -185,6 +211,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then +@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then fi fi @@ -72,7 +72,16 @@ index 3c575cd0..91d7a19b 100755 if [ "$ARCH" != "um" ]; then $MAKE headers_check KBUILD_SRC= $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" -@@ -209,9 +240,11 @@ for script in postinst postrm preinst prerm ; do +@@ -195,7 +226,7 @@ fi + # so do we; recent versions of dracut and initramfs-tools will obey this. + debhookdir=${KDEB_HOOKDIR:-/etc/kernel} + if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then +- want_initrd=Yes ++ want_initrd=Yes + else + want_initrd=No + fi +@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do set -e # Pass maintainer script parameters to hook scripts @@ -84,7 +93,7 @@ index 3c575cd0..91d7a19b 100755 export INITRD=$want_initrd test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d -@@ -220,6 +253,55 @@ EOF +@@ -218,6 +251,55 @@ EOF chmod 755 "$tmpdir/DEBIAN/$script" done @@ -93,7 +102,7 @@ index 3c575cd0..91d7a19b 100755 +## +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst -+cat >> $tmpdir/DEBIAN/postinst <> $tmpdir/DEBIAN/postinst < /dev/null 2>&1 +cp /boot/uImage /tmp/uImage @@ -112,7 +121,7 @@ index 3c575cd0..91d7a19b 100755 +## +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst -+cat >> $tmpdir/DEBIAN/preinst <> $tmpdir/DEBIAN/preinst <> $tmpdir/DEBIAN/preinst ++echo "exit 0" >> $tmpdir/DEBIAN/preinst + # Try to determine maintainer and email values if [ -n "$DEBEMAIL" ]; then email=$DEBEMAIL -@@ -296,7 +378,7 @@ if [ "$ARCH" = "um" ]; then - cat <> debian/control - - Package: $packagename --Provides: linux-image, linux-image-2.6, linux-modules-$version -+Provides: linux-image-$version, linux-modules-$version - Architecture: any - Description: User Mode Linux kernel, version $version - User-mode Linux is a port of the Linux kernel to its own system call -@@ -313,7 +395,7 @@ else - cat <> debian/control - - Package: $packagename --Provides: linux-image, linux-image-2.6, linux-modules-$version -+Provides: linux-image-$version, linux-modules-$version - Suggests: $fwpackagename - Architecture: any - Description: Linux kernel, version $version -@@ -337,16 +419,24 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then - fi +@@ -328,16 +414,24 @@ fi + (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" +######################## headers patch @@ -184,7 +175,7 @@ index 3c575cd0..91d7a19b 100755 Architecture: any Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} -@@ -372,6 +462,16 @@ fi +@@ -363,6 +457,16 @@ fi cat <> debian/control @@ -201,7 +192,7 @@ index 3c575cd0..91d7a19b 100755 Package: $libc_headers_packagename Section: devel Provides: linux-kernel-headers -@@ -383,7 +483,7 @@ EOF +@@ -374,7 +478,7 @@ EOF if [ "$ARCH" != "um" ]; then create_package "$kernel_headers_packagename" "$kernel_headers_dir"