Browse Source

Fixed codesigning on small binaries. Other minor fixes too

Jaywalker 6 years ago
parent
commit
b81e51470b
1 changed files with 8 additions and 11 deletions
  1. 8 11
      the_memo.sh

+ 8 - 11
the_memo.sh

@@ -199,7 +199,8 @@ codesign() {
 	#local var=$(ldid -S "$1");
 	if [ "$CODESIGN_TOOL" == "jtool" ]; then
 		createEntitlements
-		local avoid_signing_errors=$(jtool --sign platform --ent "$BUILD_ROOT/ent.plist" --inplace "$1")
+		jtool --sign platform --ent "$BUILD_ROOT/ent.plist" "$1"
+		sudo cp -X out.bin "$1"
 	elif [ "$CODESIGN_TOOL" == "ldid" ]; then
 		ldid -S "$1"
 	elif [ "$CODESIGN_TOOL" == "ldid2" ]; then
@@ -938,10 +939,6 @@ buildCoreutils() {
 
 	initDebStructure
 	make -j8 DESTDIR="$BUILD_ROOT/$WORKING_DIR/deb" install
-	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/cmp"
-	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/diff"
-	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/diff3"
-	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/sdiff"
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/["
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/base64"
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/bin/basename"
@@ -2924,7 +2921,7 @@ buildGpg() {
 	codesign "$SKEL_PREFIX/$ROOT_PREFIX/libexec/gpg-preset-passphrase"
 	codesign "$SKEL_PREFIX/$ROOT_PREFIX/libexec/gpg-protect-tool"
 	codesign "$SKEL_PREFIX/$ROOT_PREFIX/libexec/gpg-wks-client"
-	codesign "$SKEL_PREFIX/$ROOT_PREFIX/libexe/scdaemon"
+	codesign "$SKEL_PREFIX/$ROOT_PREFIX/libexec/scdaemon"
 
 	initDebStructure
 	make -j8 install DESTDIR="$BUILD_ROOT/$WORKING_DIR/deb/"
@@ -2945,7 +2942,7 @@ buildGpg() {
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/libexec/gpg-preset-passphrase"
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/libexec/gpg-protect-tool"
 	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/libexec/gpg-wks-client"
-	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/libexe/scdaemon"
+	codesign "$BUILD_ROOT/$WORKING_DIR/deb/$ROOT_PREFIX/libexec/scdaemon"
 
 	echo "Package: $PKG_NAME" >> "$BUILD_ROOT/$WORKING_DIR/deb/DEBIAN/control"
 	echo "Priority: required" >> "$BUILD_ROOT/$WORKING_DIR/deb/DEBIAN/control"
@@ -3350,12 +3347,12 @@ rm -rf "$SKEL_PREFIX/$ROOT_PREFIX/bin/ntbtls-config"
 # Still need to do this for debs, but oh well. We just won't use the yet :P
 sudo chown -R root:wheel "$SKEL_PREFIX/$ROOT_PREFIX"
 sudo chown root:admin "$SKEL_PREFIX/private"
-sudo chown root:admin "$SKEL_PREFIX/Applications"
-sudo chown -R root:wheel "$SKEL_PREFIX/Library"
+#sudo chown root:admin "$SKEL_PREFIX/Applications"
+#sudo chown -R root:wheel "$SKEL_PREFIX/Library"
 sudo chown -R root:wheel "$SKEL_PREFIX/private/etc"
 sudo chown -R root:wheel "$SKEL_PREFIX/private/var"
-sudo chmod 6755 "$SKEL_PREFIX/usr/bin/nitoHelper"
-sudo chmod 6755 "$SKEL_PREFIX/usr/bin/nitoUpdate"
+#sudo chmod 6755 "$SKEL_PREFIX/usr/bin/nitoHelper"
+#sudo chmod 6755 "$SKEL_PREFIX/usr/bin/nitoUpdate"
 rm -rf skel.tgz
 cd "$SKEL_PREFIX"
 #sudo tar cpz -P --exclude .DS_Store -f ../skel.tgz Applications usr private Library