diff --git a/NeoBoot/arm_run.py b/NeoBoot/arm_run.py index 8fbbe48..63d3005 100644 --- a/NeoBoot/arm_run.py +++ b/NeoBoot/arm_run.py @@ -120,6 +120,7 @@ class StartImage(Screen): 'sf4008', 'et1x000', 'dm920', + 'ax51', 'bcm7251s', 'h7', 'hi3798mv200' diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index e6897cc..faaa06c 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -152,8 +152,13 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Skopiowano kernel.bin STB-ARM DM920 4K."') +#arm Dreambox dm920 + elif getBoxHostName() == 'ax51': + os.system('mv ' + getNeoLocation() + 'ImagesUpload/hd51/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) + os.system('echo "Skopiowano kernel.bin STB-ARM AX 4K Box HD51 4K."') + #arm Ariva 4K Combo - elif getBoxHostName() == 'et1x000': #getCPUSoC() == 'bcm7251' or + elif getBoxHostName() == 'arivatwin': #getCPUSoC() == 'bcm7251' or os.system('mv ' + getNeoLocation() + 'ImagesUpload/e2/update/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) os.system('echo "Skopiowano kernel.bin STB-ARM Ariva 4K Combo."') diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 21b429f..7b7aad1 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -47,7 +47,7 @@ import time # warranty, use at YOUR own risk. PLUGINVERSION = '8.00' -UPDATEVERSION = '8.06' +UPDATEVERSION = '8.07' def Freespace(dev): statdev = os.statvfs(dev) @@ -605,7 +605,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() == 'dm920' or 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': + if getBoxHostName() == 'ax51' or getBoxHostName() == 'dm920' or 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') @@ -935,6 +935,11 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" if getBoxHostName == 'et1x000': #getCPUSoC() == 'bcm7251' or 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 == 'ax51': #getCPUSoC() == 'bcm7251s' or + 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 getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': @@ -1406,6 +1411,7 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" 'bcm7251', 'sf4008', 'et1x000', + 'ax51', 'dm920', 'bcm7251s', '7241', diff --git a/NeoBoot/unpack.py b/NeoBoot/unpack.py index ce12068..943ac3a 100644 --- a/NeoBoot/unpack.py +++ b/NeoBoot/unpack.py @@ -89,42 +89,11 @@ class InstallImage(Screen, ConfigListScreen): self.target = ConfigText(fixed_size=False) self.stopenigma = ConfigYesNo(default=False) self.CopyFiles = ConfigYesNo(default=True) - if getCPUtype() == 'ARMv7' and getCPUSoC() or getBoxHostName() == ['7444s', - '7376', - '7252s', - '7278', - '72604', - 'vuultimo4k' - 'vusolo4k', - 'vuuno4k', - 'vuuno4kse', - 'vuduo4k', - 'vuzero4k']: - self.CopyKernel = ConfigYesNo(default=True) - else: - self.CopyKernel = ConfigYesNo(default=False) + self.CopyKernel = ConfigYesNo(default=True) self.TvList = ConfigYesNo(default=False) self.Montowanie = ConfigYesNo(default=False) self.LanWlan = ConfigYesNo(default=False) - if getCPUtype() == 'ARMv7' and getCPUSoC() or getBoxHostName() == ['osmio4k', - 'ax60', - 'sf8008', - 'bcm7251', - 'sf4008', - 'et1x000', - 'dm920', - 'bcm7251s', - 'h7', - 'hi3798mv200' - 'zgemmah9s', - 'bcm7252s', - 'gbquad4k', - 'ustym4kpro', - '3798mv200' - 'dm900'] : - self.Sterowniki = ConfigYesNo(default=True) - else: - self.Sterowniki = ConfigYesNo(default=False) + self.Sterowniki = ConfigYesNo(default=False) self.InstallSettings = ConfigYesNo(default=False) self.ZipDelete = ConfigYesNo(default=False) self.RepairFTP = ConfigYesNo(default=False) @@ -133,7 +102,6 @@ class InstallImage(Screen, ConfigListScreen): self.BlackHole = ConfigYesNo(default=False) self.target.value = '' self.curselimage = '' - try: if self.curselimage != self.source.value: self.target.value = self.source.value[:-13]