enigma2.sh.in

nomjasV · 4. September 2016, 15:46

-- enigma2.sh.in.patch --

Hallo,

Ich habe ein wenig enigma2.sh überarbeitet aber bevor enigma2.sh.in gepatch wird
sollte man enigma2.sh (in zip enhalten) ausprobieren.

Unterschiede-Datei

--- enigma2.sh.in.orig 2016-09-03 18:48:46.264088748 +0200
+++ enigma2.sh.in 2016-09-04 15:14:00.703857536 +0200
@@ -4,18 +4,14 @@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
-if [ -e /usr/bin/xbmc ]; then
- if [ -e /etc/.xbmcstart ]; then
+if [ -x /usr/bin/xbmc ]; then
rm -f /etc/.xbmcstart
/usr/bin/xbmc
- fi
fi
-if [ -e /usr/bin/kodi ]; then
- if [ -e /etc/.kodistart ]; then
+if [ -x /usr/bin/kodi ]; then
rm -f /etc/.kodistart
/usr/bin/kodi
- fi
fi
if [ -x @bindir@/showiframe ]; then
@@ -29,46 +25,31 @@
fi
# workaround for corrupt ssl files
-if [ ! "$(grep config.misc.firstrun /etc/enigma2/settings)" == "config.misc.firstrun=false" ]; then
+if ! grep ^config.misc.firstrun=false /etc/enigma2/settings >/dev/null; then
rm -rf /etc/enigma2/cert.pem &
rm -rf /etc/enigma2/key.pem &
fi
# update NTP time if NTP Time Enabled
-if [ "$(grep config.misc.SyncTimeUsing /etc/enigma2/settings)" == "config.misc.SyncTimeUsing=1" ]; then
+if grep ^config.misc.SyncTimeUsing=1 /etc/enigma2/settings >/dev/null; then
/usr/sbin/ntpdate -s -u pool.ntp.org &
fi
# hook to execute scripts always before enigma2 start
-if [ -x @bindir@/enigma2_pre_start.sh ]; then
- @bindir@/enigma2_pre_start.sh
-fi
+[ -x @bindir@/enigma2_pre_start.sh ] && @bindir@/enigma2_pre_start.sh
-if [ -f /usr/lib/libssl.so.0.9.8 ]; then
- echo "libssl symlink found"
-else
- ln -s /usr/lib/libssl.so.1.0.0 /usr/lib/libssl.so.0.9.8
-fi
+[ -L /usr/lib/libssl.so.0.9.8 ] || ln -sf /usr/lib/libssl.so.1.0.0 /usr/lib/libssl.so.0.9.8
+[ -L /usr/lib/libcrypto.so.0.9.8 ] || ln -sf /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so.0.9.8
-if [ -e /lib/libcrypto.so.1.0.0 ]; then
- if [ -f /lib/libcrypto.so.0.9.8 ]; then
- echo "libcrypto symlink found"
- else
- ln -s /lib/libcrypto.so.1.0.0 /lib/libcrypto.so.0.9.8
- fi
-fi
-
-if [ -e /usr/lib/libcrypto.so.1.0.0 ]; then
- if [ -e /usr/lib/libcrypto.so.0.9.8 ]; then
- echo "libcrypto symlink found"
- else
- ln -s /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so.0.9.8
- fi
-fi
+#if [ -e /lib/libcrypto.so.1.0.0 ]; then
+# if [ -f /lib/libcrypto.so.0.9.8 ]; then
+# echo "libcrypto symlink found"
+# else
+# ln -s /lib/libcrypto.so.1.0.0 /lib/libcrypto.so.0.9.8
+# fi
+#fi
-if [ -d /home/root ]; then
- cd /home/root
-fi
+[ -d /home/root ] && cd /home/root
if [ -e /proc/stb/info/hwmodel ]; then
stbcheck=`cat /proc/stb/info/hwmodel | cut -c1-8`
@@ -82,20 +63,10 @@
fi
# check if media/net directory exists
-if [ -d /media/net ]; then
- echo "/media/net found"
-else
- mkdir /media/net
-fi
+[ -d /media/net ] || mkdir /media/net
# check for settings files
-if [ -f @sysconfdir@/enigma2/settings ]; then
- echo "@sysconfdir@/enigma2/settings found"
-else
- cp @datadir@/enigma2/defaults/* @sysconfdir@/enigma2/
-fi
-
-sync
+[ -f @sysconfdir@/enigma2/settings ] || cp @datadir@/enigma2/defaults/* @sysconfdir@/enigma2/
# check for sundtek tuner helper lib
if [ -e /opt/lib/libmediaclient.so ]; then
@@ -114,25 +85,24 @@
LIBS="$LIBS @libdir@/libpassthrough.so"
fi
-if [ ! -e /etc/enigma2/settings ]; then
- touch /etc/enigma2/settings
-fi
+touch /etc/enigma2/settings
sync
(sleep 2; echo "enigma2 is the main pvr application... adjust oom score!"; PID=$(pidof enigma2); \
[ -e /proc/$PID/oom_score_adj ] && echo "-999" > /proc/$PID/oom_score_adj || echo "-17" > /proc/$PID/oom_adj;) &
-if [ "$(grep config.crash.enabledebug /etc/enigma2/settings)" == "config.crash.enabledebug=true" ]; then
+if grep ^config.crash.enabledebug=true /etc/enigma2/settings >/dev/null; then
RANDOMIZE1970=''
time=`date +%Y` ;
if [ "$time" = 1970 ]; then
RANDOMIZE1970="$(strings /dev/urandom | grep -o '[[:alnum:]]' | head -n 5 | tr -d '\n')"
fi
- if [ "$(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')" != "" -a -d "$(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')" ]; then
- LD_PRELOAD=$LIBS @bindir@/enigma2 --debug-no-color &> $(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')Enigma2-debug-$(date +%Y%m%d_%H-%M-%S)$RANDOMIZE1970.log
- else
+ CONFIG_CRASH_DEBUG_PATH=$(grep ^config.crash.debug_path= /etc/enigma2/settings | cut -f2 -d=)
+ if [ -z $CONFIG_CRASH_DEBUG_PATH ]; then
LD_PRELOAD=$LIBS @bindir@/enigma2 --debug-no-color &> /home/root/logs/Enigma2-debug-$(date +%Y%m%d_%H-%M-%S)$RANDOMIZE1970.log
+ else
+ LD_PRELOAD=$LIBS @bindir@/enigma2 --debug-no-color &> ${CONFIG_CRASH_DEBUG_PATH}Enigma2-debug-$(date +%Y%m%d_%H-%M-%S)$RANDOMIZE1970.log
fi
else
# in case $TERM is "linux" the serial output is activated - discard debug output

Alles anzeigen

mfG

Koivo · 4. September 2016, 16:01

patch enigma2.sh.in enigma2.sh.in.patch
patching file enigma2.sh.in
Hunk #1 FAILED at 4.
Hunk #2 FAILED at 29.
Hunk #3 FAILED at 82.
Hunk #4 FAILED at 114.
4 out of 4 hunks FAILED -- saving rejects to file enigma2.sh.in.rej

nomjasV · 4. September 2016, 17:02

mea culpa

$ patch -p0 < enigma.sh.in.patch
patching file enigma2.sh.in

Koivo · 4. September 2016, 17:15

Mach ich da irgendwas falsch oder stell ich mich zu blöd an?

patch -p0 < enigma2.sh.in
enigma2.sh.in enigma2.sh.in.patch
root@Server:/hdd_intern/patch# patch -p0 < enigma2.sh.in.patch
patching file enigma2.sh.in
Hunk #1 FAILED at 5.
Hunk #2 FAILED at 82.
Hunk #3 FAILED at 114.
Hunk #4 FAILED at 129.
4 out of 4 hunks FAILED -- saving rejects to file enigma2.sh.in.rej

Natürlich mit dem letzten Patch.

nomjasV · 4. September 2016, 18:02

lade mal bitte deine enigma2.sh.in hoch

$ wget raw.githubusercontent.com/open…aster/tools/enigma2.sh.in -O enigma2.sh.in ; patch -p0 < enigma2.sh.in.patch
URL transformed to HTTPS due to an HSTS policy
--2016-09-04 18:01:52-- raw.githubusercontent.com/open…aster/tools/enigma2.sh.in
Auflösen des Hostnamens »raw.githubusercontent.com (raw.githubusercontent.com)« … 151.101.12.133
Verbindungsaufbau zu raw.githubusercontent.com (raw.githubusercontent.com)|151.101.12.133|:443 … verbunden.
HTTP-Anforderung gesendet, auf Antwort wird gewartet … 200 OK
Länge: 5278 (5,2K) [text/plain]
Wird in »»enigma2.sh.in«« gespeichert.

enigma2.sh.in 100%[========================================================>] 5,15K --.-KB/s in 0,001s

2016-09-04 18:01:53 (3,77 MB/s) - »»enigma2.sh.in«« gespeichert [5278/5278]

patching file enigma2.sh.in

ist das die richtige file?

Koivo · 4. September 2016, 18:30

Ja hast recht. Es war der Windows Linux Missmatch. Ich benutze smartgit unter Windows.
Jetzt hab ich mir direkt mit wget die Datei aus dem git geholt. Jetzt funktionierte auch der Patch.

Koivo · 4. September 2016, 18:36

github.com/openhdf/enigma2/commits/master

nomjasV · 5. September 2016, 04:38

ein fehler noch

finde in enigma2.sh.in

Quellcode

[ -d /media/net ] && mkdir /media/net

und ersätze mit

Quellcode

[ -d /media/net ] || mkdir /media/net

Danke.

mfG

Koivo · 5. September 2016, 05:13

Erledigt.

nomjasV · 6. September 2016, 09:26

noch ein versuch

enigma2.sh zum probieren
und
run-e2d_patch.sh zum anlegen enigma2.d in zip

-- enigma2.sh.in.patch --

Unterschiede-Datei

--- enigma2.sh.in.orig 2016-09-06 08:30:05.467370373 +0200
+++ enigma2.sh.in 2016-09-06 08:33:27.189576054 +0200
@@ -4,86 +4,16 @@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
-if [ -e /usr/bin/xbmc ]; then
- rm -f /etc/.xbmcstart
- /usr/bin/xbmc
-fi
-
-if [ -e /usr/bin/kodi ]; then
- rm -f /etc/.kodistart
- /usr/bin/kodi
-fi
-
-if [ -f @sysconfdir@/enigma2/bootlogo.mvi ]; then
- echo found @sysconfdir@/enigma2/bootlogo.mvi
- @bindir@/showiframe @sysconfdir@/enigma2/bootlogo.mvi
- elif [ -f @datadir@/bootlogo.mvi ]; then
- echo found @datadir@/bootlogo.mvi
- @bindir@/showiframe @datadir@/bootlogo.mvi
-fi
-
-# workaround for corrupt ssl files
-if ! grep ^config.misc.firstrun=false /etc/enigma2/settings >/dev/null; then
- rm -rf /etc/enigma2/cert.pem &
- rm -rf /etc/enigma2/key.pem &
-fi
-
-# update NTP time if NTP Time Enabled
-if grep ^config.misc.SyncTimeUsing=1 /etc/enigma2/settings >/dev/null; then
- /usr/sbin/ntpdate -s -u pool.ntp.org &
-fi
-
-# hook to execute scripts always before enigma2 start
-[ -x @bindir@/enigma2_pre_start.sh ] && @bindir@/enigma2_pre_start.sh
-
-[ -L /usr/lib/libssl.so.0.9.8 ] || ln -s /usr/lib/libssl.so.1.0.0 /usr/lib/libssl.so.0.9.8
-
-#if [ -e /lib/libcrypto.so.1.0.0 ]; then
-# if [ -f /lib/libcrypto.so.0.9.8 ]; then
-# echo "libcrypto symlink found"
-# else
-# ln -s /lib/libcrypto.so.1.0.0 /lib/libcrypto.so.0.9.8
-# fi
-#fi
-
-[ -L /usr/lib/libcrypto.so.0.9.8 ] || ln -s /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so.0.9.8
+# load enigma2 profile
+test -d /etc/enigma2.d && \
+ {
+ for eprofile in /etc/enigma2.d/*.sh ; do
+ test -x $eprofile && . $eprofile
+ done
+ }
[ -d /home/root ] && cd /home/root
-if [ -e /proc/stb/info/hwmodel ]; then
- stbcheck=`cat /proc/stb/info/hwmodel | cut -c1-8`
- if [ $stbcheck == "optimuss" ]; then
- string=`mount | grep 'sda1' | cut -d " " -f3`
- if [ -e $string/sat-soft/settings.sh ]; then
- chmod 755 $string/sat-soft/settings.sh
- $string/sat-soft/settings.sh
- fi
- fi
-fi
-
-# check if media/net directory exists
-[ -d /media/net ] || mkdir /media/net
-
-# check for settings files
-[ -f @sysconfdir@/enigma2/settings ] || cp @datadir@/enigma2/defaults/* @sysconfdir@/enigma2/
-
-# check for sundtek tuner helper lib
-if [ -e /opt/lib/libmediaclient.so ]; then
- LIBS="/opt/lib/libmediaclient.so /usr/lib/libopen.so.0.0.0"
-else
- LIBS="/usr/lib/libopen.so.0.0.0"
-fi
-
-#check for specific pagecache helper lib
-if [ -e /usr/lib/libpagecache.so ]; then
- LIBS="$LIBS /usr/lib/libpagecache.so"
-fi
-
-#check for receiver specific passthrough helper lib
-if [ -e @libdir@/libpassthrough.so ]; then
- LIBS="$LIBS @libdir@/libpassthrough.so"
-fi
-
touch /etc/enigma2/settings
sync

Alles anzeigen

-- enigma2.d.patch --

Unterschiede-Datei

--- 00_bootlogo_start.sh.orig 2016-09-06 08:58:24.861995024 +0200
+++ 00_bootlogo_start.sh 2016-09-06 08:37:31.408248431 +0200
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -f /etc/enigma2/bootlogo.mvi ]; then
+ echo found /etc/enigma2/bootlogo.mvi
+ /usr/bin/showiframe /etc/enigma2/bootlogo.mvi
+ elif [ -f /usr/share/bootlogo.mvi ]; then
+ echo found /usr/share/bootlogo.mvi
+ /usr/bin/showiframe /usr/share/bootlogo.mvi
+fi
+
--- 00_enigma2_pre_start.sh.orig 2016-09-06 08:58:24.861995024 +0200
+++ 00_enigma2_pre_start.sh 2016-09-06 08:37:31.664251234 +0200
@@ -0,0 +1 @@
+#/bin/sh
--- 01_load_kodi.sh.orig 2016-09-06 08:58:24.865995068 +0200
+++ 01_load_kodi.sh 2016-09-06 08:37:31.432248694 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# kodie hat eigene start|stop scripts
+if [ -x /usr/bin/kodi ]; then
+ rm -f /etc/.kodistart
+ /usr/bin/kodi
+fi
+
--- 01_load_xmbc.sh.orig 2016-09-06 08:58:24.865995068 +0200
+++ 01_load_xmbc.sh 2016-09-06 08:37:31.596250489 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# xmbc nicht gefunden aber vermutlich hat eigene start|stop scripts
+if [ -x /usr/bin/xbmc ]; then
+ rm -f /etc/.xbmcstart
+ /usr/bin/xbmc
+fi
+
--- 02_enigma2_ntp_time.sh.orig 2016-09-06 08:58:24.869995112 +0200
+++ 02_enigma2_ntp_time.sh 2016-09-06 08:37:31.572250227 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# update NTP time if NTP Time Enabled
+if grep config.misc.SyncTimeUsing=1 /etc/enigma2/settings >/dev/null; then
+ /usr/sbin/ntpdate -s -u pool.ntp.org &
+fi
+
--- check_curupt_ssl_files.sh.orig 2016-09-06 08:58:24.869995112 +0200
+++ check_curupt_ssl_files.sh 2016-09-06 08:37:31.484249263 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# workaround for corrupt ssl files
+if ! grep config.misc.firstrun=false /etc/enigma2/settings >/dev/null; then
+ rm -rf /etc/enigma2/cert.pem &
+ rm -rf /etc/enigma2/key.pem &
+fi
+
--- check_enigma2_settings_files.sh.orig 2016-09-06 08:58:24.869995112 +0200
+++ check_enigma2_settings_files.sh 2016-09-06 08:37:31.320247468 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# check for settings files
+[ -f /etc/enigma2/settings ] || cp /usr/share/enigma2/defaults/* /etc/enigma2/
+
--- check_libcrypto_symlink.sh.orig 2016-09-06 08:58:24.873995156 +0200
+++ check_libcrypto_symlink.sh 2016-09-06 08:37:31.512249570 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#if [ -e /lib/libcrypto.so.1.0.0 ]; then
+# if [ -f /lib/libcrypto.so.0.9.8 ]; then
+# echo "libcrypto symlink found"
+# else
+# ln -s /lib/libcrypto.so.1.0.0 /lib/libcrypto.so.0.9.8
+# fi
+#fi
+
+[ -L /usr/lib/libcrypto.so.0.9.8 ] || ln -sf /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so.0.9.8
--- check_libssl_symlink.sh.orig 2016-09-06 08:58:24.873995156 +0200
+++ check_libssl_symlink.sh 2016-09-06 08:37:31.376248081 +0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -L /usr/lib/libssl.so.0.9.8 ] || ln -sf /usr/lib/libssl.so.1.0.0 /usr/lib/libssl.so.0.9.8
+
--- check_media_net_directory.sh.orig 2016-09-06 08:58:24.877995200 +0200
+++ check_media_net_directory.sh 2016-09-06 08:37:31.628250840 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# check if media/net directory exists
+[ -d /media/net ] || mkdir /media/net
+
--- helper_pagecache.sh.orig 2016-09-06 08:58:24.877995200 +0200
+++ helper_pagecache.sh 2016-09-06 08:37:31.344247731 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#check for specific pagecache helper lib
+if [ -e /usr/lib/libpagecache.so ]; then
+ LIBS="$LIBS /usr/lib/libpagecache.so"
+fi
+
--- helper_passthrough.sh.orig 2016-09-06 08:58:24.877995200 +0200
+++ helper_passthrough.sh 2016-09-06 08:37:31.460249001 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#check for receiver specific passthrough helper lib
+if [ -e /usr/lib/libpassthrough.so ]; then
+ LIBS="$LIBS /usr/lib/libpassthrough.so"
+fi
+
--- helper_sundtek_tuner.sh.orig 2016-09-06 08:58:24.877995200 +0200
+++ helper_sundtek_tuner.sh 2016-09-06 08:37:31.692251540 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# check for sundtek tuner helper lib
+if [ -e /opt/lib/libmediaclient.so ]; then
+ LIBS="/opt/lib/libmediaclient.so /usr/lib/libopen.so.0.0.0"
+else
+ LIBS="/usr/lib/libopen.so.0.0.0"
+fi
--- optimus_sat-soft_settings.sh.orig 2016-09-06 08:58:24.877995200 +0200
+++ optimus_sat-soft_settings.sh 2016-09-06 08:37:31.544249920 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -e /proc/stb/info/hwmodel ]; then
+ stbcheck=`cat /proc/stb/info/hwmodel | cut -c1-8`
+ if [ $stbcheck == "optimuss" ]; then
+ string=`mount | grep 'sda1' | cut -d " " -f3`
+ if [ -e $string/sat-soft/settings.sh ]; then
+ chmod 755 $string/sat-soft/settings.sh
+ $string/sat-soft/settings.sh
+ fi
+ fi
+fi

Alles anzeigen

Koivo · 6. September 2016, 12:10

Was bezweckst du damit? Sollen die ganzen Anweisungen jetzt in Scripte verpackt in einem Unterordner gestartet werden?
Was genau ist daran der Vorteil?

nomjasV · 6. September 2016, 12:19

Das war eigentlich nur ein voschlag von mir.

vorteil - bessere übersicht für imagebauer (glaube ich halt), user kann selbst hand anlegen (einige sachen in enigma2.sh sind für mich uninteresant)
nachteil - keine kontrolle über fremdpakete bei der installation.

mfG

Koivo · 6. September 2016, 12:40

Aber die nicht interessanten Dinge stören ja auch nicht.
Die Enigma.sh wird ja auch beim Bauen mit ins Image gebaut.
Dafür müsste ich unser Git umbauen um dort Ordner zu benutzen. Ich glaube das lohnt nicht. Ich sehe keinen wirklichen Vorteil.

Gesendet von meinem Elephone P8000 mit Tapatalk

nomjasV · 6. September 2016, 12:59

ok, ich muss damit leben

mfG

enigma2.sh.in

enigma2.sh.in

Unterschiede-Datei

Quellcode

Quellcode

Unterschiede-Datei

Unterschiede-Datei

Teilen

Ähnliche Themen

Unsere Partnerboards