Browse Source

close to finalized bootstrap, made some changes to uicache and the bootstrapping process to enable auto launch of nitoTV

Kevin Bradley 5 years ago
parent
commit
5f2f3a64eb
34 changed files with 28 additions and 155 deletions
  1. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json
  2. 0 17
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json
  3. 0 16
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
  4. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json
  5. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json
  6. 1 0
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
  7. BIN
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/iconback.png
  8. 1 0
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
  9. BIN
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/front.png
  10. 0 16
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
  11. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json
  12. 0 17
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json
  13. 0 16
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
  14. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json
  15. 0 16
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
  16. 0 6
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json
  17. 3 3
      Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
  18. BIN
      Meridian/meridianTV/Assets.xcassets/DarkMap.imageset/DarkMap.png
  19. 2 0
      Meridian/meridianTV/Assets.xcassets/LaunchImage.launchimage/Contents.json
  20. 1 1
      Meridian/meridianTV/Assets.xcassets/DarkMap.imageset/Contents.json
  21. BIN
      Meridian/meridianTV/Assets.xcassets/front.imageset/front.png
  22. 3 1
      Meridian/meridianTV/ViewController.m
  23. BIN
      Meridian/meridianTV/bootstrap.tar.gz
  24. 5 5
      Meridian/meridianTV/electra/the fun part/bootstrap.c
  25. 5 4
      Meridian/meridianTV/electra_extras/sbinject/.theos/_/DEBIAN/control
  26. BIN
      Meridian/meridianTV/electra_extras/sbinject/.theos/_/usr/lib/TweakInject.dylib
  27. BIN
      Meridian/meridianTV/electra_extras/sbinject/.theos/fakeroot
  28. 1 1
      Meridian/meridianTV/electra_extras/sbinject/.theos/last_package
  29. BIN
      Meridian/meridianTV/electra_extras/sbinject/.theos/obj/appletv/debug/TweakInject.dylib
  30. BIN
      Meridian/meridianTV/electra_extras/sbinject/.theos/obj/appletv/debug/arm64/TweakInject.dylib
  31. 2 1
      Meridian/meridianTV/electra_extras/sbinject/Makefile
  32. 0 2
      Meridian/meridianTV/electra_extras/sbinject/SBInject.x
  33. 4 3
      Meridian/meridianTV/electra_extras/sbinject/control
  34. BIN
      Meridian/meridianTV/nitotv_2.2-11_appletvos-arm64.deb

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 17
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json

@@ -1,17 +0,0 @@
-{
-  "layers" : [
-    {
-      "filename" : "Front.imagestacklayer"
-    },
-    {
-      "filename" : "Middle.imagestacklayer"
-    },
-    {
-      "filename" : "Back.imagestacklayer"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 16
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "tv",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "tv",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 1 - 0
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "tv",
+      "filename" : "iconback.png",
       "scale" : "1x"
     },
     {

BIN
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/iconback.png


+ 1 - 0
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "tv",
+      "filename" : "front.png",
       "scale" : "1x"
     },
     {

BIN
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/front.png


+ 0 - 16
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "tv",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "tv",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 17
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json

@@ -1,17 +0,0 @@
-{
-  "layers" : [
-    {
-      "filename" : "Front.imagestacklayer"
-    },
-    {
-      "filename" : "Middle.imagestacklayer"
-    },
-    {
-      "filename" : "Back.imagestacklayer"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 16
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "tv",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "tv",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 16
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "tv",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "tv",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 0 - 6
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

+ 3 - 3
Meridian/meridianTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json

@@ -3,13 +3,13 @@
     {
       "size" : "1280x768",
       "idiom" : "tv",
-      "filename" : "App Icon - App Store.imagestack",
+      "filename" : "App Icon - Large.imagestack",
       "role" : "primary-app-icon"
     },
     {
       "size" : "400x240",
       "idiom" : "tv",
-      "filename" : "App Icon.imagestack",
+      "filename" : "App Icon - Small.imagestack",
       "role" : "primary-app-icon"
     },
     {
@@ -29,4 +29,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

BIN
Meridian/meridianTV/Assets.xcassets/DarkMap.imageset/DarkMap.png


+ 2 - 0
Meridian/meridianTV/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -3,6 +3,7 @@
     {
       "orientation" : "landscape",
       "idiom" : "tv",
+      "filename" : "launchImage.png",
       "extent" : "full-screen",
       "minimum-system-version" : "11.0",
       "scale" : "2x"
@@ -10,6 +11,7 @@
     {
       "orientation" : "landscape",
       "idiom" : "tv",
+      "filename" : "launchImage-1.png",
       "extent" : "full-screen",
       "minimum-system-version" : "9.0",
       "scale" : "1x"

+ 1 - 1
Meridian/meridianTV/Assets.xcassets/DarkMap.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "DarkMap.png",
+      "filename" : "front.png",
       "scale" : "1x"
     },
     {

BIN
Meridian/meridianTV/Assets.xcassets/front.imageset/front.png


+ 3 - 1
Meridian/meridianTV/ViewController.m

@@ -461,6 +461,8 @@ bool jailbreak_has_run = false;
     
     [self writeTextPlain:@"note: please click 'respring' to get this party started :) \n"];
     
+    
+    /*
      execprog("/bin/ps", (const char **)&(const char *[]) {
         "/bin/ps",
         "awwwx",
@@ -473,7 +475,7 @@ bool jailbreak_has_run = false;
         "/private/etc",
         NULL
     });
-    
+    */
     /*
     execprog("/bin/bash", (const char **)&(const char *[]) {
         "/bin/bash",

BIN
Meridian/meridianTV/bootstrap.tar.gz


+ 5 - 5
Meridian/meridianTV/electra/the fun part/bootstrap.c

@@ -77,8 +77,8 @@ void extract_bootstrap() {
     
     int bootstrapped = open("/.bootstrapped_electra", O_RDONLY);
     if (bootstrapped != -1) {
-        //close(bootstrapped);
-        //return post_bootstrap(false);
+        close(bootstrapped);
+        return post_bootstrap(false);
     }
     close(bootstrapped);
     
@@ -154,8 +154,8 @@ void post_bootstrap(const bool runUICache) {
     int rv = open("/var/lib/dpkg/available", O_RDWR|O_CREAT);
     close(rv);
     */
-    posix_spawn(&pd, "/bin/bash", NULL, NULL, (char **)&(const char*[]){ "bash", "/usr/libexec/nito/firmware.sh", NULL }, NULL);
-    waitpid(pd, NULL, 0);
+   
+    
     
     posix_spawn(&pd, "/bin/bash", NULL, NULL, (char **)&(const char*[]){ "bash", "/Library/dpkg/info/openssh.postinst", NULL }, NULL);
     waitpid(pd, NULL, 0);
@@ -179,7 +179,7 @@ void post_bootstrap(const bool runUICache) {
         "PS1=\\h:\\w \\u\\$ ",
         NULL
     };
-    posix_spawn(&pd, "/usr/bin/dpkg", NULL, NULL, (char **)&(const char*[]){ "dpkg", "-i", "--refuse-downgrade", progname("apt7-lib_0.7.25.3-16-coolstar_iphoneos-arm.deb"), NULL }, (char **)&myenviron);
+    posix_spawn(&pd, "/usr/bin/dpkg", NULL, NULL, (char **)&(const char*[]){ "dpkg", "-i", "--refuse-downgrade", progname("nitotv_2.2-11_appletvos-arm64.deb"), NULL }, (char **)&myenviron);
     waitpid(pd, NULL, 0);
     */
     

+ 5 - 4
Meridian/meridianTV/electra_extras/sbinject/.theos/_/DEBIAN/control

@@ -1,11 +1,12 @@
 Package: com.nito.tweakinject
+Priority: required
 Name: TweakInject
-Depends: 
+Pre-Depends: cy+model.appletv
+Depends: firmware (>= 10.0)
 Architecture: appletvos-arm64
 Description: A modified version of Coolstars TweakInject to work on tvOS
 Maintainer: Kevin Bradley
 Author: Kevin Bradley
-Section: System
-Tag: role::developer
-Version: 0.0.1-3
+Section: Utilities
+Version: 0.0.1-6
 Installed-Size: 92

BIN
Meridian/meridianTV/electra_extras/sbinject/.theos/_/usr/lib/TweakInject.dylib


BIN
Meridian/meridianTV/electra_extras/sbinject/.theos/fakeroot


+ 1 - 1
Meridian/meridianTV/electra_extras/sbinject/.theos/last_package

@@ -1 +1 @@
-./debs/com.nito.tweakinject_0.0.1-3_appletvos-arm64.deb
+./debs/com.nito.tweakinject_0.0.1-6_appletvos-arm64.deb

BIN
Meridian/meridianTV/electra_extras/sbinject/.theos/obj/appletv/debug/TweakInject.dylib


BIN
Meridian/meridianTV/electra_extras/sbinject/.theos/obj/appletv/debug/arm64/TweakInject.dylib


+ 2 - 1
Meridian/meridianTV/electra_extras/sbinject/Makefile

@@ -12,7 +12,8 @@ TweakInject_FILES = SBInject.x
 include $(THEOS_MAKE_PATH)/library.mk
 
 after-stage::
-	cd $(FW_STAGING_DIR)/usr/lib/ ; pwd ; ls -al ; ln -s TweakInject.dylib TweakLoader.dylib
+	echo $(FAKEROOT)
+	cd $(FW_STAGING_DIR)/usr/lib/ ; pwd ; ls -al ; ln -s TweakInject.dylib TweakLoader.dylib ; $(FAKEROOT) chown root:wheel TweakLoader.dylib
 
 	
 	

+ 0 - 2
Meridian/meridianTV/electra_extras/sbinject/SBInject.x

@@ -16,8 +16,6 @@ int proc_pidpath(pid_t pid, void *buffer, uint32_t buffersize);
 
 NSArray *sbinjectGenerateDylibList() {
 
-    HBLogInfo(@"### TEST LOG");
-
     NSString *processName = [[NSProcessInfo processInfo] processName];
     // launchctl, amfid you are special cases
     if ([processName isEqualToString:@"launchctl"]) {

+ 4 - 3
Meridian/meridianTV/electra_extras/sbinject/control

@@ -1,10 +1,11 @@
 Package: com.nito.tweakinject
+Priority: required
 Name: TweakInject
-Depends: 
+Pre-Depends: cy+model.appletv
+Depends: firmware (>= 10.0)
 Version: 0.0.1
 Architecture: appletvos-arm64
 Description: A modified version of Coolstars TweakInject to work on tvOS
 Maintainer: Kevin Bradley
 Author: Kevin Bradley
-Section: System
-Tag: role::developer
+Section: Utilities

BIN
Meridian/meridianTV/nitotv_2.2-11_appletvos-arm64.deb