| Index: apps/installer-nano2g/tools/geninstaller.py |
| — | — | @@ -39,16 +39,15 @@ |
| 40 | 40 | ("embiosldr", 4, 8, 0, "embiosldr-ipodnano2g.dfu"), \
|
| 41 | 41 | ("embios", 4, 10, 0, "embios-ipodnano2g.ucl")]
|
| 42 | 42 |
|
| 43 | | -firstinstfiles = [(2, "/iLoader/iLoader.cfg", "../iloader/themes/ipodnano2g-default/iLoader/iloader.cfg", 1), \
|
| | 43 | +firstinstfiles = [(2, "/iLoader/iLoader.cfg", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/iloader.cfg", 1), \
|
| 44 | 44 | (1, "/iLoader/theme", 1), \
|
| 45 | | - (2, "/iLoader/theme/backdrop.ucl", "../iloader/themes/ipodnano2g-default/iLoader/theme/backdrop.ucl", 2), \
|
| 46 | | - (2, "/iLoader/theme/menu.ucl", "../iloader/themes/ipodnano2g-default/iLoader/theme/menu.ucl", 2), \
|
| 47 | | - (2, "/iLoader/theme/booting.ucl", "../iloader/themes/ipodnano2g-default/iLoader/theme/booting.ucl", 2), \
|
| 48 | | - (2, "/iLoader/theme/rockbox.ucl", "../iloader/themes/ipodnano2g-default/iLoader/theme/rockbox.ucl", 2), \
|
| 49 | | - (2, "/iLoader/theme/apple.ucl", "../iloader/themes/ipodnano2g-default/iLoader/theme/apple.ucl", 2)]
|
| | 45 | + (2, "/iLoader/theme/backdrop.ucl", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/theme/backdrop.ucl", 2), \
|
| | 46 | + (2, "/iLoader/theme/menu.ucl", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/theme/menu.ucl", 2), \
|
| | 47 | + (2, "/iLoader/theme/booting.ucl", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/theme/booting.ucl", 2), \
|
| | 48 | + (2, "/iLoader/theme/rockbox.ucl", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/theme/rockbox.ucl", 2), \
|
| | 49 | + (2, "/iLoader/theme/apple.ucl", "../iloader/themes/ipodnano2g-default-fastboot/iLoader/theme/apple.ucl", 2)]
|
| 50 | 50 |
|
| 51 | | -commonfiles = [(2, "/iLoader/NORFlash.bak", -2, 10), \
|
| 52 | | - (2, "/iLoader/AppleOS.bin", -1, 30)]
|
| | 51 | +commonfiles = [(2, "/iLoader/AppleOS.bin", -1, 30)]
|
| 53 | 52 |
|
| 54 | 53 | if len(sys.argv) > 4 and sys.argv[4] != "-":
|
| 55 | 54 | pathlen = len(sys.argv[4])
|
| — | — | @@ -156,7 +155,7 @@ |
| 157 | 156 | statuscommon = statuscommon + f[3]
|
| 158 | 157 |
|
| 159 | 158 | script = flash + struct.pack("<IIII", 0, len(flash) + 16 + len(firstinstall), \
|
| 160 | | - statusfirst, statusfirst + statuscommon) \
|
| | 159 | + statusfirst, statuscommon) \
|
| 161 | 160 | + firstinstall + common + struct.pack("<I", 0)
|
| 162 | 161 | file = open(sys.argv[2], "wb")
|
| 163 | 162 | file.write(installer + script.ljust(scriptsize) + filedata)
|
| Index: apps/installer-classic/flashfiles |
| Property changes on: apps/installer-classic/flashfiles |
| ___________________________________________________________________ |
| Modified: svn:ignore |
| ## -5,3 +5,4 ## |
| 164 | 163 | iloader.cfg.ucl |
| 165 | 164 | iloader.embiosapp.ucl |
| 166 | 165 | umsboot-ipodclassic.ucl |
| | 166 | +uninstaller-classic.embiosapp.ucl |
| Index: apps/installer-classic/tools/geninstaller.py |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | (2, "/iLoader/iLoader.cfg", "../iloader/themes/ipodclassic-default/iLoader/iloader.cfg", 1), \
|
| 42 | 42 | (2, "/iLoader/theme.ucl", "../iloader/themes/ipodclassic-default/iLoader/theme.ucl", 2)]
|
| 43 | 43 |
|
| 44 | | -commonfiles = [(2, "/iLoader/NORFlash.bak", -2, 10)]
|
| | 44 | +commonfiles = [(2, "/iLoader/NORFlash.bak", -2, 3)]
|
| 45 | 45 |
|
| 46 | 46 | if len(sys.argv) > 4 and sys.argv[4] != "-":
|
| 47 | 47 | pathlen = len(sys.argv[4])
|
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | firstinstfiles.append((1, prefix + dir, 1))
|
| 53 | 53 | for f in d[2]:
|
| 54 | 54 | if not prefix.find("/.svn/") > -1:
|
| 55 | | - firstinstfiles.append((2, prefix + f, d[0] + "/" + f, os.path.getsize(d[0] + "/" + f) / 100000 + 1))
|
| | 55 | + firstinstfiles.append((2, prefix + f, d[0] + "/" + f, os.path.getsize(d[0] + "/" + f) / 500000 + 1))
|
| 56 | 56 |
|
| 57 | 57 | file = open(sys.argv[1], "rb")
|
| 58 | 58 | installer = file.read()
|
| — | — | @@ -139,7 +139,7 @@ |
| 140 | 140 | statuscommon = statuscommon + f[3]
|
| 141 | 141 |
|
| 142 | 142 | script = flash + struct.pack("<IIII", 0, len(flash) + 16 + len(firstinstall), \
|
| 143 | | - statusfirst, statusfirst + statuscommon) \
|
| | 143 | + statusfirst, statuscommon) \
|
| 144 | 144 | + firstinstall + common + struct.pack("<I", 0)
|
| 145 | 145 | file = open(sys.argv[2], "wb")
|
| 146 | 146 | file.write(installer + script.ljust(scriptsize, '\0') + filedata)
|
