Upgrading architecture definitions.

git-svn-id: http://svn.telesphoreo.org/trunk@650 514c082c-b64e-11dc-b46d-3d985efe055d

4 files changed, 42 insertions, 23 deletions

diff --git a/arch/darwin-arm/firmware b/arch/darwin-arm/firmware
new file mode 100644
index 000000000..2915ef33b
--- /dev/null
+++ b/arch/darwin-arm/firmware
@@ -0,0 +1,12 @@
+iPhone1,1-1.0-1A543a
+iPhone1,1-1.0.1-1C25
+iPhone1,1-1.0.2-1C28
+iPhone1,1-1.1.1-3A109a
+iPhone1,1-1.1.2-3B48b
+iPhone1,1-1.1.3-4A93
+iPhone1,1-1.1.4-4A102
+iPod1,1-1.1-3A101a
+iPod1,1-1.1.1-3A110a
+iPod1,1-1.1.2-3B48b
+iPod1,1-1.1.3-4A93
+iPod1,1-1.1.4-4A102
diff --git a/arch/darwin-arm/strip b/arch/darwin-arm/strip
index 5a348dd4b..151f63b9d 100644
--- a/arch/darwin-arm/strip
+++ b/arch/darwin-arm/strip
@@ -1,4 +1,4 @@
-find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' \) -print0 | while read -r -d $'\0' bin; do
+find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
     case "$(file "${bin}")" in (\
         *': Mach-O fat file with '*([0-9])' architecture' |\
         *': Mach-O dynamically linked shared library acorn'\
diff --git a/arch/iphoneos-arm/firmware b/arch/iphoneos-arm/firmware
index 85dc22ddf..3618678d4 100644
--- a/arch/iphoneos-arm/firmware
+++ b/arch/iphoneos-arm/firmware
@@ -1,21 +1,24 @@
-iPhone1,1_1.2.0_5A147p
-iPhone1,1_1.2.0_5A225c
-iPhone1,1_2.0_5A240d
-iPhone1,1_2.0_5A274d
-iPhone1,1_2.0_5A308
-iPhone1,1_2.0_5A311
-iPhone1,1_2.0_5A331
-iPhone1,1_2.0_5A345
 iPhone1,1_2.0_5A347
-iPhone1,1_2.0.1_5B103
 iPhone1,2_2.0_5A347
-iPhone1,2_2.0.1_5B103
-iPod1,1_1.2.0_5A147p
-iPod1,1_1.2.0_5A225c
-iPod1,1_2.0_5A240d
-iPod1,1_2.0_5A274d
-iPod1,1_2.0_5A308
-iPod1,1_2.0_5A311
-iPod1,1_2.0_5A331
-iPod1,1_2.0_5A345
 iPod1,1_2.0_5A347
+iPhone1,1_2.0.1_5B108
+iPhone1,2_2.0.1_5B108
+iPod1,1_2.0.1_5B108
+iPhone1,1_2.0.2_5C1
+iPhone1,2_2.0.2_5C1
+iPod1,1_2.0.2_5C1
+iPhone1,1_2.1_5F136
+iPhone1,2_2.1_5F136
+iPod1,1_2.1_5F137
+iPhone1,1_2.2_5G77
+iPhone1,2_2.2_5G77
+iPod1,1_2.2_5G77
+iPhone1,1_2.2.1_5H11
+iPhone1,2_2.2.1_5H11
+iPod1,1_2.2.1_5H11
+iPod2,1_2.2.1_5H11a
+iPhone1,1_3.0_7A341
+iPhone1,2_3.0_7A341
+iPhone2,1_3.0_7A341
+iPod1,1_3.0_7A341
+iPod1,2_3.0_7A341
diff --git a/arch/iphoneos-arm/strip b/arch/iphoneos-arm/strip
index c3949ae3c..0c0fad136 100644
--- a/arch/iphoneos-arm/strip
+++ b/arch/iphoneos-arm/strip
@@ -1,12 +1,16 @@
-find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' \) -print0 | while read -r -d $'\0' bin; do
+find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
     case "$(file "${bin}")" in (\
         *': Mach-O fat file with '*([0-9])' architecture' |\
         *': '?(setuid )?(setgid )'Mach-O executable acorn' |\
-        *': Mach-O dynamically linked shared library acorn'\
+        *': Mach-O dynamically linked shared library acorn' |\
+        *': Mach-O bundle acorn'\
     );; (*) continue;; esac
 
     if arm-apple-darwin9-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
         continue; fi
-    CODESIGN_ALLOCATE=$(which arm-apple-darwin9-codesign_allocate) \
-        "${PKG_BASE}/util/ldid" -S "${bin}"
+    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
+        continue; fi
+
+    "${PKG_BASE}/util/ldid" -S "${bin}"
+        #"${PKG_BASE}/arch/iphoneos-arm/entitlement.xml" "${bin}"
 done