From 96d78efb48c3220427ff936a00dd59b7b7cb5eeb Mon Sep 17 00:00:00 2001 From: Taejin Woo Date: Thu, 5 Nov 2015 13:46:40 +0900 Subject: [PATCH 2/8] Initial Release Change-Id: I2b63190e71e7918fbfd9ff85b6149df5b71349ca Signed-off-by: Taejin Woo --- AUTHORS | 3 + CMakeLists.txt | 9 ++ LICENSE | 204 +++++++++++++++++++++++++++++++++ NOTICE | 3 + packaging/bluetooth-firmware-sprd.spec | 59 ++++++++++ packaging/bluetooth-hci-device.service | 12 ++ packaging/bluetooth-hciattach@.service | 14 +++ scripts/CMakeLists.txt | 3 + scripts/bt-dev-end.sh | 18 +++ scripts/bt-dev-start-TM1.sh | 34 ++++++ scripts/bt-dev-start-sc6815.sh | 29 +++++ 11 files changed, 388 insertions(+) create mode 100644 AUTHORS create mode 100644 CMakeLists.txt create mode 100644 LICENSE create mode 100644 NOTICE create mode 100644 packaging/bluetooth-firmware-sprd.spec create mode 100644 packaging/bluetooth-hci-device.service create mode 100644 packaging/bluetooth-hciattach@.service create mode 100644 scripts/CMakeLists.txt create mode 100755 scripts/bt-dev-end.sh create mode 100644 scripts/bt-dev-start-TM1.sh create mode 100755 scripts/bt-dev-start-sc6815.sh diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..9edd545 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +JunYoung Kim +Chan-yeol Park +Hocheol Seo diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..d5a4426 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,9 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +FOREACH(flag ${package_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") + +ADD_SUBDIRECTORY(scripts) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a06208b --- /dev/null +++ b/LICENSE @@ -0,0 +1,204 @@ +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + + 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 b/NOTICE new file mode 100644 index 0000000..b616854 --- /dev/null +++ b/NOTICE @@ -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 terms and conditions. diff --git a/packaging/bluetooth-firmware-sprd.spec b/packaging/bluetooth-firmware-sprd.spec new file mode 100644 index 0000000..a33af48 --- /dev/null +++ b/packaging/bluetooth-firmware-sprd.spec @@ -0,0 +1,59 @@ +Name: bluetooth-firmware-sprd +Summary: firmware and tools for bluetooth +Version: 0.1.1 +Release: 0 +Group: TO_BE_FILLED +License: Apache-2.0 +Source0: bluetooth-firmware-sprd-%{version}.tar.gz +Source1: bluetooth-hciattach@.service +Source2: bluetooth-hci-device.service + +BuildRequires: cmake + +%if "%{?tizen_profile_name}" == "wearable" +ExcludeArch: %{arm} %ix86 x86_64 +%endif + +%if "%{?tizen_profile_name}"=="tv" +ExcludeArch: %{arm} %ix86 x86_64 +%endif + +%description +firmware and tools for bluetooth + +%package TM1 +Summary: TM1 firmware and tools for bluetooth +Group: TO_BE/FILLED + +%description TM1 +firmware and tools for bluetooth for TM1 + +%prep +%setup -q -n bluetooth-firmware-sprd-%{version} + +%build +export CFLAGS+=" -fpie -fvisibility=hidden" +export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" + +cmake ./ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPLUGIN_INSTALL_PREFIX=%{_prefix} +make %{?jobs:-j%jobs} + +%install +rm -rf %{buildroot} +%make_install + +install -D -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/bluetooth-hciattach@.service +install -D -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-device.service +install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/bluetooth-firmware-sprd-TM1 + +%post TM1 +rm -rf %{_prefix}/etc/bluetooth/bt-dev-start.sh +ln -s %{_prefix}/etc/bluetooth/bt-dev-start-TM1.sh %{_prefix}/etc/bluetooth/bt-dev-start.sh + +%files TM1 +%defattr(-,root,root,-) +%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-end.sh +%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start-TM1.sh +%{_datadir}/license/bluetooth-firmware-sprd-TM1 +%{_libdir}/systemd/system/bluetooth-hciattach@.service +%{_libdir}/systemd/system/bluetooth-hci-device.service diff --git a/packaging/bluetooth-hci-device.service b/packaging/bluetooth-hci-device.service new file mode 100644 index 0000000..e340bc3 --- /dev/null +++ b/packaging/bluetooth-hci-device.service @@ -0,0 +1,12 @@ +[Unit] +Description=hciattach service for SPRD BT/FM requested +StopWhenUnneeded=yes + +[Service] +Type=oneshot +SmackProcessLabel=systemd::script::bt_firmware +ExecStart=/usr/etc/bluetooth/bt-dev-start.sh +ExecStop=/usr/etc/bluetooth/bt-dev-end.sh +RemainAfterExit=yes +StandardOutput=journal+console +StandardError=inherit diff --git a/packaging/bluetooth-hciattach@.service b/packaging/bluetooth-hciattach@.service new file mode 100644 index 0000000..ce8bb0d --- /dev/null +++ b/packaging/bluetooth-hciattach@.service @@ -0,0 +1,14 @@ +[Unit] +Description=hciattach service requested by %I +Requires=bluetooth-hci-device.service +After=bluetooth-hci-device.service + +[Service] +Type=oneshot +SmackProcessLabel=systemd::script::bt_firmware +ExecStartPre=-/bin/mkdir -p /run/bluetooth/ +ExecStart=/bin/touch /run/bluetooth/%I +ExecStop=/bin/rm /run/bluetooth/%I +RemainAfterExit=yes +StandardOutput=journal+console +StandardError=inherit diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt new file mode 100644 index 0000000..c04b688 --- /dev/null +++ b/scripts/CMakeLists.txt @@ -0,0 +1,3 @@ +# install firmware +INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-end.sh DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth) +INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-start-TM1.sh DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth) diff --git a/scripts/bt-dev-end.sh b/scripts/bt-dev-end.sh new file mode 100755 index 0000000..761e47a --- /dev/null +++ b/scripts/bt-dev-end.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# +# Script for stopping Broadcom UART Bluetooth stack +# + +PGREP="/usr/bin/pgrep" + +# Device down +/usr/bin/hciconfig hci0 down + +# Turn off Bluetooth Chip +/usr/sbin/rfkill block bluetooth + +#/usr/bin/killall hciattach +# Do NOT use killall due to smack +hciattach_pid=`${PGREP} hciattach` +kill $hciattach_pid diff --git a/scripts/bt-dev-start-TM1.sh b/scripts/bt-dev-start-TM1.sh new file mode 100644 index 0000000..a6c84c7 --- /dev/null +++ b/scripts/bt-dev-start-TM1.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +BT_UART_DEVICE=/dev/ttyS0 +BT_CHIP_TYPE=sprd + +HCI_CONFIG=/usr/bin/hciconfig +HCI_ATTACH=/usr/bin/hciattach + +UART_SPEED=3000000 + +echo "Check for Bluetooth device status" +if (${HCI_CONFIG} | grep hci); then + echo "Bluetooth device is UP" + ${HCI_CONFIG} hci0 up + exit 1 +fi + +/usr/sbin/rfkill unblock bluetooth + +echo "Bluetooth device is DOWN" +echo "Registering Bluetooth device" + +echo " Attaching device" +if (${HCI_ATTACH} -s $UART_SPEED $BT_UART_DEVICE $BT_CHIP_TYPE $UART_SPEED flow); then + /bin/sleep 0.1 + echo "HCIATTACH success" +else + echo "HCIATTACH failed" + /usr/sbin/rfkill block bluetooth + /bin/cp /var/log/messages /var/lib/bluetooth/ +fi + +#/usr/sbin/hciconfig hci0 down + diff --git a/scripts/bt-dev-start-sc6815.sh b/scripts/bt-dev-start-sc6815.sh new file mode 100755 index 0000000..061f422 --- /dev/null +++ b/scripts/bt-dev-start-sc6815.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# +# Script for registering Broadcom UART BT device +# +BT_UART_DEVICE=/dev/sttybt0 +BT_CHIP_TYPE=sprd + +BT_ADDR=/csa/bluetooth/.bd_addr + +UART_SPEED=115200 + +/usr/sbin/rfkill unblock bluetooth + +echo "Bluetooth device is DOWN" +echo "Registering Bluetooth device" + +echo " Attaching device" +if (/usr/bin/hciattach -s $UART_SPEED $BT_UART_DEVICE $BT_CHIP_TYPE); then + /bin/sleep 0.1 + echo "HCIATTACH success" +else + echo "HCIATTACH failed" + /usr/sbin/rfkill block bluetooth + /bin/cp /var/log/messages /var/lib/bluetooth/ +fi + +#/usr/sbin/hciconfig hci0 down + -- 2.7.4 From ac444534655a54aed03e45045ccfbdd6e30e1728 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorek Date: Fri, 27 May 2016 14:57:23 +0200 Subject: [PATCH 3/8] Provide virtual package bluetooth-scripts This patch allows "bluetooth-firmware-sprd*" packages to be used when "bluetooth-scripts" package is required as a dependency. Virtual package "bluetooth-scripts" was introduced to resolve file conflict between this project and "bluetooth-tools". Change-Id: If5868e6fceecdf7fe258e230fc66fdfc4cb29aaf Signed-off-by: Pawel Wieczorek --- packaging/bluetooth-firmware-sprd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/bluetooth-firmware-sprd.spec b/packaging/bluetooth-firmware-sprd.spec index a33af48..dd6b86d 100644 --- a/packaging/bluetooth-firmware-sprd.spec +++ b/packaging/bluetooth-firmware-sprd.spec @@ -24,6 +24,7 @@ firmware and tools for bluetooth %package TM1 Summary: TM1 firmware and tools for bluetooth Group: TO_BE/FILLED +Provides: bluetooth-scripts %description TM1 firmware and tools for bluetooth for TM1 -- 2.7.4 From 29c93f443d87e88075145ee6673436fffd2efd85 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 28 Jun 2016 20:13:35 +0900 Subject: [PATCH 4/8] Add the default path in the script file Change-Id: I60c1f868dd9385d616ce386b3024b8562a2bfb7e Signed-off-by: DoHyun Pyun --- scripts/bt-dev-end.sh | 1 + scripts/bt-dev-start-TM1.sh | 1 + scripts/bt-dev-start-sc6815.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/bt-dev-end.sh b/scripts/bt-dev-end.sh index 761e47a..cba7f07 100755 --- a/scripts/bt-dev-end.sh +++ b/scripts/bt-dev-end.sh @@ -1,4 +1,5 @@ #!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin # # Script for stopping Broadcom UART Bluetooth stack diff --git a/scripts/bt-dev-start-TM1.sh b/scripts/bt-dev-start-TM1.sh index a6c84c7..1a7118c 100644 --- a/scripts/bt-dev-start-TM1.sh +++ b/scripts/bt-dev-start-TM1.sh @@ -1,4 +1,5 @@ #!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin BT_UART_DEVICE=/dev/ttyS0 BT_CHIP_TYPE=sprd diff --git a/scripts/bt-dev-start-sc6815.sh b/scripts/bt-dev-start-sc6815.sh index 061f422..2980ace 100755 --- a/scripts/bt-dev-start-sc6815.sh +++ b/scripts/bt-dev-start-sc6815.sh @@ -1,4 +1,5 @@ #!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin # # Script for registering Broadcom UART BT device -- 2.7.4 From 66fef0209ea4de6aa3d020534ab8c903fe55a24a Mon Sep 17 00:00:00 2001 From: jooseong lee Date: Wed, 20 Jul 2016 19:52:14 +0900 Subject: [PATCH 5/8] Set the SMACK security label to run given executable file in systemd services Change-Id: I4cba64a05c3c14382b5eb78889dba566ac0bf9e8 Signed-off-by: jooseong lee --- packaging/bluetooth-hci-device.service | 2 +- packaging/bluetooth-hciattach@.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/bluetooth-hci-device.service b/packaging/bluetooth-hci-device.service index e340bc3..99b4888 100644 --- a/packaging/bluetooth-hci-device.service +++ b/packaging/bluetooth-hci-device.service @@ -4,7 +4,7 @@ StopWhenUnneeded=yes [Service] Type=oneshot -SmackProcessLabel=systemd::script::bt_firmware +SmackProcessLabel=System ExecStart=/usr/etc/bluetooth/bt-dev-start.sh ExecStop=/usr/etc/bluetooth/bt-dev-end.sh RemainAfterExit=yes diff --git a/packaging/bluetooth-hciattach@.service b/packaging/bluetooth-hciattach@.service index ce8bb0d..9d49d09 100644 --- a/packaging/bluetooth-hciattach@.service +++ b/packaging/bluetooth-hciattach@.service @@ -5,7 +5,7 @@ After=bluetooth-hci-device.service [Service] Type=oneshot -SmackProcessLabel=systemd::script::bt_firmware +SmackProcessLabel=System ExecStartPre=-/bin/mkdir -p /run/bluetooth/ ExecStart=/bin/touch /run/bluetooth/%I ExecStop=/bin/rm /run/bluetooth/%I -- 2.7.4 From a32b922a02b2ee8418036a2bb4b580d32331dde8 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Fri, 9 Sep 2016 02:33:42 +0000 Subject: [PATCH 6/8] Remove unnecessary profile dependencies from build spec If TV profile does not need this, update meta-tv.git and build project so that it does not include this package. If it already does not include this, the code being deleted is already a dead code that you did not need anyway. ps. Although this macro was not for public, the private should also try to update meta (yaml for ks) and build project to optimize build process. This approach is seriously distorted usage and has great potential of breaking later. Change-Id: I12d733abfe2b6bd9eb8f106b0eff45d09ae8371f Signed-off-by: MyungJoo Ham --- packaging/bluetooth-firmware-sprd.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packaging/bluetooth-firmware-sprd.spec b/packaging/bluetooth-firmware-sprd.spec index dd6b86d..bf3a15c 100644 --- a/packaging/bluetooth-firmware-sprd.spec +++ b/packaging/bluetooth-firmware-sprd.spec @@ -10,14 +10,6 @@ Source2: bluetooth-hci-device.service BuildRequires: cmake -%if "%{?tizen_profile_name}" == "wearable" -ExcludeArch: %{arm} %ix86 x86_64 -%endif - -%if "%{?tizen_profile_name}"=="tv" -ExcludeArch: %{arm} %ix86 x86_64 -%endif - %description firmware and tools for bluetooth -- 2.7.4 From b63e6fe31632830a7fa00dd70cdd8f905d7bbed5 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Thu, 15 Sep 2016 14:18:10 +0300 Subject: [PATCH 7/8] Fix the CXXFLAGS Without CXXFLAGS the cmake test produces ld: CMakeFiles/cmTryCompileExec3702791433.dir/testCXXCompiler.cxx.o: relocation R_X86_64_PC32 against undefined symbol `__asan_init' can not be used when making a shared object for certain builds (e.g. ASan) Change-Id: I60ee7d5cf542d0f44518a84aea8e12cd5263f248 Signed-off-by: Slava Barinov --- packaging/bluetooth-firmware-sprd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/bluetooth-firmware-sprd.spec b/packaging/bluetooth-firmware-sprd.spec index bf3a15c..f212fca 100644 --- a/packaging/bluetooth-firmware-sprd.spec +++ b/packaging/bluetooth-firmware-sprd.spec @@ -26,6 +26,7 @@ firmware and tools for bluetooth for TM1 %build export CFLAGS+=" -fpie -fvisibility=hidden" +export CXXFLAGS+=" -fpie -fvisibility=hidden" export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" cmake ./ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPLUGIN_INSTALL_PREFIX=%{_prefix} -- 2.7.4 From f0a2e4f21eda67196dd4f38d5adb127a6b330e43 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Mon, 27 Mar 2017 16:29:59 +0900 Subject: [PATCH 8/8] Modify the install path for license file Change-Id: Ie3aa04e224b8c16dee6dac3ce8639bd16c85ebae Signed-off-by: DoHyun Pyun --- bluetooth-firmware-sprd.manifest | 5 +++++ packaging/bluetooth-firmware-sprd.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 bluetooth-firmware-sprd.manifest diff --git a/bluetooth-firmware-sprd.manifest b/bluetooth-firmware-sprd.manifest new file mode 100644 index 0000000..75b0fa5 --- /dev/null +++ b/bluetooth-firmware-sprd.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/bluetooth-firmware-sprd.spec b/packaging/bluetooth-firmware-sprd.spec index f212fca..a4476fc 100644 --- a/packaging/bluetooth-firmware-sprd.spec +++ b/packaging/bluetooth-firmware-sprd.spec @@ -38,16 +38,16 @@ rm -rf %{buildroot} install -D -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/bluetooth-hciattach@.service install -D -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/bluetooth-hci-device.service -install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/bluetooth-firmware-sprd-TM1 %post TM1 rm -rf %{_prefix}/etc/bluetooth/bt-dev-start.sh ln -s %{_prefix}/etc/bluetooth/bt-dev-start-TM1.sh %{_prefix}/etc/bluetooth/bt-dev-start.sh %files TM1 +%manifest %{name}.manifest +%license LICENSE %defattr(-,root,root,-) %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-end.sh %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start-TM1.sh -%{_datadir}/license/bluetooth-firmware-sprd-TM1 %{_libdir}/systemd/system/bluetooth-hciattach@.service %{_libdir}/systemd/system/bluetooth-hci-device.service -- 2.7.4