From 36200ff31486525d21377f376a877eea9def815b Mon Sep 17 00:00:00 2001 From: "wansu.yoo" Date: Thu, 19 May 2016 13:32:44 +0900 Subject: [PATCH 2/4] Initial update model-config for artik This is new package for artik model-config. Change-Id: I850a06406a0b3e9ae9939747eec7548fe07669ec --- LICENSE.Apache-2.0 | 202 ++++++++++++++++++++++++++++++++++++++ NOTICE.APLv2 | 3 + model-config.manifest | 5 + model-config.xml | 197 +++++++++++++++++++++++++++++++++++++ packaging/model-config-artik.spec | 28 ++++++ 5 files changed, 435 insertions(+) create mode 100755 LICENSE.Apache-2.0 create mode 100755 NOTICE.APLv2 create mode 100755 model-config.manifest create mode 100755 model-config.xml create mode 100755 packaging/model-config-artik.spec diff --git a/LICENSE.Apache-2.0 b/LICENSE.Apache-2.0 new file mode 100755 index 0000000..d645695 --- /dev/null +++ b/LICENSE.Apache-2.0 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE.APLv2 b/NOTICE.APLv2 new file mode 100755 index 0000000..1c1a4d0 --- /dev/null +++ b/NOTICE.APLv2 @@ -0,0 +1,3 @@ +Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under Apache License, Version 2. +Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions. diff --git a/model-config.manifest b/model-config.manifest new file mode 100755 index 0000000..97e8c31 --- /dev/null +++ b/model-config.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/model-config.xml b/model-config.xml new file mode 100755 index 0000000..b6a46ab --- /dev/null +++ b/model-config.xml @@ -0,0 +1,197 @@ + + + + artik + Tizen + 3.0 + exynos + none + Tizen + false + false + false + true + false + false + true + true + false + false + false + false + false + false + false + true + false + true + false + true + false + false + none + false + true + false + false + false + false + false + false + false + false + true + true + 2 + false + true + true + true + true + true + true + true + true + true + false + false + false + false + false + false + false + false + false + false + true + true + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + true + true + false + false + true + false + false + true + false + false + false + true + true + false + true + false + false + false + false + false + true + 3.0 + false + 3.0 + common + false + 32 + true + true + 316 + 1280 + true + false + true + false + true + false + false + false + false + false + false + false + false + true + false + false + 1920 + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + false + false + true + false + false + false + false + false + true + false + false + false + false + false + false + false + false + true + 15 + 15 + 15 + 15 + + + + \ No newline at end of file diff --git a/packaging/model-config-artik.spec b/packaging/model-config-artik.spec new file mode 100755 index 0000000..5e1d726 --- /dev/null +++ b/packaging/model-config-artik.spec @@ -0,0 +1,28 @@ +%define debug_package %{nil} + +Name: model-config-artik +Summary: A Model configuration +Version: 0.0.1 +Release: 0 +Group: System/Configuration +License: Apache-2.0 +BuildArch: noarch +Source0: %{name}-%{version}.tar.gz + +%description +Model configuration data package + +%prep +%setup -q -n %{name}-%{version} + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_sysconfdir}/config +cp -f model-config.xml %{buildroot}%{_sysconfdir}/config/model-config.xml + +%files +%{_sysconfdir}/config/model-config.xml +%manifest model-config.manifest +%license LICENSE.Apache-2.0 -- 2.7.4 From def3cf4b52bdfa57d8a064cfab7a4ffa03ce87b9 Mon Sep 17 00:00:00 2001 From: taesubkim Date: Tue, 24 May 2016 09:24:46 +0900 Subject: [PATCH 3/4] Add wifi.tdls feature key Change-Id: I94c198a056ddf59674a446ff07b3ad8997645f95 Signed-off-by: Taesub Kim --- model-config.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model-config.xml b/model-config.xml index b6a46ab..9c97248 100755 --- a/model-config.xml +++ b/model-config.xml @@ -84,6 +84,7 @@ false false true + false true true false @@ -194,4 +195,4 @@ - \ No newline at end of file + -- 2.7.4 From fcfa73ed46572a986b194a46a97503581477ccdd Mon Sep 17 00:00:00 2001 From: "sung.goo.kim" Date: Thu, 9 Jun 2016 07:01:52 +0900 Subject: [PATCH 4/4] [ACR-635] Rename from iot.oic to iot.ocf Change-Id: I66ff34008ea8e485f2c1a0d605f6ae33796aa3f8 --- model-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model-config.xml b/model-config.xml index 9c97248..e269e69 100755 --- a/model-config.xml +++ b/model-config.xml @@ -31,7 +31,7 @@ false none false - true + true false false false -- 2.7.4