dnrops
/
osxfuse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'support/osxfuse-3'

This commit is contained in:
Benjamin Fleischer 2017-09-11 23:06:00 +02:00
parent d0da545801 96fe134bd1
commit 40c02bc568
No known key found for this signature in database
GPG Key ID: 617A3461802608A1
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.d/targets/release.sh
View File

@ -85,7 +85,7 @@ function release_build
# Build distribution package
build_target_invoke distribution build -s 10.9 -d 10.9 -c Release \
--kext=10.9 --kext="10.10->10.9" --kext="10.11->10.9" --kext="10.12->10.9" --kext="10.13->10.9" \
--kext=10.9 --kext="10.10->10.9" --kext=10.11 --kext="10.12->10.11" --kext="10.13->10.11" \
--code-sign-identity="${BUILD_TARGET_OPTION_CODE_SIGN_IDENTITY}" \
--product-sign-identity="${BUILD_TARGET_OPTION_PRODUCT_SIGN_IDENTITY}"
common_die_on_error "Failed to build distribution package"
@ -315,7 +315,7 @@ EOF
/usr/bin/shasum -a 256 "${disk_image_name}" "${debug_archive_name}" > "${sha256_file_name}"
common_die_on_error "Failed to generate hash values for release"
/opt/local/bin/gpg2 --output "${sha256_file_name}.sig" --detach-sig "${sha256_file_name}" 1>&3 2>&4
/opt/local/bin/gpg --output "${sha256_file_name}.sig" --detach-sig "${sha256_file_name}" 1>&3 2>&4
common_die_on_error "Failed to sign file '${sha256_file_name}'"
popd > /dev/null 2>&1

4
common/fuse_param.h
View File

@ -31,6 +31,10 @@
#define M_OSXFUSE_ENABLE_XATTR 1
#define M_OSXFUSE_ENABLE_DSELECT 1
#if VERSION_MAJOR >= 15
#define M_OSXFUSE_ENABLE_VNODE_NOTIFY 1
#endif
#if M_OSXFUSE_ENABLE_UNSUPPORTED
#define M_OSXFUSE_ENABLE_EXCHANGE 1
#define M_OSXFUSE_ENABLE_INTERIM_FSNODE_LOCK 1

2
common/fuse_version.h
View File

@ -28,7 +28,7 @@
/* Version */
#define OSXFUSE_VERSION_LITERAL 3.6.3
#define OSXFUSE_VERSION_LITERAL 3.7.0
#define OSXFUSE_TIMESTAMP __DATE__ ", " __TIME__
#define OSXFUSE_VERSION FUSE_PP_STRINGIFY(OSXFUSE_VERSION_LITERAL)

2
framework

@ -1 +1 @@
Subproject commit 77897c16de4e4a5955e4d5afd663bb17a8898eba
Subproject commit e1df6439af94735b3eebba670c608887c61e9e68

2
fuse

@ -1 +1 @@
Subproject commit 606d03dffe1cdab1b1847eecb5aa63feec9793ac
Subproject commit 1cd72d7333ce84975470f5d865383422034baa7d

2
kext

@ -1 +1 @@
Subproject commit 4968128709af00ad1db0f0569ba812b40d52bf14
Subproject commit 534773bd3135f04b7f6fb801faa2f8991daf4a6b