update to 2.02.02.25

Factored ti-rtos-cc13xx-cc26xx dependency into a separate package. Remove patches: replaced by commands that do the editting. This way it will be easier to update, and also avoids storing huge patches in AUR repo.
author: redfish 2018-08-11 14:26:25 -0400
committer: redfish 2018-08-11 14:26:25 -0400
commit: fb54f7ec7d49bfb63868338923b8ca335e74be59 (patch)
tree: 4ed97b020ef3f6adf9213952e7a0cf37d33f119a
parent: 97888feceb9833d5183df911931bc7e12c437e60 (diff)
download: aur-fb54f7ec7d49bfb63868338923b8ca335e74be59.tar.gz
5 files changed, 159 insertions, 267 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 72da339a49b2..bc31bb792ed5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 # Generated by mksrcinfo v8
-# Wed May 30 16:54:07 UTC 2018
+# Sat Aug 11 18:25:52 UTC 2018
 pkgbase = ti-ble-sdk
 	pkgdesc = Texas Instruments BLE Stack for CC2640/CC2650/CC1350
-	pkgver = 2.02.01.18
+	pkgver = 2.02.02.25
 	pkgrel = 1
 	url = http://www.ti.com/tool/ble-stack
+	install = ti-ble-sdk.install
 	arch = x86_64
 	license = custom:LPRF
 	makedepends = wine
-	makedepends = wine-mono
-	makedepends = wine_gecko
 	depends = python2-lxml
+	depends = ti-rtos-cc13xx-cc26xx
 	optdepends = ccstudio
 	optdepends = ti-cgt-arm
 	options = !strip
@@ -19,14 +19,8 @@ pkgbase = ti-ble-sdk
 	options = emptydirs
 	options = !purge
 	options = !zipman
-	source = http://arch.alexeicolin.com:8080/ipfs/QmRqD824vXr3eEDKEUdRzefZ7UGZXrNjw2VmsSyhgRLiJm/ble_sdk_2_02_01_18_setup.exe
-	source = http://arch.alexeicolin.com:8080/ipfs/QmYfnTW3p4Pk2EybdUaKaemG2a9xQ5keCGbDSQhM4PzFM2/tirtos_cc13xx_cc26xx_setuplinux_2_20_01_08.bin
-	source = fix-paths-for-linux.patch.xz
-	source = fix-example-projects-import.patch
-	md5sums = 42e5194c59d0a6f097998d4e722cdf30
-	md5sums = 6202e939f974623448a48fa834f880aa
-	md5sums = 4412ee71f2f7c4959c625a47aa7c2549
-	md5sums = 0386ce22fe5884319e9c0de415d74b3c
+	source = http://camus:8080/ipfs/QmWzstCsjpLxkTvH3EtihPR2MQiFvcJohfXYVMdnz9YBjH/ble_sdk_2_02_02_25_setup.exe
+	sha256sums = 4dfc4e0b86b94ba2fd97b3774e52a10554351c5ffeb6a8fe138f25240e1322b6
 
 pkgname = ti-ble-sdk
 
diff --git a/PKGBUILD b/PKGBUILD
index 83665f94cafa..7faee9f88355 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer:  Alexei Colin <ac at alexeicolin dot com>
 
-# NOTE: GUI is needed to run this, because top-level installer
-# does not forward '--unattended" to the nested installers it
-# invokes, hence those installers generate a GUI box. Parent
-# installer fails if run headless.
+# NOTE: GUI is needed to run this, because top-level installer does not forward
+# '--unattended" to the nested installers it invokes, hence those installers
+# generate a GUI box. Parent installer fails if run headless.
 
 pkgname=ti-ble-sdk
 pkgver=2.02.02.25
+_pkgver=2_02_02_25
 pkgrel=1
 pkgdesc="Texas Instruments BLE Stack for CC2640/CC2650/CC1350"
 arch=('x86_64')
@@ -14,47 +14,27 @@ url="http://www.ti.com/tool/ble-stack"
 license=('custom:LPRF')
 
 makedepends=('wine')
-depends=('python2-lxml')
+depends=('python2-lxml' 'ti-rtos-cc13xx-cc26xx')
 optdepends=('ccstudio' 'ti-cgt-arm')
+install=$pkgname.install
 
-_bundle=ble_sdk_2_02_02_25
+_bundle=ble_sdk_${_pkgver}
 _installer=${_bundle}_setup.exe
 
 # Installer mirrored on IPFS
-#_ble_sdk_ipfs_hash=QmRqD824vXr3eEDKEUdRzefZ7UGZXrNjw2VmsSyhgRLiJm
-_ble_sdk_ipfs_hash=QmWzstCsjpLxkTvH3EtihPR2MQiFvcJohfXYVMdnz9YBjH
+_ipfs_hash=QmWzstCsjpLxkTvH3EtihPR2MQiFvcJohfXYVMdnz9YBjH
 
 # Alternatively, to download from TI, you need a download key, which
 # you can get by following the upstram link above and clicking through
 # _key=KS6V9FEICJSWPWYWAYHF6X6UQ542PAFS
 
-# This particular version of TI-RTOS is installed by this PKGBUILD
-# because the path patch applies to both of them.
-#_tirtos_installer=tirtos_cc13xx_cc26xx_setuplinux_2_20_01_08.bin
-#_tirtos_ipfs_hash=QmYfnTW3p4Pk2EybdUaKaemG2a9xQ5keCGbDSQhM4PzFM2
-_tirtos_installer=tirtos_cc13xx_cc26xx_setuplinux_2_21_01_08.bin
-_tirtos_ipfs_hash=QmXWp5HwPfawjchpvAmsfAn5553FCZYTXVwps3H29imABN
-
-
-# NOTE: patch is compressed because of AUR's 250KB limit
-
 source=(# Requires you to open webpage in browser to get download key
         #"http://software-dl.ti.com/download/lprf/${_key}/${_installer}"
         # Alternative source for same file that does not require key and does not 404 after updates
-        #"https://gateway.ipfs.io/ipfs/${_ble_sdk_ipfs_hash}/${_installer}"
+        #"https://gateway.ipfs.io/ipfs/${_ipfs_hash}/${_installer}"
         # Alternative source via a different IPFS gateway
-        #"http://ipfs.alexeicolin.com:8080/ipfs/${_ble_sdk_ipfs_hash}/${_installer}"
-        "http://camus:8080/ipfs/${_ble_sdk_ipfs_hash}/${_installer}"
-
-        #"http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_20_01_08/exports/${_tirtos_installer}"
-        # Alternative source for same file
-        #"https://gateway.ipfs.io/ipfs/${_tirtos_ipfs_hash}/${_tirtos_installer}"
-        # Alternative source via a different IPFS gateway
-        #"http://ipfs.alexeicolin.com:8080/ipfs/${_tirtos_ipfs_hash}/${_tirtos_installer}"
-        "http://camus:8080/ipfs/${_tirtos_ipfs_hash}/${_tirtos_installer}"
-
-        "fix-paths-for-linux.patch.xz"
-        "fix-example-projects-import.patch")
+        #"http://ipfs.alexeicolin.com:8080/ipfs/${_ipfs_hash}/${_installer}"
+        "http://camus:8080/ipfs/${_ipfs_hash}/${_installer}")
 
 options=(!strip libtool staticlibs emptydirs !purge !zipman)
 
@@ -66,45 +46,155 @@ _destdir=opt
 _installdir=installdir
 _installpath=$_installdir/$_destdir/$_ccsdir
 
-prepare() {
-    cd $srcdir
-}
-
 build() {
-	cd $srcdir
-
-    chmod +x ./${_tirtos_installer}
-    ./${_tirtos_installer} --mode unattended --prefix $srcdir/${_installpath}
+    cd $srcdir
 
-    echo ">>> Running Windows installer via wine. When prompted, CANCEL the install"
-    echo ">>> of TI RTOS. It will be installed automatically from Linux installer." 
+    echo ">>> Running Windows installer via wine. When prompted:"
+    echo ">>>    * CANCEL installation of Mono for .NET Framework (not needed)"
+    echo ">>>    * CANCEL installation of Gecko (not needed)"
+    echo ">>>    * CANCEL the install of TI RTOS (it was installed automatically as a package dependency)"
+    echo ">>>    * IGNORE error about dotNetFx"
 
     WINEPREFIX=$srcdir/$_winedir wine $srcdir/${_installer} \
         --mode unattended --prefix $srcdir/${_installpath} 1> wine.log 2>&1
+}
 
-    # Fix paths (case, etc), patch generated using, find cmd from the script:
-    # https://github.com/jcormier/TI_BLE_CC2650_Linux_Convert
-    #patch -p1 -d ${_installpath} < $srcdir/fix-paths-for-linux.patch
-    find ${_installpath}/${_bundle} -name "board\.h" | sed -e "p;s/board.h/Board.h/" | xargs -n2 mv
+_run() {
+    echo "$@"
+    "$@"
+}
 
-    # Patch that makes the example projects importable and buildable:
-    # * fixes dependency on the XDC and TI-RTOS products
-    # * fixes refs to files generated by 'stack' project from 'app' project
-    # * lets the imported copy build without it attempting to modify the source copy
-    #   (which is owned by root).
-    # TODO: currently, only cc2650lp/simple_broadcaster example is patched
-    #patch -p1 -d ${_installpath}/${_bundle} < $srcdir/fix-example-projects-import.patch
+# Credit: https://github.com/jcormier/TI_BLE_CC2650_Linux_Convert
+function _replace_text_in_ble_sdk {
+    _from="$1"
+    _to="$2"
+    shift
+    shift
+    echo -e "Changing $_from to $_to in all ble_sdk source files"
+    echo grep --exclude-dir=".git" --exclude=*.a "$@" -rl "$_from" "${_installpath}" \| xargs sed -i "s#$_from#$_to#g"
+         grep --exclude-dir=".git" --exclude=*.a "$@" -rl "$_from" "${_installpath}"  | xargs sed -i "s#$_from#$_to#g"
 }
 
 package() {
     cd $srcdir
 
+    # Fix paths (case, etc). Credit: https://github.com/jcormier/TI_BLE_CC2650_Linux_Convert
+
+    # There's an invalid linked location in ${_installpath}/examples/cc2650stk/sensortag_lcd/ccs/app/.project
+    # This is a best guess at what's intended.
+    #_replace_text_in_ble_sdk "SRC_COMMON/hal/src/target/_common/board.h" "SRC_EX/target/Board.h"
+
+    # Use Board.h consistently in the ble stack instead of a mixture of board.h and Board.h.
+    # The tirtos uses Board.h consistently so we'll assume that's correct.
+    _replace_text_in_ble_sdk "\\\"board\\.h" "\\\"Board.h"
+    _replace_text_in_ble_sdk "\\/board\\.h" "\\/Board.h"
+    #_replace_text_in_ble_sdk "<board\\.h" "<Board.h"
+
+    # We have to rename some files in the ble stack for this to work.
+    echo find ${_installpath} -name "board\.h" \| sed -e "p;s/board.h/Board.h/" \| xargs -n2 mv
+         find ${_installpath} -name "board\.h"  | sed -e "p;s/board.h/Board.h/"  | xargs -n2 mv
+
+    # Fix a few places where the include directives or references don't match the file's case.
+    _replace_text_in_ble_sdk "DisplayUART\\.h" "DisplayUart.h"
+    _replace_text_in_ble_sdk "DisplayUART\\.c" "DisplayUart.c"
+    _replace_text_in_ble_sdk "hal_UART\\.h" "hal_uart.h"
+    _replace_text_in_ble_sdk "ICall\\.h" "icall.h"
+    _replace_text_in_ble_sdk "OSAL\\.h" "osal.h"
+    _replace_text_in_ble_sdk "OSAL_Tasks\\.h" "osal_tasks.h"
+    _replace_text_in_ble_sdk "OSAL_Memory\\.h" "osal_memory.h"
+    _replace_text_in_ble_sdk "OSAL_Timers\\.h" "osal_timers.h"
+    _replace_text_in_ble_sdk "ti/drivers/rf/rf.h" "ti/drivers/rf/RF.h"
+    _replace_text_in_ble_sdk "sensorTag\\.h" "sensortag.h"
+    _replace_text_in_ble_sdk "sensortag_Display\\.h" "sensortag_display.h"
+    _replace_text_in_ble_sdk "npi_tl_SPI\\.c" "npi_tl_spi.c"
+    _replace_text_in_ble_sdk "npi_tl_SPI\\.h" "npi_tl_spi.h"
+    _replace_text_in_ble_sdk "npi_tl_UART\\.c" "npi_tl_uart.c"
+    _replace_text_in_ble_sdk "npi_tl_UART\\.h" "npi_tl_uart.h"
+    _replace_text_in_ble_sdk "bsp_SPI\\.c" "bsp_spi.c"
+    _replace_text_in_ble_sdk "bsp_SPI\\.h" "bsp_spi.h"
+
+    # The case of driverlib needs to be fixed in both the BLE SDK and the TIRTOS sources
+    _replace_text_in_ble_sdk "driverLib/timer.h" "driverlib/timer.h"
+    #_replace_text_in_tirtos "driverLib\\/timer.h" "driverlib\\/timer.h"
+
+    # Fix absolute Windows paths set for a default wine install by using paths relative to the imported project
+    _replace_text_in_ble_sdk "file:/C:/ti" "\$\{PARENT-6-ORG_PROJ_DIR\}"
+
+    # Some references are broken.  This might be caused by copying to the workspace when importing the projects.
+    #_replace_text_in_ble_sdk "PARENT-5-PROJECT_LOC/src/examples/sensortag" "SRC_EX/examples/sensortag"
+    #_replace_text_in_ble_sdk "PARENT-5-PROJECT_LOC/src/profiles/sensor_profile" "SRC_EX/profiles/sensor_profile"
+    #_replace_text_in_ble_sdk "PARENT-1-PROJECT_LOC/config/" "PARENT-2-ORG_PROJ_DIR/ccs/config/"
+
+    # Need forward slashes rather than backslashes in library paths.  One is wrong, all the others look OK.
+    #_replace_text_in_ble_sdk "\\\\rom\\\\enc_lib\\\\cc26xx_ecc_rom_api.a" "/rom/enc_lib/cc26xx_ecc_rom_api.a"
+
+    # Running the Windows lib_search executable under wine generates absolute paths with a Z: prefix, so run the python
+    # source directly.  Also change backslashes to forward slashes in the searchpath elements that this application uses.
+    _replace_text_in_ble_sdk "&quot;\\\${TOOLS_BLE}/lib_search/lib_search.exe" "python \\&quot;\\\${TOOLS_BLE}/lib_search/src/lib_search.py"
+    _replace_text_in_ble_sdk "\\\${TOOLS_BLE}/frontier/frontier.exe" "python \\\${TOOLS_BLE}/frontier\\/src/frontier.py"
+    _run sed -i "/searchpath/s/\\\\/\\//g"  ${_installpath}/${_bundle}/tools/lib_search/params_split_cc2640.xml
+    #_run sed -i "/searchpath/s/\\\\/\\//g"  ${_installpath}/${_bundle}/tools/lib_search/params_split_cc1350.xml
+
+    # Build hooks call python scripts using 'python x.py' command, but scripts are Python v2
+    _replace_text_in_ble_sdk "python " "python2 " --include ".cproject"
+
+    # Patch that makes the example projects importable and buildable:
+    # * lets the imported copy build without it attempting to modify the source copy
+    #   (which is owned by root).
+    # * fixes refs to files generated by 'stack' project from 'app' project
+
+    _replace_text_in_ble_sdk "PARENT-2-ORG_PROJ_DIR/ccs/config/lib_linker.cmd" "PROJECT_LOC/lib_linker.cmd" --include ".project"
+    _replace_text_in_ble_sdk "\${ORG_PROJ_DIR}[^\" ]\+lib_linker.cmd" "\${PROJECT_LOC}/lib_linker.cmd" --include ".cproject"
+
+    # This one fixes a cryptic error from XDC:
+    #   js: "/opt/ccstudio/xdctools_3_32_00_06_core/packages/xdc/template.xs",
+    #   line 55: TypeError: # xdc.services.intern.xsr.Value$Obj@a9b3b0c::xdc.runtime.Error is not a function, it is object.
+    _xdcmatch='<tool id="com.ti.rtsc.buildDefinitions.XDC_[0-9.]\+.tool.[0-9]\+" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_[0-9.]\+.tool">'
+    _xdcinsert='<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1282003423" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList"> ><listOptionValue builtIn="false" value="xdc.cfg.SourceDir.outputDir=&quot;.&quot;"/> ></option>'
+    for _f in $(find ${_installpath}/${_bundle}/examples -path '*ccs/app/.cproject')
+    do
+        _run sed -i "/$_xdcmatch/a $_xdcinsert" $_f
+    done
+
+    # There is a chicken-and-egg problem: stack project link command includes
+    # the .cmd file that is generated by a post-build step of the same stack
+    # project. Second issue is that in the original examples directory these
+    # files are stored outside of either project in a "shared" config/ dir. We
+    # need to copy the files into the stack project, and also change the paths
+    # to them in the .[c]project files, so that these files are copied when the
+    # project is imported into a workspace.
+
+    _autogened="ccs_linker_defines.cmd ccs_compiler_defines.bcfg"
+
+    for _f in $_autogened
+    do
+        for _e in $(find ${_installpath}/${_bundle}/examples -path '*ccs/stack/.project')
+        do
+            _run cp $(dirname $_e)/../config/$_f $(dirname $_e)
+        done
+    done
+
+    for _f in $_autogened lib_linker.cmd
+    do
+        for _e in $(find ${_installpath}/${_bundle}/examples -path '*ccs/stack/.cproject')
+        do
+            _run sed -i "s#\${ORG_PROJ_DIR}/../../ccs/config/$_f#\${PROJECT_LOC}/$_f#g" $_e
+        done
+        for _e in $(find ${_installpath}/${_bundle}/examples -path '*ccs/stack/.project')
+        do
+            _run sed -i "s#PARENT-2-ORG_PROJ_DIR/ccs/config/$_f#PROJECT_LOC/$_f#g" $_e
+        done
+        for _e in $(find ${_installpath}/${_bundle}/examples -path '*ccs/app/.project')
+        do
+            _board="$(echo $_e | cut -d '/' -f 6)"
+            _app="$(echo $_e | cut -d '/' -f 7)"
+            _run sed -i "s#PARENT-2-ORG_PROJ_DIR/ccs/config/$_f#PARENT-1-PROJECT_LOC/${_app}_${_board}_stack/$_f#g" $_e
+        done
+    done
+
     cp -al $srcdir/${_installdir}/${_destdir} $pkgdir
 
     install -D -m0644 $srcdir/${_installpath}/${_bundle}/license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha256sums=('4dfc4e0b86b94ba2fd97b3774e52a10554351c5ffeb6a8fe138f25240e1322b6'
-            '95f58837d98983bf24bf8717dc5e0ad1c8d132858f7a7fce1b263037f0e86872'
-            '6ebae9f55918381cb15a50a892a141fdcac2e094d2f372e56153a57cc07bff73'
-            '811146541ca17c0f3760a0dc405aa76d0cc67346e536aa020c415634dfd3acc3')
+sha256sums=('4dfc4e0b86b94ba2fd97b3774e52a10554351c5ffeb6a8fe138f25240e1322b6')
diff --git a/fix-example-projects-import.patch b/fix-example-projects-import.patch
deleted file mode 100644
index df9c91b87a85..000000000000
--- a/fix-example-projects-import.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/app/.cproject b/examples/cc2650lp/simple_broadcaster/ccs/app/.cproject
---- a/examples/cc2650lp/simple_broadcaster/ccs/app/.cproject	2016-10-26 18:19:42.000000000 -0400
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/app/.cproject	2017-06-22 22:38:41.612064759 -0400
-@@ -145,6 +145,13 @@
-               </tool>
-             </toolChain>
-           </folderInfo>
-+          <fileInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.16373365.1798262868.375553373" name="app_ble.cfg" rcbsApplicability="disable" resourcePath="TOOLS/app_ble.cfg" toolsToInvoke="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.806945027.1064045539">
-+            <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.806945027.1064045539" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.806945027">
-+              <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.609143556" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
-+                <listOptionValue builtIn="false" value="xdc.cfg.SourceDir.outputDir=&quot;.&quot;"/>
-+              </option>
-+            </tool>
-+          </fileInfo>
-           <sourceEntries>
-             <entry excluding="Startup/ccfg_app_ble_rcosc.c|Application/rcosc_calibration.c|cc26x0f128.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-           </sourceEntries>
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/app/.project b/examples/cc2650lp/simple_broadcaster/ccs/app/.project
---- a/examples/cc2650lp/simple_broadcaster/ccs/app/.project	2017-06-21 23:39:16.000000000 -0400
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/app/.project	2017-06-22 22:38:41.612064759 -0400
-@@ -269,12 +259,12 @@
-     <link>
-       <name>TOOLS/ccs_compiler_defines.bcfg</name>
-       <type>1</type>
--      <locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_compiler_defines.bcfg</locationURI>
-+      <locationURI>STACK_PROJECT_ROOT/ccs_compiler_defines.bcfg</locationURI>
-     </link>
-     <link>
-       <name>TOOLS/ccs_linker_defines.cmd</name>
-       <type>1</type>
--      <locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_linker_defines.cmd</locationURI>
-+      <locationURI>STACK_PROJECT_ROOT/ccs_linker_defines.cmd</locationURI>
-     </link>
-     <link>
-       <name>Drivers/Display/Display.c</name>
-@@ -395,11 +395,11 @@
-   <variableList>
-     <variable>
-       <name>CC26XXWARE</name>
--      <value>${PARENT-7-ORG_PROJ_DIR}/tirtos_cc13xx_cc26xx_2_20_01_08/products/cc26xxware_2_24_02_17393</value>
-+      <value>${COM_TI_RTSC_TIRTOSCC13XX_CC26XX__CC26XXWARE}</value>
-     </variable>
-     <variable>
-       <name>ORG_PROJ_DIR</name>
-       <value>${PARENT-2-PROJECT_LOC}/iar/stack</value>
-     </variable>
-     <variable>
-       <name>ROM</name>
-@@ -418,8 +422,12 @@
-       <value>${PARENT-5-ORG_PROJ_DIR}/src</value>
-     </variable>
-+    <variable>
-+      <name>STACK_PROJECT_ROOT</name>
-+      <value>${WORKSPACE_LOC}/simple_broadcaster_cc2650lp_stack</value>
-+    </variable>
-     <variable>
-       <name>TI_RTOS_DRIVERS_BASE</name>
--      <value>${PARENT-7-ORG_PROJ_DIR}/tirtos_cc13xx_cc26xx_2_20_01_08/products/tidrivers_cc13xx_cc26xx_2_20_01_10/packages</value>
-+      <value>${COM_TI_RTSC_TIRTOSCC13XX_CC26XX__TIDRIVERS_CC13XX_CC26XX}/packages</value>
-     </variable>
-     <variable>
-       <name>TOOLS_BLE</name>
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_compiler_defines.bcfg b/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_compiler_defines.bcfg
---- a/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_compiler_defines.bcfg	1969-12-31 19:00:00.000000000 -0500
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_compiler_defines.bcfg	2017-06-22 23:10:22.572074505 -0400
-@@ -0,0 +1 @@
-+
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_linker_defines.cmd b/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_linker_defines.cmd
---- a/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_linker_defines.cmd	1969-12-31 19:00:00.000000000 -0500
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/stack/ccs_linker_defines.cmd	2017-06-22 23:10:18.352074483 -0400
-@@ -0,0 +1 @@
-+
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/stack/.cproject b/examples/cc2650lp/simple_broadcaster/ccs/stack/.cproject
---- a/examples/cc2650lp/simple_broadcaster/ccs/stack/.cproject	2017-06-21 23:39:16.000000000 -0400
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/stack/.cproject	2017-06-22 22:38:41.612064759 -0400
-@@ -12,7 +12,7 @@
-         </extensions>
-       </storageModule>
-       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
--        <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1375801446" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;python ${TOOLS_BLE}/frontier/src/frontier.py ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd " prebuildStep="python &quot;${TOOLS_BLE}/lib_search/src/lib_search.py&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
-+         <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1375801446" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;python2 ${TOOLS_BLE}/frontier/src/frontier.py ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${PROJECT_LOC}/ccs_compiler_defines.bcfg ${PROJECT_LOC}/ccs_linker_defines.cmd;" prebuildStep="python2 &quot;${TOOLS_BLE}/lib_search/src/lib_search.py&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib ${PROJECT_LOC}/lib_linker.cmd">
-           <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1375801446." name="/" resourcePath="">
-             <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain.674818852" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.472296000">
-               <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.306531906" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-@@ -22,8 +23,10 @@
-                 <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-                 <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
-                 <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=&quot;libc.a&quot;"/>
--                <listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
-+                <listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_stack.cmd;"/>
-                 <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
-+                <listOptionValue builtIn="false" value="PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.20.1.08;com.ti.rtsc.XDCtools:3.32.0.06_core;"/>
-+                <listOptionValue builtIn="false" value="PRODUCT_MACRO_IMPORTS={&quot;com.ti.rtsc.XDCtools&quot;:[&quot;${XDC_INCLUDE_PATH}&quot;,&quot;${XDC_LIBRARY_PATH}&quot;,&quot;${XDC_LIBRARIES}&quot;,&quot;${XDC_SYMBOLS}&quot;],&quot;com.ti.rtsc.TIRTOSCC13XX_CC26XX&quot;:[&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_INCLUDE_PATH}&quot;,&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARY_PATH}&quot;,&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARIES}&quot;,&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_SYMBOLS}&quot;]}"/>
-               </option>
-               <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.745158847" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="5.2.6" valueType="string"/>
-               <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug.1242608345" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug"/>
-@@ -36,6 +39,8 @@
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.2101033812" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.110729688" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH.870771499" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH" valueType="includePath">
-+                  <listOptionValue builtIn="false" value="&quot;${XDC_INCLUDE_PATH}&quot;"/>
-+                  <listOptionValue builtIn="false" value="&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_INCLUDE_PATH}&quot;"/>
-                   <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                   <listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_broadcaster/cc26xx/stack"/>
-                   <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-@@ -62,6 +67,8 @@
-                 </option>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.823895002" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE.976149874" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE" valueType="definedSymbols">
-+                  <listOptionValue builtIn="false" value="${XDC_SYMBOLS}"/>
-+                  <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_SYMBOLS}"/>
-                   <listOptionValue builtIn="false" value="CC26XX"/>
-                   <listOptionValue builtIn="false" value="CC26XXWARE"/>
-                   <listOptionValue builtIn="false" value="DATA="/>
-@@ -105,12 +112,15 @@
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE.1316655166" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE.600580680" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY.215409611" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY" valueType="libs">
-+                  <listOptionValue builtIn="false" value="${XDC_LIBRARIES}"/>
-+                  <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARIES}"/>
-                   <listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
--                  <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
-                   <listOptionValue builtIn="false" value="&quot;${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols&quot;"/>
-                   <listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-                 </option>
-                 <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH.548088130" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH" valueType="libPaths">
-+                  <listOptionValue builtIn="false" value="&quot;${XDC_LIBRARY_PATH}&quot;"/>
-+                  <listOptionValue builtIn="false" value="&quot;${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_LIBRARY_PATH}&quot;"/>
-                   <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-                   <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-                 </option>
-@@ -138,7 +138,7 @@
-             </toolChain>
-           </folderInfo>
-           <sourceEntries>
--            <entry excluding="cc26x0f128.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-+            <entry excluding="TOOLS/ccs_linker_defines.cmd|ccs_linker_defines.cmd|cc26x0f128.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-           </sourceEntries>
-         </configuration>
-       </storageModule>
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/stack/lib_linker.cmd b/examples/cc2650lp/simple_broadcaster/ccs/stack/lib_linker.cmd
---- a/examples/cc2650lp/simple_broadcaster/ccs/stack/lib_linker.cmd	1969-12-31 19:00:00.000000000 -0500
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/stack/lib_linker.cmd	2017-06-22 23:10:02.342074401 -0400
-@@ -0,0 +1 @@
-+
-diff -u -w -N -r a/examples/cc2650lp/simple_broadcaster/ccs/stack/.project b/examples/cc2650lp/simple_broadcaster/ccs/stack/.project
---- a/examples/cc2650lp/simple_broadcaster/ccs/stack/.project	2017-06-21 23:39:16.000000000 -0400
-+++ b/examples/cc2650lp/simple_broadcaster/ccs/stack/.project	2017-06-22 22:38:41.612064759 -0400
-@@ -143,7 +143,7 @@
- 		<link>
- 			<name>LIB/lib_linker.cmd</name>
- 			<type>1</type>
--			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/lib_linker.cmd</locationURI>
-+			<locationURI>$%7BPROJECT_LOC%7D/lib_linker.cmd</locationURI>
- 		</link>
- 		<link>
- 			<name>NPI/npi.c</name>
-@@ -288,12 +288,12 @@
- 		<link>
- 			<name>TOOLS/ccs_compiler_defines.bcfg</name>
- 			<type>1</type>
--			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_compiler_defines.bcfg</locationURI>
-+			<locationURI>$%7BPROJECT_LOC%7D/ccs_compiler_defines.bcfg</locationURI>
- 		</link>
- 		<link>
- 			<name>TOOLS/ccs_linker_defines.cmd</name>
- 			<type>1</type>
--			<locationURI>PARENT-2-ORG_PROJ_DIR/ccs/config/ccs_linker_defines.cmd</locationURI>
-+			<locationURI>$%7BPROJECT_LOC%7D/ccs_linker_defines.cmd</locationURI>
- 		</link>
- 		<link>
- 			<name>TOOLS/onboard.c</name>
-@@ -419,15 +419,15 @@
- 	<variableList>
- 		<variable>
- 			<name>BIOS_BASE</name>
--			<value>${PARENT-7-ORG_PROJ_DIR}/tirtos_cc13xx_cc26xx_2_20_01_08/products/bios_6_46_01_38/packages</value>
-+			<value>${COM_TI_RTSC_TIRTOSCC13XX_CC26XX__BIOS}/packages</value>
- 		</variable>
- 		<variable>
- 			<name>CC26XXWARE</name>
--			<value>${PARENT-7-ORG_PROJ_DIR}/tirtos_cc13xx_cc26xx_2_20_01_08/products/cc26xxware_2_24_02_17393</value>
-+			<value>${COM_TI_RTSC_TIRTOSCC13XX_CC26XX__CC26XXWARE}</value>
- 		</variable>
- 		<variable>
- 			<name>ORG_PROJ_DIR</name>
- 			<value>${PARENT-2-PROJECT_LOC}/iar/stack</value>
- 		</variable>
- 		<variable>
- 			<name>ROM</name>
-@@ -447,7 +451,7 @@
- 		</variable>
- 		<variable>
- 			<name>TI_RTOS_DRIVERS_BASE</name>
--			<value>${PARENT-7-ORG_PROJ_DIR}/tirtos_cc13xx_cc26xx_2_20_01_08/products/tidrivers_cc13xx_cc26xx_2_20_01_10/packages</value>
-+			<value>${COM_TI_RTSC_TIRTOSCC13XX_CC26XX__TIDRIVERS_CC13XX_CC26XX}/packages</value>
- 		</variable>
- 		<variable>
- 			<name>TOOLS_BLE</name>
diff --git a/fix-paths-for-linux.patch.xz b/fix-paths-for-linux.patch.xz
deleted file mode 100644
index 3db17353c1cb..000000000000
--- a/fix-paths-for-linux.patch.xz
+++ /dev/null
diff --git a/ti-ble-sdk.install b/ti-ble-sdk.install
new file mode 100644
index 000000000000..a1604dd9946b
--- /dev/null
+++ b/ti-ble-sdk.install
@@ -0,0 +1,7 @@
+post_install() {
+	echo ">>> Import example projects from within CCS from /opt/ccstudio/ble_sdk_*/examples"
+	echo ">>> When importing, select "Copy projects to workspace checkmark" in Import dialog"
+	echo ">>> First time after import Rebuild instead of Build, as a precaution"
+	echo ">>> Always build the *_stack project before building the *_app project"
+	echo ">>> Always flash the *_stack project before flashing the *_app project"
+}
author	redfish	2018-08-11 14:26:25 -0400
committer	redfish	2018-08-11 14:26:25 -0400
commit	fb54f7ec7d49bfb63868338923b8ca335e74be59 (patch)
tree	4ed97b020ef3f6adf9213952e7a0cf37d33f119a
parent	97888feceb9833d5183df911931bc7e12c437e60 (diff)
download	aur-fb54f7ec7d49bfb63868338923b8ca335e74be59.tar.gz