diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index e9bd33c..90e1c84 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -164,7 +164,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Copied kernel.bin STB-ARM DM920 4K."') -#arm Dreambox dm920 +#arm ax51 elif getBoxHostName() == 'ax51': os.system('mv ' + getNeoLocation() + 'ImagesUpload/hd51/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Copied kernel.bin STB-ARM AX 4K Box HD51 4K."') @@ -175,7 +175,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan os.system('echo "Copied kernel.bin STB-ARM Ariva 4K Combo."') #arm Zgemma h7 - elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': + elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' and getBoxHostName() != 'ax51': os.system('mv ' + getNeoLocation() + 'ImagesUpload/zgemma/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Copied kernel.bin STB-ARM Zgemma h7."') #arm gbquad4k @@ -1059,6 +1059,8 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): os.chdir('ultimo4k') if os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/duo4k'): os.chdir('duo4k') + if os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/duo4kse'): + os.chdir('duo4kse') if os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/zero4k'): os.chdir('zero4k') if os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/uno4kse'): @@ -1251,6 +1253,10 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): os.system('echo "Please wait. System installation VuPlus Duo4k."') cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/vuplus/duo4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/vuplus/duo4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1' rc = os.system(cmd) + elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/duo4kse'): + os.system('echo "Please wait. System installation VuPlus Duo4kse."') + cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/vuplus/duo4kse/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/vuplus/duo4kse/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1' + rc = os.system(cmd) elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/update/revo4k'): os.system('echo "Please wait. System installation Revo4k."') cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/update/revo4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/update/revo4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1' diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 3b33b1c..5c3bbeb 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -51,7 +51,7 @@ else: from files.neoconsole import Console PLUGINVERSION = '9.03' -UPDATEVERSION = '9.07' +UPDATEVERSION = '9.08' LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' try: @@ -541,7 +541,7 @@ class NeoBootInstallation(Screen): os.system('opkg install mtd-utils-ubifs') # 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 getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' or getBoxHostName() == 'ax51' or getBoxHostName() == 'tmtwin4k' or getBoxHostName() == 'anadol4k' or getBoxHostName() == 'protek4k' or getBoxHostName() == 'maxytecmulti' or getBoxHostName() == 'force3uhd' or getBoxHostName() == 'viper4k' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName == 'osmio4kplus' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'h10' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuuno4k' and getBoxHostName() != 'vusolo4k' and getBoxHostName() != 'vuuno4kse' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuduo4k' and getBoxHostName() != 'vuzero4k': + if getBoxHostName() == 'ustym4kpro' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' or getBoxHostName() == 'ax51' or getBoxHostName() == 'tmtwin4k' or getBoxHostName() == 'anadol4k' or getBoxHostName() == 'protek4k' or getBoxHostName() == 'maxytecmulti' or getBoxHostName() == 'force3uhd' or getBoxHostName() == 'viper4k' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName == 'osmio4kplus' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'h10' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuuno4k' and getBoxHostName() != 'vusolo4k' and getBoxHostName() != 'vuuno4kse' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuduo4k' and getBoxHostName() != 'duo4kse' and getBoxHostName() != 'vuzero4k': os.system('cp -f ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv ' + LinkNeoBoot + '/tmpfiles/runpy/arm_run.py ' + LinkNeoBoot + '/run.py; cd') #VUPLUS ARM elif getCPUtype() == 'ARMv7' and getBoxHostName() != 'ustym4kpro': @@ -552,6 +552,15 @@ class NeoBootInstallation(Screen): os.system('dd if=/dev/mmcblk0p6 of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName())) os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/vuDuo4Kmmcblk0p6.sh ' + LinkNeoBoot + '/files/kernel.sh; cd') + elif getCPUtype() == 'ARMv7' and getBoxHostName() != 'ustym4kpro' and getBoxHostName() != 'vuultimo4k': + if getCPUSoC() == '7444s' or getBoxHostName() == 'vuduo4kse': + os.system('cd ' + LinkNeoBoot + '/' ) + os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cp -Rf ' + LinkNeoBoot + '/bin/neoinitarmvuDuo4k /sbin/neoinitarmvu; mv ' + LinkNeoBoot + '/tmpfiles/runpy/duo4kse_run.py ' + LinkNeoBoot + '/run.py; cd') + os.system('chmod 755 /sbin/neoinitarm; chmod 755 /sbin/neoinitarmvu') + os.system('dd if=/dev/mmcblk0p6 of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName())) + os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/vuDuo4Ksemmcblk0p6.sh ' + LinkNeoBoot + '/files/kernel.sh; cd') + + elif getCPUSoC() == '72604' or getBoxHostName() == 'vuzero4k': os.system('cd ' + LinkNeoBoot + '/' ) os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cp -Rf ' + LinkNeoBoot + '/bin/neoinitarmvu /sbin/neoinitarmvu; cd') @@ -559,10 +568,10 @@ class NeoBootInstallation(Screen): os.system('dd if=/dev/mmcblk0p4 of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName())) os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/vuZero4Kmmcblk0p4.sh ' + LinkNeoBoot + '/files/kernel.sh; mv ' + LinkNeoBoot + '/tmpfiles/runpy/zero4k_run.py ' + LinkNeoBoot + '/run.py; cd') - elif getCPUSoC() or getBoxHostName() == ['7444s', + elif getBoxHostName() != 'vuduo4kse' and getCPUSoC() or getBoxHostName() == ['7444s', '7252s', '7376', - 'vuultimo4k', + 'vuultimo4k', 'vuuno4k', 'vusolo4k', 'vuuno4kse'] : @@ -805,7 +814,8 @@ class NeoBootImageChoose(Screen): os.system('rm -f /.control_boot_new_image; echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file." > /.control_ok ') if not fileExists('/.control_boot_new_image'): os.system('echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file." > /.control_ok') - + + self.list = [] self.setTitle(' NeoBoot %s - Menu' % PLUGINVERSION + ' ' + 'Ver. update: %s' % UPDATEVERSION) self['device_icon'] = Pixmap()