Merge branch 'develop' into opensrc

7 files changed, 40 insertions, 3 deletions

diff --git a/COPYING.BSD2 b/COPYING.BSD2
new file mode 100644
index 0000000..e220bd6
--- /dev/null
+++ b/COPYING.BSD2
@@ -0,0 +1,27 @@
+Copyright (c) 2015 - 2017 Samsung Electronics Co., Ltd.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+	 documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/package/changelog b/package/changelog
index defc6a0..9bb560d 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 1.1.5
+- add license
+== Kyoungwon Park <kw0712.park@samsung.com> 2017-09-01
+* 1.1.4
+- update version for new build environment
+== Munkyu Im <munkyu.im@samsung.com> 2017-05-12
 * 1.1.3
 - update version to sync up
 == Munkyu Im <munkyu.im@samsung.com> 2016-11-22
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 56514a9..5b7379b 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.1.3
+Version: 1.1.5
 Maintainer: Munkyu Im <munkyu.im@samsung.com>
 Source: emulator
 
diff --git a/src/tap/Info.plist b/src/tap/Info.plist
index bb9b03f..7e9b768 100644
--- a/src/tap/Info.plist
+++ b/src/tap/Info.plist
@@ -20,6 +20,8 @@
 	<string>@@CFBUNDLESIGNATURE@@</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>com.apple.kpi.mach</key>
diff --git a/src/tap/Makefile b/src/tap/Makefile
index b291349..6fc1e20 100644
--- a/src/tap/Makefile
+++ b/src/tap/Makefile
@@ -19,7 +19,7 @@ BUNDLE_SIGNATURE = ????
 BUNDLE_PACKAGETYPE = KEXT
 BUNDLE_VERSION = $(TAP_KEXT_VERSION)
 
-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
 CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
 	-nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
 	-arch x86_64 \
diff --git a/src/tun/Info.plist b/src/tun/Info.plist
index bb9b03f..7e9b768 100644
--- a/src/tun/Info.plist
+++ b/src/tun/Info.plist
@@ -20,6 +20,8 @@
 	<string>@@CFBUNDLESIGNATURE@@</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>com.apple.kpi.mach</key>
diff --git a/src/tun/Makefile b/src/tun/Makefile
index c51ab7f..4437dc0 100644
--- a/src/tun/Makefile
+++ b/src/tun/Makefile
@@ -20,7 +20,7 @@ BUNDLE_SIGNATURE = ????
 BUNDLE_PACKAGETYPE = KEXT
 BUNDLE_VERSION = $(TUN_KEXT_VERSION)
 
-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
 CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
 	-nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
 	-arch x86_64 \