Merge branch 'develop' of https://github.com/OpenPLi/openpli-oe-core …

…into develop
ghani-1977 · Jan 6, 2021 · fef26a3 · fef26a3
2 parents 4c6197e + b947fac
commit fef26a3
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 28 deletions.
diff --git a/meta-gi b/meta-gi
diff --git a/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb b/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
@@ -10,7 +10,7 @@ INITSCRIPT_NAME = "djmount"
 INITSCRIPT_PARAMS = "defaults"
 
 # libupnp make doesn't support it
-PARALLEL_MALE = ""
+PARALLEL_MAKE = ""
 
 CFLAGS_append+= "-std=gnu89"
 

diff --git a/meta-openpli/recipes-core/udev/files/automount.rules b/meta-openpli/recipes-core/udev/files/automount.rules
@@ -0,0 +1,21 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add",                                 RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove",                              RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="change", ENV{DISK_MEDIA_CHANGE}=="1", RUN+="/etc/udev/scripts/mount.sh"
+
+SUBSYSTEM=="block", KERNEL=="sr?*", ACTION=="add",                 RUN+="/usr/bin/bdpoll %k -c"
diff --git a/meta-openpli/recipes-core/udev/files/mount.sh b/meta-openpli/recipes-core/udev/files/mount.sh
@@ -194,18 +194,24 @@ automount() {
 		MOUNT="$MOUNT -o silent"
 	fi
 
-	# If filesystem type is vfat, change the ownership group to 'disk', and
-	# grant it with  w/r/x permissions.
+	# Deal with specific file system exceptions
 	case $ID_FS_TYPE in
+	ext3)
+		# ext3 devices need to be mounted with the ext4 driver
+		MOUNT="$MOUNT -t ext4"
+		;;
 	vfat|fat)
-		MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
+		# If filesystem type is vfat, change the ownership group to 'disk', and
+		# grant it with  w/r/x permissions.
+		MOUNT="$MOUNT -t auto -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
 		;;
-	# TODO
 	*)
+		# Let mount figure it out
+		MOUNT="$MOUNT -t auto"
 		;;
 	esac
 
-	if ! $MOUNT -t auto $DEVNAME "/media/$LABEL"
+	if ! $MOUNT $DEVNAME "/media/$LABEL"
 	then
 		logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$LABEL\" failed!"
 		rm_dir "/media/$LABEL"

diff --git a/meta-openpli/recipes-core/udev/udev-extraconf_1.%.bbappend b/meta-openpli/recipes-core/udev/udev-extraconf_1.%.bbappend
@@ -2,5 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
 	file://mount.sh \
+	file://automount.rules \
 	file://localextra.rules \
-	"
+	"
diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugin-extensions-kodi.bb b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugin-extensions-kodi.bb
@@ -9,6 +9,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RRECOMMENDS_${PN} = "enigma2-plugin-extensions-subssupport virtual/kodi"
 
+RDEPENDS_${PN} = "python-pycrypto python-pycryptodomex kodi-addon-inputstream-adaptive nspr nss"
+
 SRC_URI = "git://github.com/mx3L/kodiext;protocol=git;branch=master \
 	file://0001-make-transparant.patch \
 	file://advancedsettings.xml \

diff --git a/meta-openpli/recipes-openpli/fakelocale/fakelocale.bb b/meta-openpli/recipes-openpli/fakelocale/fakelocale.bb
@@ -17,18 +17,19 @@ S = "${WORKDIR}/git"
 LOCALEDIR = "${libdir}/locale"
 LOCALEDIR2 = "${datadir}/locale"
 
-LANGUAGES = "ar_AE bg_BG ca_AD cs_CZ da_DK de_DE el_GR en_EN es_ES et_EE fa_IR fi_FI \
-	fr_FR fy_NL he_IL hr_HR hu_HU id_ID is_IS it_IT lt_LT lv_LV nl_NL nb_NO nn_NO pl_PL pt_BR pt_PT \
-	ru_RU sk_SK sl_SI sr_RS sv_SE th_TH tr_TR uk_UA vi_VN zh_CN zh_HK ro_RO ku_TR"
+LANGUAGES = "ar_AE bg_BG ca_AD cs_CZ da_DK de_DE el_GR en_EN es_ES et_EE fa_IR fi_FI fr_FR fy_NL \
+	gl_ES he_IL hr_HR hu_HU id_ID is_IS it_IT ku_TR lt_LT lv_LV nb_NO nl_NL nn_NO pl_PL pt_BR \
+	pt_PT ro_RO ru_RU sk_SK sl_SI sr_RS sv_SE th_TH tr_TR uk_UA vi_VN zh_CN zh_HK"
 
 RPROVIDES_${PN} = "virtual-locale-ar virtual-locale-bg virtual-locale-ca virtual-locale-cs \
 	virtual-locale-da virtual-locale-de virtual-locale-el virtual-locale-en virtual-locale-es \
 	virtual-locale-et virtual-locale-fa virtual-locale-fi virtual-locale-fr virtual-locale-fy \
-	virtual-locale-he virtual-locale-hr virtual-locale-hu virtual-locale-id virtual-locale-is \
-	virtual-locale-it virtual-locale-lt virtual-locale-lv virtual-locale-nb virtual-locale-nl \
-	virtual-locale-nn virtual-locale-pl virtual-locale-pt virtual-locale-ru virtual-locale-sk \
-	virtual-locale-sl virtual-locale-sr virtual-locale-sv virtual-locale-th virtual-locale-tr \
-	virtual-locale-uk virtual-locale-vi virtual-locale-zh virtual-locale-ku virtual-locale-ro"
+	virtual-locale-gl virtual-locale-he virtual-locale-hr virtual-locale-hu virtual-locale-id \
+	virtual-locale-is virtual-locale-it virtual-locale-ku virtual-locale-lt virtual-locale-lv \
+	virtual-locale-nb virtual-locale-nl virtual-locale-nn virtual-locale-pl virtual-locale-pt \
+	virtual-locale-ro virtual-locale-ru virtual-locale-sk virtual-locale-sl virtual-locale-sr \
+	virtual-locale-sv virtual-locale-th virtual-locale-tr virtual-locale-uk virtual-locale-vi \
+	virtual-locale-zh"
 
 do_compile() {
     install -d ${S}/output

diff --git a/meta-openpli/recipes-openpli/fakelocale/files/locale.alias b/meta-openpli/recipes-openpli/fakelocale/files/locale.alias
@@ -12,6 +12,7 @@ Finnish fi_FI
 French fr_FR
 Ellinika el_GR
 Frisian fy_NL
+Galician gl_ES
 Hebrew he_IL
 Hungarian hu_HU
 Kurdish ku_TR

diff --git a/meta-openpli/recipes-openpli/images/openpli-enigma2-feed.bb b/meta-openpli/recipes-openpli/images/openpli-enigma2-feed.bb
@@ -78,6 +78,7 @@ OPTIONAL_PACKAGES += " \
 	gstplayer \
 	hddtemp \
 	hdparm \
+	htop \
 	inadyn-mt \
 	inetutils \
 	iperf3 \

diff --git a/meta-openpli/recipes-openpli/images/openpli-image.bb b/meta-openpli/recipes-openpli/images/openpli-image.bb
@@ -22,6 +22,8 @@ IMAGE_INSTALL = "\
 	glibc-binary-localedata-en-gb \
 	kernel-params \
 	modutils-loadscript \
+	cifs-utils \
+	nfs-utils \
 	nfs-utils-client \
 	openpli-bootlogo \
 	openssh-sftp-server \

diff --git a/meta-openpli/recipes-support/ntp/ntp_4.2%.bbappend b/meta-openpli/recipes-support/ntp/ntp_4.2%.bbappend
@@ -1,12 +1,3 @@
 SUMMARY = "OpenPLi Network Time Protocol daemon and utilities"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# remove the created symlink in the OE recipe
-do_install_append() {
-	test -L ${D}/${sysconfdir}/network/if-up.d/ntpdate-sync && rm -f ${D}/${sysconfdir}/network/if-up.d/ntpdate-sync
-}
-
-# do not create th cron task
-pkg_postinst_ntpdate() {
-}
diff --git a/meta-openpli/recipes-support/openvpn/openvpn/openvpn b/meta-openpli/recipes-support/openvpn/openvpn/openvpn
@@ -25,6 +25,7 @@ start_vpn () {
     fi
     start-stop-daemon --start --quiet --pidfile /var/run/openvpn.$NAME.pid \
             --exec $DAEMON -- \
+            --data-ciphers AES-256-GCM:AES-128-GCM:AES-256-CBC:BF-CBC \
             --daemon --writepid /var/run/openvpn.$NAME.pid \
             --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || rc="$?"
     case $rc in

diff --git a/meta-vuplus b/meta-vuplus
diff --git a/meta-xpeedc b/meta-xpeedc
diff --git a/meta-xtrend b/meta-xtrend