diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index 035625e..7f02e57 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -138,10 +138,15 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon os.system('mv ' + getNeoLocation() + 'ImagesUpload/osmini/kernel.bin ' + media_target + '/boot/' + getBoxHostName() + '.vmlinux.gz' + dev_null) os.system('echo "Skopiowano kernel.bin Edision OS MINI. Typ stb - MIPS"') #arm octagon - elif getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008': + elif getBoxHostName() == 'sf4008': #getCPUSoC() == 'bcm7251' or os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Skopiowano kernel.bin STB-ARM Octagon."') +#arm GI ET-11000 4K et1x000 + elif getBoxHostName() == 'et1x000': #getCPUSoC() == 'bcm7251' or + os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) + os.system('echo "Skopiowano kernel.bin STB-ARM GI ET-11000 4K."') + #arm Zgemma h7 elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': os.system('mv ' + getNeoLocation() + 'ImagesUpload/zgemma/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) @@ -617,7 +622,9 @@ def RemoveUnpackDirs(): rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/xp1000 ') elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dinobot '): rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/dinobot ') - + elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et1x000 '): + rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/et1x000 ') + os.system('echo "Remove Unpack Dirs..."') @@ -1139,6 +1146,11 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): os.system('echo "Instalacja systemu ustym4kpro w toku..."') cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/uclan/ustym4kpro; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/uclan/ustym4kpro/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1' rc = os.system(cmd) + elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et1x000'): + os.system('echo "Instalacja systemu GI ET-11000 4K w toku..."') + cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/et1x000; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/et1x000/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1' + rc = os.system(cmd) + else: os.system('echo "NeoBoot wykrył dłąd!!! Prawdopodobnie brak pliku instalacyjnego."') diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 32fb5b2..9570755 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -600,7 +600,7 @@ class NeoBootInstallation(Screen): # ARM - OctagonSF4008 - DM900 - Zgemma h7S - Octagon sf 8008 - AX HD60 4K #gbquad4k arm , #osmio4k arm, #Zgemma h9 arm, #Zgemma h7S arm , #Octagon SF4008 - if getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900': + if getBoxHostName() == 'et1x000' or getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900': os.system('cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/arm_run.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd') @@ -922,7 +922,12 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': if os.path.exists('/proc/stb/info/boxtype'): - if getCPUSoC() == 'bcm7251' or getBoxHostName == 'sf4008': + if getBoxHostName == 'sf4008': #getCPUSoC() == 'bcm7251' + os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p4 /media/mmc') + + if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': + if os.path.exists('/proc/stb/info/boxtype'): + if getBoxHostName == 'et1x000': #getCPUSoC() == 'bcm7251' or os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p4 /media/mmc') if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': @@ -1403,6 +1408,7 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" 'sf8008', 'bcm7251', 'sf4008', + 'et1x000', 'bcm7251s', '7241', 'h7', diff --git a/NeoBoot/stbinfo b/NeoBoot/stbinfo index 0577c70..d22411e 100644 --- a/NeoBoot/stbinfo +++ b/NeoBoot/stbinfo @@ -15,9 +15,6 @@ cat /proc/partitions cat /var/lib/opkg/info/kernel-image*.postinst - - - Ultimo4k : 7444s Solo4k : 7376 Zero 4K : 72604 @@ -56,4 +53,5 @@ atemio6000 : bcm7362 gbquad4k : bcm7252s # cat /proc/stb/info/model : gbquad4k # # cat /etc/hostname : gbquad4k # cat /proc/cmdline root=/dev/mmcblk0p5 rootwait rw rootflags=data=journal libata.force=1:3.0G,2:3.0G,3:3.0G coherent_poll=2M vmalloc=525m bmem=529m@491m bmem=608m@2464m ustym4kpro: cat /proc/stb/info/chipset 3798mv200 root@ustym4kpro: cat /etc/hostname ustym4kpro - \ No newline at end of file + +GI ET-11000 4K : bcm7251 cat /etc/hostname et1x000 \ No newline at end of file