NeoBoot/NeoBoot-9-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

update 9.2 - 9.03

Browse Source
This commit is contained in:
gutosie
2020-08-22 15:48:44 +03:00
committed by GitHub
parent eb55824c25
commit f944c63ca7
4 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NeoBoot/ex_init.py Normal file
View File

@@ -0,0 +1,6 @@
import sys, extract
if len(sys.argv) < 14:
pass
else:
extract.NEOBootMainEx(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11], sys.argv[12], sys.argv[13] , sys.argv[14])

30
NeoBoot/extract.py
View File

@@ -75,7 +75,7 @@ mediahome = media + '/ImageBoot/'
extensions_path = '/usr/lib/enigma2/python/Plugins/Extensions/' extensions_path = '/usr/lib/enigma2/python/Plugins/Extensions/'
dev_null = ' > /dev/null 2>&1' dev_null = ' > /dev/null 2>&1'
def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole): def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, LanWlan, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole):
media_target = mediahome + target media_target = mediahome + target
list_one = ['rm -r ' + media_target + dev_null, 'mkdir ' + media_target + dev_null, 'chmod -R 0777 ' + media_target] list_one = ['rm -r ' + media_target + dev_null, 'mkdir ' + media_target + dev_null, 'chmod -R 0777 ' + media_target]
for command in list_one: for command in list_one:
@@ -243,6 +243,31 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
rc = os.system(cmd) rc = os.system(cmd)
os.system('echo "Copied TV list..."') os.system('echo "Copied TV list..."')
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."')
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."')
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'):
cmd = 'cp -Rpf /etc/wpa_supplicant.wlan0.conf %s/ImageBoot/%s/etc/wpa_supplicant.wlan0.conf > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
if os.path.exists('/etc/network/interfaces'):
cmd = 'cp -r /etc/network/interfaces %s/ImageBoot/%s/etc/network/interfaces > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
if os.path.exists('/etc/wpa_supplicant.conf'):
cmd = 'cp -Rpf /etc/wpa_supplicant.conf %s/ImageBoot/%s/etc/wpa_supplicant.conf > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
if os.path.exists('/etc/resolv.conf'):
cmd = 'cp -Rpf /etc/resolv.conf %s/ImageBoot/%s/etc/resolv.conf > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
if os.path.exists('/etc/wl.conf.wlan3'):
cmd = 'cp -r /etc/wl.conf.wlan3 %s/ImageBoot/%s/etc/wl.conf.wlan3 > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
os.system('echo "Copied LAN-WLAN..."')
if Sterowniki == 'True': if Sterowniki == 'True':
if os.path.exists('%s/ImageBoot/%s/lib/modules' % (media, target)): if os.path.exists('%s/ImageBoot/%s/lib/modules' % (media, target)):
cmd = 'rm -r %s/ImageBoot/%s/lib/modules' % (media, target) cmd = 'rm -r %s/ImageBoot/%s/lib/modules' % (media, target)
@@ -679,7 +704,8 @@ def RemoveUnpackDirs():
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h10_READ.ME ' + getNeoLocation() + 'ImagesUpload/h10; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h10.txt ' + getNeoLocation() + 'ImagesUpload/h10') rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h10_READ.ME ' + getNeoLocation() + 'ImagesUpload/h10; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h10.txt ' + getNeoLocation() + 'ImagesUpload/h10')
rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h10') rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h10')
elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/uclan'): elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/uclan'):
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/uclan') if os.path.exists('' + getNeoLocation() + 'ImagesUpload/usb_update.bin'):
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/uclan')
rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/uclan') rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/uclan')
elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz'): elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz'):
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/apploader.bin ' + getNeoLocation() + 'ImagesUpload/beyonwiz') rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/apploader.bin ' + getNeoLocation() + 'ImagesUpload/beyonwiz')

26
NeoBoot/plugin.py
View File

@@ -50,8 +50,8 @@ if fileExists('/etc/vtiversion.info') and fileExists('/.multinfo'):
else: else:
from files.neoconsole import Console from files.neoconsole import Console
PLUGINVERSION = '9.01' PLUGINVERSION = '9.02'
UPDATEVERSION = '9.02' UPDATEVERSION = '9.03'
LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'
try: try:
@@ -541,7 +541,7 @@ class NeoBootInstallation(Screen):
os.system('opkg install mtd-utils-ubifs') 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 # ARM - OctagonSF4008 - DM900 - Zgemma h7S - Octagon sf 8008 - AX HD60 4K #gbquad4k arm , #osmio4k arm, #Zgemma h9 arm, #Zgemma h7S arm , #Octagon SF4008
if 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() == '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() == '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':
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') 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 #VUPLUS ARM
elif getCPUtype() == 'ARMv7' and getBoxHostName() != 'ustym4kpro': elif getCPUtype() == 'ARMv7' and getBoxHostName() != 'ustym4kpro':
@@ -586,16 +586,16 @@ class NeoBootInstallation(Screen):
# ARM - ustym4kpro # ARM - ustym4kpro
elif getBoxHostName() == 'ustym4kpro' and getCPUSoC() == '3798mv200': # elif getBoxHostName() == 'ustym4kpro' and getCPUSoC() == '3798mv200':
os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) ) # os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )
if fileExists('/tmp/findkerneldevice.py'): # if fileExists('/tmp/findkerneldevice.py'):
os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ') # os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ')
else: # else:
os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findustym.py ' + LinkNeoBoot + '/files/findkerneldevice.py') # os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findustym.py ' + LinkNeoBoot + '/files/findkerneldevice.py')
os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm') # os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm')
os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init') # os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init')
os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd') # os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd')
os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/ustym4kpro.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/ustym4kpro.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd') # os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/ustym4kpro.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/ustym4kpro.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd')
# MIPS # MIPS
elif getCPUtype() == 'MIPS': elif getCPUtype() == 'MIPS':

9
NeoBoot/unpack.py
View File

@@ -128,6 +128,7 @@ class InstallImage(Screen, ConfigListScreen):
self.CopyFiles = ConfigYesNo(default=True) self.CopyFiles = ConfigYesNo(default=True)
self.CopyKernel = ConfigYesNo(default=True) self.CopyKernel = ConfigYesNo(default=True)
self.TvList = ConfigYesNo(default=False) self.TvList = ConfigYesNo(default=False)
self.LanWlan = ConfigYesNo(default=False)
self.Sterowniki = ConfigYesNo(default=False) self.Sterowniki = ConfigYesNo(default=False)
self.InstallSettings = ConfigYesNo(default=False) self.InstallSettings = ConfigYesNo(default=False)
self.ZipDelete = ConfigYesNo(default=False) self.ZipDelete = ConfigYesNo(default=False)
@@ -169,7 +170,8 @@ class InstallImage(Screen, ConfigListScreen):
self.list.append(getConfigListEntry(_('Stop E2 processes during installation?'), self.stopenigma)) self.list.append(getConfigListEntry(_('Stop E2 processes during installation?'), self.stopenigma))
self.list.append(getConfigListEntry(_('Copy files from Flash to the installed image ?'), self.CopyFiles )) self.list.append(getConfigListEntry(_('Copy files from Flash to the installed image ?'), self.CopyFiles ))
self.list.append(getConfigListEntry(_('Copy the kernel of the installed system (recommended ?'), self.CopyKernel )) self.list.append(getConfigListEntry(_('Copy the kernel of the installed system (recommended ?'), self.CopyKernel ))
self.list.append(getConfigListEntry(_('Copy the channel list ?'), self.TvList)) self.list.append(getConfigListEntry(_('Copy the channel list ?'), self.TvList))
self.list.append(getConfigListEntry(_('Copy network settings LAN-WLAN ?'), self.LanWlan))
self.list.append(getConfigListEntry(_('Copy the drivers ? (Recommended only other image.)'), self.Sterowniki)) self.list.append(getConfigListEntry(_('Copy the drivers ? (Recommended only other image.)'), self.Sterowniki))
self.list.append(getConfigListEntry(_('Copy Settings to the new Image'), self.InstallSettings)) self.list.append(getConfigListEntry(_('Copy Settings to the new Image'), self.InstallSettings))
self.list.append(getConfigListEntry(_('Delete Image zip after Install ?'), self.ZipDelete)) self.list.append(getConfigListEntry(_('Delete Image zip after Install ?'), self.ZipDelete))
@@ -236,13 +238,14 @@ class InstallImage(Screen, ConfigListScreen):
message += _('Please, wait...\n') message += _('Please, wait...\n')
message += "'" message += "'"
cmd1 = 'python ' + pluginpath + '/ex_init.py' cmd1 = 'python ' + pluginpath + '/ex_init.py'
cmd = '%s %s %s %s %s %s %s %s %s %s %s %s %s %s ' % (cmd1, cmd = '%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s ' % (cmd1,
source, source,
target.replace(' ', '.'), target.replace(' ', '.'),
str(self.stopenigma.value), str(self.stopenigma.value),
str(self.CopyFiles.value), str(self.CopyFiles.value),
str(self.CopyKernel.value), str(self.CopyKernel.value),
str(self.TvList.value), str(self.TvList.value),
str(self.LanWlan.value),
str(self.Sterowniki.value), str(self.Sterowniki.value),
str(self.InstallSettings.value), str(self.InstallSettings.value),
str(self.ZipDelete.value), str(self.ZipDelete.value),