[enigma-info] fixed imagetype; improved version info

OpenPLi · Jul 20, 2024 · 3c2293a · 3c2293a
1 parent 22b838e
commit 3c2293a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/meta-openpli/conf/distro/openpli-common.conf b/meta-openpli/conf/distro/openpli-common.conf
@@ -9,7 +9,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "pulseaudio"
 DISTRO_NAME ?= "openpli"
 DISTRO_HOST ?= "${@os.uname()[1]}"
 DISTRO_VERSION ?= "homebuild"
-DISTRO_TYPE ?= "release"
+DISTRO_TYPE ?= "homebuild"
 
 IPKG_VARIANT = "opkg"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"

diff --git a/meta-openpli/recipes-openpli/enigma2/enigma-info.bb b/meta-openpli/recipes-openpli/enigma2/enigma-info.bb
@@ -103,7 +103,9 @@ do_install() {
 	fi
 
 # Image version
-	IMAGE_VERSION=`echo ${DISTRO_VERSION} | cut -d "-" -f 1`
+	if [[ "$x" =~ "^[0-9]\.[0-9]*\-.*$" ]]; then
+		IMAGE_VERSION=`echo ${DISTRO_VERSION} | cut -d "-" -f 1`
+	fi
 
 # Kernel version
 	KERNEL_VERSION="${@get_kernelversion_headers('${STAGING_KERNEL_DIR}') or oe.utils.read_file('${PKGDATA_DIR}/kernel-depmod/kernel-abiversion')}"
@@ -112,6 +114,10 @@ do_install() {
 	OE_NAME=`cd ${OPENPLI_BASE} && git submodule | grep "meta-openembedded" | cut -d '(' -f 2 | cut -d ')' -f 1 | cut -d '/' -f 3`
 	OE_VERSION=`cd "${OPENPLI_BASE}/openembedded-core" && git describe --match=yocto* | cut -d '-' -f 2`
 
+# OE revision info
+	OE_REVISION=`cd ${OPENPLI_BASE} && git rev-list --count HEAD`
+	OE_HASH=`cd ${OPENPLI_BASE} && git rev-parse --short HEAD`
+
 # OE-A compatible machine names
 
 	MACHINEBUILD=${MACHINE}
@@ -273,14 +279,14 @@ do_install() {
     printf "hdmifhdin=${HAVE_HDMI_IN_FHD}\n" >> ${D}${INFOFILE}
     printf "hdmihdin=${HAVE_HDMI_IN_HD}\n" >> ${D}${INFOFILE}
     printf "hdmistandbymode=${HDMISTANDBY_MODE}\n" >> ${D}${INFOFILE}
-    printf "imagebuild='${DATE}'\n" >> ${D}${INFOFILE}
-    printf "imagedevbuild='${DEVELOPER_BUILD_VERSION}'\n" >> ${D}${INFOFILE}
+    printf "imagebuild='${OE_REVISION}'\n" >> ${D}${INFOFILE}
+    printf "imagedevbuild='${OE_HASH}'\n" >> ${D}${INFOFILE}
     printf "imagedir=${IMAGEDIR}\n" >> ${D}${INFOFILE}
     printf "imagefs=${IMAGE_FSTYPES}\n" >> ${D}${INFOFILE}
     printf "imagetype=${DISTRO_TYPE}\n" >> ${D}${INFOFILE}
-    printf "imageversion='${DISTRO_VERSION}'\n" >> ${D}${INFOFILE}
+    printf "imageversion='${IMAGE_VERSION}'\n" >> ${D}${INFOFILE}
     printf "imglanguage=multilang\n" >> ${D}${INFOFILE}
-    printf "imgrevision='${DATE}'\n" >> ${D}${INFOFILE}
+    printf "imgrevision='${OE_REVISION}'\n" >> ${D}${INFOFILE}
     printf "imgversion='${IMAGE_VERSION}'\n" >> ${D}${INFOFILE}
     printf "kernel='${KERNEL_VERSION}'\n" >> ${D}${INFOFILE}
     printf "kexecmb=${HAVE_KEXECMB}\n" >> ${D}${INFOFILE}

diff --git a/meta-openpli/recipes-openpli/images/openpli-enigma2-feed.bb b/meta-openpli/recipes-openpli/images/openpli-enigma2-feed.bb
@@ -214,6 +214,7 @@ OPTIONAL_ENIGMA2_PACKAGES = " \
 	enigma2-plugin-extensions-vcs \
 	enigma2-plugin-extensions-xmodem \
 	enigma2-plugin-extensions-xstreamity \
+	enigma2-plugin-extensions-xklass \
 	enigma2-plugin-extensions-youtube \
 	enigma2-plugin-systemplugins-crossepg \
 	enigma2-plugin-systemplugins-devicemanager \