diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index 13ed8fc..4e330d3 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -196,7 +196,7 @@ def NEOBootMainEx(source, target, CopyFiles, CopyKernel, TvList, Montowanie, Lan if Montowanie == 'True': os.system('echo "Skopiowano montowanie."') if os.path.exists('%s/ImageBoot/%s/etc/fstab' % (media, target)): - cmd = 'mv %s/ImageBoot/%s/etc/fstab %s/ImageBoot/%s/etc/fstab.org' % (media, + cmd = 'mv %s/ImageBoot/%s/etc/fstab %s/ImageBoot/%s/etc/fstab.tmp' % (media, target, media, target) @@ -206,18 +206,18 @@ def NEOBootMainEx(source, target, CopyFiles, CopyKernel, TvList, Montowanie, Lan target, media, target) - rc = os.system(cmd) + rc = os.system(cmd) cmd = 'cp -r /etc/fstab %s/ImageBoot/%s/etc/fstab' % (media, target) rc = os.system(cmd) - cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh %s/ImageBoot/%s/etc/rcS.d' % (media, target) - rc = os.system(cmd) + cmd1 = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh %s/ImageBoot/%s/etc/rcS.d' % (media, target) + rc = os.system(cmd1) if LanWlan == 'True': if os.path.exists('%s/ImageBoot/%s/etc/vtiversion.info' % (media, target)): os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') - if os.path.exists('/etc/vtiversion.info') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): + elif os.path.exists('/etc/vtiversion.info') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') - if os.path.exists('/etc/bhversion') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): + elif os.path.exists('/etc/bhversion') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') else: if os.path.exists('/etc/wpa_supplicant.wlan0.conf'): @@ -915,7 +915,24 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): #ARM elif getCPUtype() == 'ARMv7': - if os.path.exists('/media/neoboot/ImagesUpload/sf4008'): + os.chdir('/media/neoboot/ImagesUpload') + if os.path.exists('/media/neoboot/ImagesUpload/h9/rootfs.ubi'): + os.chdir('h9') + os.system('mv -f rootfs.ubi rootfs.bin') + + os.system('echo "Instalacja - ubi_reader w toku..."') + if os.path.exists('/media/neoboot/ImagesUpload/h9/rootfs.ubi'): + os.system('mv -f rootfs.ubi rootfs.bin') + cmd = 'chmod 777 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.pyo' + rc = os.system(cmd) + cmd = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.pyo rootfs.bin -o /media/neoboot/ubi' + rc = os.system(cmd) + os.chdir('/home/root') + os.system('mv /media/neoboot/ubi/rootfs/* /media/neoboot/ImageBoot/%s/' % target) + cmd = 'chmod -R +x /media/neoboot/ImageBoot/' + target + rc = os.system(cmd) + + elif os.path.exists('/media/neoboot/ImagesUpload/sf4008'): os.system('echo "Instalacja systemu Octagon SF4008."') cmd = 'chmod 777 /media/neoboot/ImagesUpload/sf4008/rootfs.tar.bz2; tar -jxvf /media/neoboot/ImagesUpload/sf4008/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' rc = os.system(cmd) @@ -984,10 +1001,14 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): os.system('echo "Instalacja systemu Galaxy4k."') cmd = 'chmod 777 /media/neoboot/ImagesUpload/update/galaxy4k/rootfs.tar.bz2; tar -jxvf /media/neoboot/ImagesUpload/update/galaxy4k/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' rc = os.system(cmd) - elif os.path.exists('/media/neoboot/ImagesUpload/zgemma/h7'): + elif os.path.exists('/media/neoboot/ImagesUpload/zgemma/h7/rootfs.tar.bz2'): os.system('echo "Instalacja systemu Zgemma H7."') cmd = 'chmod 777 /media/neoboot/ImagesUpload/zgemma/h7/rootfs.tar.bz2; tar -jxf /media/neoboot/ImagesUpload/zgemma/h7/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' - rc = os.system(cmd) + rc = os.system(cmd) + elif os.path.exists('/media/neoboot/ImagesUpload/zgemma/h9/rootfs.tar.bz2'): + os.system('echo "Instalacja systemu Zgemma H9S ."') + cmd = 'chmod 777 /media/neoboot/ImagesUpload/zgemma/h9/rootfs.tar.bz2; tar -jxf /media/neoboot/ImagesUpload/zgemma/h9/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' + rc = os.system(cmd) elif os.path.exists('/media/neoboot/ImagesUpload/miraclebox/mini4k'): os.system('echo "Instalacja systemu Miraclebox mini4k."') cmd = 'chmod 777 /media/neoboot/ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2; tar -jxvf /media/neoboot/ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' @@ -1004,9 +1025,32 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole): os.system('echo "Instalacja systemu Qviart lunix3-4k w toku..."') cmd = 'chmod 777 /media/neoboot/ImagesUpload/update/lunix3-4k; tar -jxvf /media/neoboot/ImagesUpload/update/lunix3-4k/rootfs.tar.bz2 -C /media/neoboot/ImageBoot/' + target + ' > /dev/null 2>&1' rc = os.system(cmd) + #if os.path.exists('/media/neoboot/ImagesUpload/sf4008'): + #os.chdir('sf4008') + #if os.path.exists('/media/neoboot/ImagesUpload/gigablue'): + # os.chdir('gigablue') + #if os.path.exists('/media/neoboot/ImagesUpload/gigablue/quad'): + #os.chdir('quad') + #if os.path.exists('/media/neoboot/ImagesUpload/hd51'): + #os.chdir('hd51') + #if os.path.exists('/media/neoboot/ImagesUpload/zgemma'): + #os.chdir('zgemma') + #if os.path.exists('/media/neoboot/ImagesUpload/zgemma/h7'): + #os.chdir('h7') + #if os.path.exists('/media/neoboot/ImagesUpload/h9'): + #os.chdir('h9') + #os.system('mv -f rootfs.ubi rootfs.bin') + #if os.path.exists('/media/neoboot/ImagesUpload/dm900'): + #os.chdir('dm900') + #if os.path.exists('/media/neoboot/ImagesUpload/dm920'): + #os.chdir('dm920') + + + else: os.system('echo "NeoBoot wykrył dłąd!!! Prawdopodobnie brak pliku instalacyjnego."') + if BlackHole == 'True': if 'BlackHole' in source and os.path.exists('%s/ImageBoot/%s/usr/lib/enigma2/python/Blackhole' % (media, target)): ver = source.replace('BlackHole-', '') @@ -1087,7 +1131,14 @@ def RemoveUnpackDirs(): elif os.path.exists('/media/neoboot/ImagesUpload/osmini'): rc = os.system('rm -r /media/neoboot/ImagesUpload/osmini') elif os.path.exists('/media/neoboot/ImagesUpload/xp1000 '): - rc = os.system('rm -r /media/neoboot/ImagesUpload/xp1000 ') + rc = os.system('rm -r /media/neoboot/ImagesUpload/xp1000 ') + elif os.path.exists('/media/neoboot/ImagesUpload/h9'): + rc = os.system('mv /media/neoboot/ImagesUpload/bootargs.bin /media/neoboot/ImagesUpload/h9; mv /media/neoboot/ImagesUpload/fastboot.bin /media/neoboot/ImagesUpload/h9') + shutil.rmtree('h9') + elif os.path.exists('/media/neoboot/ImagesUpload/h7'): + rc = os.system('mv /media/neoboot/ImagesUpload/bootargs.bin /media/neoboot/ImagesUpload/h7; mv /media/neoboot/ImagesUpload/fastboot.bin /media/neoboot/ImagesUpload/h7') + shutil.rmtree('h7') + os.system('echo "..........................................."') return 0 #END diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index fc4486e..da6442e 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -45,8 +45,8 @@ import time # save this copyright notice. This document/program is distributed WITHOUT any # warranty, use at YOUR own risk. -PLUGINVERSION = '2.05' -UPDATEVERSION = '2.13' +PLUGINVERSION = '2.06' +UPDATEVERSION = '2.14' class MyUpgrade(Screen): screenwidth = getDesktop(0).size().width() @@ -1143,10 +1143,17 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" self.session.open(Montowanie) def close_exit(self): - if fileExists("/proc/stb/info/vumodel") and not fileExists("/proc/stb/info/boxtype"): - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - mess = _('Error - nie odnaleziono pliku kernela zImage-ipk\n Napraw problem, wybierz numer 3 na pilocie.\nZainstaluj jadro. ') - self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) + system('touch /tmp/.init_reboot') + if not fileExists('/.multinfo'): + out = open('/media/neoboot/ImageBoot/.neonextboot', 'w') + out.write('Flash') + out.close() + self.close() + + #if fileExists("/proc/stb/info/vumodel") and not fileExists("/proc/stb/info/boxtype"): + #if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): + #mess = _('Error - nie odnaleziono pliku kernela zImage-ipk\n Napraw problem, wybierz numer 3 na pilocie.\nZainstaluj jadro. ') + #self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) if fileExists('/.multinfo'): with open('/media/neoboot/ImageBoot/.neonextboot', 'r') as f: @@ -1654,7 +1661,7 @@ def main(session, **kwargs): def menu(menuid, **kwargs): if menuid == 'mainmenu': - return [(_('NEOBOOT'), + return [(_('NeoBOOT'), main, 'neo_boot', 1)] diff --git a/NeoBoot/run.py b/NeoBoot/run.py index ba54ca7..3c34037 100644 --- a/NeoBoot/run.py +++ b/NeoBoot/run.py @@ -266,9 +266,7 @@ class StartImage(Screen): def bootimageARM(self): #Zgemma h7S ARM ARM - h7s_mmcblk0p2.sh if getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxHostName()) )) else: if getImageNeoBoot() == 'Flash': @@ -293,7 +291,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/findkerneldevice.py; dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/kernel; cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() + cmd1 = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/findkerneldevice.py; dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/kernel; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -303,9 +301,7 @@ class StartImage(Screen): self.close() if getCPUSoC() == 'hi3798mv200' or getBoxHostName() == 'zgemmah9s': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxHostName()) )) else: if getImageNeoBoot() == 'Flash': @@ -330,7 +326,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p6; cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() + cmd1 = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p6; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -341,9 +337,7 @@ class StartImage(Screen): #gbquad4k ARM ARM gbquad4k_kernel.sh elif getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxHostName()) )) else: if getImageNeoBoot() == 'Flash': @@ -368,7 +362,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/findkerneldevice.py; dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/kernel; cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() + cmd1 = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/findkerneldevice.py; dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/kernel; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -379,9 +373,7 @@ class StartImage(Screen): #Octagon SF4008 ARM ARM - sf4008_mmcblk0p3.sh elif getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' : - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxHostName()) )) else: if getImageNeoBoot() == 'Flash': @@ -406,7 +398,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p3; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"' % getBoxHostName() - cmd1 = 'cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName() + cmd1 = 'cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -416,15 +408,14 @@ class StartImage(Screen): self.close() #VUPLUS ARM - vu_mmcblk0p1.sh - elif getCPUSoC() == '7444s' or getBoxHostName() == 'vuultimo4k' or getCPUSoC() == '7376' or getBoxHostName() == 'vusolo4k' or getCPUSoC() == '7252s' or getBoxHostName() == 'vuuno4kse': - #elif getBoxHostName() or getCPUSoC() == ['ax60', - #'sf8008', - #'dm900', - #'7444s', - # '7376'] : - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): + elif getBoxHostName() or getCPUSoC() == ['7444s', + 'vuultimo4k', + '7376', + 'vusolo4k', + '7252s' + 'vuuno4k' + 'vuuno4kse'] : + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxVuModel()) )) else: if getImageNeoBoot() == 'Flash': @@ -448,9 +439,9 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): - cmd = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p1; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"' % getBoxVuModel() - cmd1 = 'cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; /etc/init.d/reboot' % getBoxVuModel() - + cmd = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p1; cd /media/mmc; ln -sf "neoinitarm" "/media/mmc/sbin/init" ' % getBoxVuModel() + cmd1 = ('sleep 2; /etc/init.d/reboot') + elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') cmd1 = 'cd /media/mmc; ln -sf "neoinitarmvu" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh ' @@ -460,9 +451,7 @@ class StartImage(Screen): #VUPLUS ARM - Zero4k vu_mmcblk0p4.sh elif getCPUSoC() == '72604' or getBoxHostName() == 'vuzero4k': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxVuModel()) )) else: if getImageNeoBoot() == 'Flash': @@ -487,7 +476,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): cmd = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p4; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"' % getBoxVuModel() - cmd1 = 'cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; /etc/init.d/reboot' % getBoxVuModel() + cmd1 = 'cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; /etc/init.d/reboot' % getBoxVuModel() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -498,9 +487,7 @@ class StartImage(Screen): #VUPLUS ARM - Duo4k vu_mmcblk0p6.sh elif getCPUSoC() == '7278' or getBoxHostName() == 'vuduo4k' : - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxVuModel()) )) else: if getImageNeoBoot() == 'Flash': @@ -525,7 +512,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): cmd = 'dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/mmcblk0p6; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"' % getBoxVuModel() - cmd1 = 'cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; /etc/init.d/reboot' % getBoxVuModel() + cmd1 = 'cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; /etc/init.d/reboot' % getBoxVuModel() elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -540,9 +527,7 @@ class StartImage(Screen): def bootimageMIPS(self): #Miracle Box Ultra - MIPS osmini_dev_mtd2.sh if getCPUtype() != 'ARMv7' and getCPUSoC() == 'bcm7424' or getTunerModel() == 'ini-8000sv': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): self.myclose2(_('#############>>>>>>>>>\n\n\nError 2 - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) elif not fileExists('/usr/sbin/nandwrite' ): self.myclose2(_('#############>>>>>>>>>\n\n\nError 3 - w lokalizacji /usr/sbin/ \nnie odnaleziono pliku nandwrite\nmusisz zainstalowac dodatkowe pakiety ')) @@ -565,7 +550,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): - cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; cp -Rf /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; reboot -f' % (getBoxHostName(), getBoxHostName()) + cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; reboot -f' % (getBoxHostName(), getBoxHostName()) elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' @@ -574,9 +559,7 @@ class StartImage(Screen): #Edision OS MINI - MIPS osmini_dev_mtd0.sh elif getCPUtype() != 'ARMv7' and getCPUSoC() == 'BCM7362' or getBoxHostName() == 'osmini': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): self.myclose2(_('#############>>>>>>>>>\n\n\nError 2 - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) elif not fileExists('/usr/sbin/nandwrite' ): self.myclose2(_('#############>>>>>>>>>\n\n\nError 3 - w lokalizacji /usr/sbin/ \nnie odnaleziono pliku nandwrite\nmusisz zainstalowac dodatkowe pakiety ')) @@ -599,7 +582,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): - cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; cp -Rf /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; reboot -f' % (getBoxHostName(), getBoxHostName()) + cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; reboot -f' % (getBoxHostName(), getBoxHostName()) elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/osmini_dev_mtd0.sh' @@ -607,9 +590,7 @@ class StartImage(Screen): self.close() #VUPLUS MIPS vu_dev_mtd2.sh elif getCPUSoC() == '7356' or getCPUSoC() == '7429' or getCPUSoC() == '7424' or getCPUSoC() == '7241' or getCPUSoC() == '7362' or getBoxHostName() == 'vusolo2' or getBoxHostName() == 'vusolose' or getBoxHostName() == 'vuduo2' or getBoxHostName() == 'vuzero': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz' % ( getBoxVuModel()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz' % ( getBoxVuModel()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ' )) else: @@ -631,7 +612,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxVuModel())): - cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; cp -Rf /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; /etc/init.d/reboot' % (getBoxVuModel(), getBoxVuModel()) + cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; /etc/init.d/reboot' % (getBoxVuModel(), getBoxVuModel()) elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxVuModel())): cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_dev_mtd2.sh' @@ -640,9 +621,7 @@ class StartImage(Screen): #VUPLUS MIPS vu_dev_mtd1.sh elif getCPUSoC() == '7335' or getCPUSoC() == '7325' or getCPUSoC() == '7405' or getCPUSoC() == '7405(with 3D)' or getBoxHostName() == 'vuultimo' or getBoxHostName() == 'bm750' or getBoxHostName() == 'duo' or getBoxHostName() == 'vuuno' or getBoxHostName() == 'vusolo' or getBoxHostName() == 'vuduo': - if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz' % ( getBoxVuModel()) ): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz' % ( getBoxVuModel()) ): self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ' )) else: @@ -664,7 +643,7 @@ class StartImage(Screen): elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxVuModel())): - cmd = 'flash_eraseall /dev/mtd1; sleep 2; nandwrite -p /dev/mtd1 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; cp -Rf /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; /etc/init.d/reboot' % (getBoxVuModel(), getBoxVuModel()) + cmd = 'flash_eraseall /dev/mtd1; sleep 2; nandwrite -p /dev/mtd1 /media/neoboot/ImagesUpload/.kernel/%s.vmlinux.gz; /etc/init.d/reboot' % (getBoxVuModel(), getBoxVuModel()) elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxVuModel())): cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_dev_mtd1.sh' diff --git a/NeoBoot/stbinfo b/NeoBoot/stbinfo index 3e7e187..d6ebe2b 100644 --- a/NeoBoot/stbinfo +++ b/NeoBoot/stbinfo @@ -7,7 +7,7 @@ Ultimo4k : 7444s Solo4k : 7376 Zero 4K : 72604 Duo4k : 7278 #BCM7278 -Uno 4K : 7252s +Uno4K : 7252s Uno4kSE : 7252s Ultimo : 7405(with 3D) Uno : 7405(with 3D) @@ -30,7 +30,7 @@ Octagon Sf8008 : 3798mv200 Octagon SF4008 : bcm7251 Zgemma h7S : bcm7251s -Zgemma H9S : +Zgemma H9S : hi3798mv200 hostname: zgemmah9s; mtd6: 01000000 00020000 "kernel" ; mtd7: 0ea00000 00020000 "rootfs" AX HD60 4K : hi3798mv200 # cat /etc/hostname : ax60 @@ -39,3 +39,6 @@ OSmini : BCM7362 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 + + + \ No newline at end of file