Merge pull request #4593 from OpenELEC/oe6-update

Oe6 update

config/functions

@@ -282,7 +282,7 @@ show_config() {
 
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options

packages/graphics/opengl-meson6/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="opengl-meson6"
-PKG_VERSION="r4p1-armhf"
+PKG_VERSION="r5p1-01rel0-armhf"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/linux/package.mk

@@ -31,7 +31,7 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 case "$LINUX" in
   amlogic)
-    PKG_VERSION="amlogic-3.10-0b9823d"
+    PKG_VERSION="amlogic-3.10-716f179"
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   imx6)

projects/WeTek_Play/linux/linux.arm.conf

@@ -564,6 +564,7 @@ CONFIG_EARLYSUSPEND=y
 CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
 # CONFIG_FB_EARLYSUSPEND is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -577,6 +578,7 @@ CONFIG_CPU_PM=y
 # CONFIG_SUSPEND_TIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 
 #
@@ -1309,11 +1311,12 @@ CONFIG_MALI400=m
 # CONFIG_MALI400_DEBUG is not set
 # CONFIG_MALI400_PROFILING is not set
 CONFIG_MALI400_UMP=y
-# CONFIG_MALI400_POWER_PERFORMANCE_POLICY is not set
+# CONFIG_MALI_DVFS is not set
 CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y
 CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_MESON6_GPU_EXTRA=y
 # CONFIG_MALI_PMU_PARALLEL_POWER_UP is not set
+# CONFIG_MALI_DT is not set
 # CONFIG_MALI_QUIET is not set
 
 #

projects/imx6/patches/linux/linux-002-rename-sgtl5000-codec.patch

@@ -0,0 +1,25 @@
+From 3499e0d1703d361277e65419178152d792bd55dc Mon Sep 17 00:00:00 2001
+From: Peter Vicman <peter.vicman@gmail.com>
+Date: Mon, 4 Jan 2016 19:55:37 +0100
+Subject: [PATCH] rename sgtl5000 codec
+
+---
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+index 2003262..d2446ef 100644
+--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+@@ -62,7 +62,7 @@
+ 			"Mic Jack", "Mic Bias",
+ 			"Headphone Jack", "HP_OUT";
+ 		compatible = "fsl,imx-audio-sgtl5000";
+-		model = "On-board Codec";
++		model = "imx-sgtl5000";
+ 		mux-ext-port = <5>;
+ 		mux-int-port = <1>;
+ 		ssi-controller = <&ssi1>;
+-- 
+1.8.1.2
+

scripts/image

@@ -95,7 +95,7 @@ fi
   echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
   echo -e "ID=\"openelec\"" >> $INSTALL/etc/os-release
   echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
-  echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) - Version: $OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
+  echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "community")) - Version: $OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
   echo -e "HOME_URL=\"http://www.openelec.tv\"" >> $INSTALL/etc/os-release
   echo -e "BUG_REPORT_URL=\"https://github.com/OpenELEC/OpenELEC.tv\"" >> $INSTALL/etc/os-release
   if [ -n "$GIT_HASH" ]; then
@@ -105,7 +105,7 @@ fi
   if [ "$OFFICIAL" = "yes" ]; then
     echo -e "OPENELEC_BUILD=\"official\"" >> $INSTALL/etc/os-release
   else
-    echo -e "OPENELEC_BUILD=\"unofficial\"" >> $INSTALL/etc/os-release
+    echo -e "OPENELEC_BUILD=\"community\"" >> $INSTALL/etc/os-release
   fi
 
 # create /etc/issue
@@ -114,7 +114,7 @@ fi
   echo $GREETING2 >> $INSTALL/etc/issue
   echo $GREETING3 >> $INSTALL/etc/issue
   echo $GREETING4 >> $INSTALL/etc/issue
-  echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) Version: $OPENELEC_VERSION" >> $INSTALL/etc/issue
+  echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "community")) Version: $OPENELEC_VERSION" >> $INSTALL/etc/issue
   if [ -n "$GIT_HASH" ]; then
     echo "$DISTRONAME git: $GIT_HASH" >> $INSTALL/etc/issue
   fi