diff options
Diffstat (limited to 'tools/darwin')
| -rwxr-xr-x | tools/darwin/Support/Codesign.command | 11 | ||||
| -rw-r--r-- | tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in | 26 |
2 files changed, 7 insertions, 30 deletions
diff --git a/tools/darwin/Support/Codesign.command b/tools/darwin/Support/Codesign.command index 8772013e62..5c9ebce10c 100755 --- a/tools/darwin/Support/Codesign.command +++ b/tools/darwin/Support/Codesign.command @@ -7,16 +7,7 @@ LIST_BINARY_EXTENSIONS="dylib so 0 vis pvr app" GEN_ENTITLEMENTS="$NATIVEPREFIX/bin/gen_entitlements.py" IOS11_ENTITLEMENTS="$XBMC_DEPENDS/share/ios11_entitlements.xml" -LDID32="$NATIVEPREFIX/bin/ldid32" -LDID64="$NATIVEPREFIX/bin/ldid64" -LDID=${LDID32} - -if [ "${CURRENT_ARCH}" == "arm64" ] || [ "${CURRENT_ARCH}" == "aarch64" ]; then - LDID=${LDID64} - echo "using LDID64" -else - echo "using LDID32" -fi +LDID="$NATIVEPREFIX/bin/ldid" if [ ! -f ${GEN_ENTITLEMENTS} ]; then echo "error: $GEN_ENTITLEMENTS not found. Codesign won't work." diff --git a/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in b/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in index 23d654f1a5..b5d9e10dca 100644 --- a/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in +++ b/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in @@ -9,7 +9,6 @@ SWITCH=`echo $1 | tr [A-Z] [a-z]` DIRNAME=`dirname $0` DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms DSYM_FILENAME=@APP_NAME@.app.dSYM -ARM64=false PP_DEVICE=iOS if [ "@PLATFORM@" == "appletvos" ]; then PP_DEVICE=tvOS @@ -28,11 +27,6 @@ else exit 1 fi -# check if build is 64-bit -if [[ "$(lipo -info "$APP/@APP_NAME@" | awk '{print $NF}')" == "arm64" ]]; then - ARM64=true -fi - #copy bzip2 of dsym to xbmc-depends install dir if [ -d $DSYM ]; then if [ -d $DSYM_TARGET_DIR ]; then @@ -64,10 +58,7 @@ fi # customize revision string [ ! -z "$2" ] && REVISION="$2" -ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_@PLATFORM@-arm.deb - -# package identifier for arm64 -$ARM64 && ARCHIVE=${PACKAGE_ARM64}_${VERSION}-${REVISION}_@PLATFORM@-arm.deb +ARCHIVE=${PACKAGE_ARM64}_${VERSION}-${REVISION}_@PLATFORM@-arm.deb SIZE="$(du -s -k ${APP} | awk '{print $1}')" @@ -77,16 +68,11 @@ rm -rf $DIRNAME/$ARCHIVE # create debian control file. mkdir -p $DIRNAME/$PACKAGE/DEBIAN -if $ARM64; then - echo "Package: $PACKAGE_ARM64" > $DIRNAME/$PACKAGE/DEBIAN/control - echo "Name: @APP_NAME@-${PP_DEVICE} (64-bit)" >> $DIRNAME/$PACKAGE/DEBIAN/control - echo "Pre-Depends: cy+cpu.arm64" >> $DIRNAME/$PACKAGE/DEBIAN/control - echo "Conflicts: $PACKAGE" >> $DIRNAME/$PACKAGE/DEBIAN/control - echo "Replaces: $PACKAGE" >> $DIRNAME/$PACKAGE/DEBIAN/control -else - echo "Package: $PACKAGE" > $DIRNAME/$PACKAGE/DEBIAN/control - echo "Name: @APP_NAME@-${PP_DEVICE}" >> $DIRNAME/$PACKAGE/DEBIAN/control -fi +echo "Package: $PACKAGE_ARM64" > $DIRNAME/$PACKAGE/DEBIAN/control +echo "Name: @APP_NAME@-${PP_DEVICE} (64-bit)" >> $DIRNAME/$PACKAGE/DEBIAN/control +echo "Pre-Depends: cy+cpu.arm64" >> $DIRNAME/$PACKAGE/DEBIAN/control +echo "Conflicts: $PACKAGE" >> $DIRNAME/$PACKAGE/DEBIAN/control +echo "Replaces: $PACKAGE" >> $DIRNAME/$PACKAGE/DEBIAN/control echo "Priority: Extra" >> $DIRNAME/$PACKAGE/DEBIAN/control echo "Version: $VERSION-$REVISION" >> $DIRNAME/$PACKAGE/DEBIAN/control echo "Architecture: @CMAKE_SYSTEM_NAME@-@CPU@" >> $DIRNAME/$PACKAGE/DEBIAN/control |