Browse Source

made all the necessary fixes and changes to get this working in 11.1 and updated the bootstrap again

Kevin Bradley 5 years ago
parent
commit
4ee1bdee77

+ 1 - 1
Meridian/Meridian/build_time

@@ -1 +1 @@
-Mon, 02 Jul 2018 22:49:21 -0700
+Thu, 05 Jul 2018 11:04:53 -0700

+ 12 - 2
Meridian/meridian.xcodeproj/project.pbxproj

@@ -71,6 +71,7 @@
 		325A25B820E89561001D1BAD /* topangadetect.m in Sources */ = {isa = PBXBuildFile; fileRef = 325A259D20E8952E001D1BAD /* topangadetect.m */; };
 		325A25B920E89561001D1BAD /* unliberios.c in Sources */ = {isa = PBXBuildFile; fileRef = 325A259E20E8952E001D1BAD /* unliberios.c */; };
 		325A25BA20E89561001D1BAD /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 325A25A020E8952E001D1BAD /* utils.c */; };
+		328CC34720EE91BE0071849C /* tar.gz in Resources */ = {isa = PBXBuildFile; fileRef = 328CC34620EE91BE0071849C /* tar.gz */; };
 		32E5EAF320E8AE7B00346489 /* ent.plist in Resources */ = {isa = PBXBuildFile; fileRef = 32E5EAF120E8AE7600346489 /* ent.plist */; };
 		32E5EAF420E8AE7D00346489 /* launchctl.gz in Resources */ = {isa = PBXBuildFile; fileRef = 32E5EAF220E8AE7600346489 /* launchctl.gz */; };
 		32E5EAF520E8AE8000346489 /* rm.gz in Resources */ = {isa = PBXBuildFile; fileRef = 32E5EAF020E8AE7600346489 /* rm.gz */; };
@@ -228,6 +229,7 @@
 		325A259F20E8952E001D1BAD /* unliberios.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = unliberios.h; sourceTree = "<group>"; };
 		325A25A020E8952E001D1BAD /* utils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
 		325A25A120E8952E001D1BAD /* utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		328CC34620EE91BE0071849C /* tar.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; name = tar.gz; path = meridianTV/electra/bootstrap/tar.gz; sourceTree = "<group>"; };
 		32E5EAEF20E8AC7B00346489 /* bgTemp.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = bgTemp.jpg; sourceTree = "<group>"; };
 		32E5EAF020E8AE7600346489 /* rm.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; name = rm.gz; path = bootstrap/rm.gz; sourceTree = "<group>"; };
 		32E5EAF120E8AE7600346489 /* ent.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = ent.plist; path = bootstrap/ent.plist; sourceTree = "<group>"; };
@@ -511,6 +513,7 @@
 		B514CC6D1FECD787005F4E6B = {
 			isa = PBXGroup;
 			children = (
+				328CC34620EE91BE0071849C /* tar.gz */,
 				B5F7CCCF204A29320051F4A7 /* LICENSE.md */,
 				B59532711FFE2B5000022CEE /* README.md */,
 				B52F29232051E33500F4EB57 /* Working_with_libjailbreak.md */,
@@ -799,6 +802,7 @@
 				320AFA8E20E215AD00859485 /* dpkgdb-base.tar in Resources */,
 				320AFA9320E215AD00859485 /* tar.tar in Resources */,
 				320AFA9120E215AD00859485 /* optional-base.tar in Resources */,
+				328CC34720EE91BE0071849C /* tar.gz in Resources */,
 				320AFA8D20E215AD00859485 /* cydia-base.tar in Resources */,
 				3252638F20E0B141003BD42A /* Assets.xcassets in Resources */,
 				32F27EB920EC6CFF00429B29 /* nitotv.deb in Resources */,
@@ -1010,7 +1014,10 @@
 				DEVELOPMENT_TEAM = 9EUFEA5U7G;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/meridianTV/",
+				);
 				GCC_NO_COMMON_BLOCKS = NO;
 				HEADER_SEARCH_PATHS = $SRCROOT/meridiantTV;
 				INFOPLIST_FILE = meridianTV/Info.plist;
@@ -1036,7 +1043,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 9EUFEA5U7G;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/meridianTV/",
+				);
 				GCC_NO_COMMON_BLOCKS = NO;
 				HEADER_SEARCH_PATHS = $SRCROOT/meridiantTV;
 				INFOPLIST_FILE = meridianTV/Info.plist;

BIN
Meridian/meridian.xcodeproj/project.xcworkspace/xcuserdata/kevinbradley.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
Meridian/meridian.xcodeproj/xcuserdata/kevinbradley.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>amfid.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>jailbreakd.xcscheme</key>
 		<dict>
@@ -27,7 +27,7 @@
 		<key>pspawn_hook.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

BIN
Meridian/meridianTV/basebinaries.tar


BIN
Meridian/meridianTV/bootstrap.tar.gz


BIN
Meridian/meridianTV/electra/bootstrap/tar.gz


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

@@ -48,7 +48,7 @@ void copy_basebinaries() {
     extractGz("rm","/electra/rm");
     chmod("/electra/rm", 0755);
     
-    posix_spawn(&pd, tar, NULL, NULL, (char **)&(const char*[]){ tar, "-xpf", progname("basebinaries.tar"), "-C", "/electra", NULL }, NULL);
+    posix_spawn(&pd, tar, NULL, NULL, (char **)&(const char*[]){ tar, "-xpvf", progname("basebinaries.tar"), "-C", "/electra", NULL }, NULL);
     waitpid(pd, NULL, 0);
     
     writeMessage("[bootstrapper] copied the required binaries into the right places\n");