Skip to content

Commit 9b5c09f

Browse files
committed
Implement new upstream search path configuration
* d/control: Build-Depend on libyaml-dev and pkgconf * d/rules: --with-config-base-dir=/usr/share/hexagon-dsp * d/p/open-shell-path: drop (no longer required) * Drop d/guess-dsp.sh (no longer required): - d/{a,c}dsprpcd.service: invoke without guess-dsp.sh - d/fastrpc-support.install: do not install guess-dsp.sh - d/guess-dsp.sh: remove - d/copyright: drop guess-dsp.sh licensing information This requires hexagon-dsp-binaries to provide configuration in /usr/share/hexagon-dsp/conf.d/, eg. /usr/share/hexagon-dsp/conf.d/00-hexagon-dsp-binaries.yaml, which will be done in src:hexagon-dsp-binaries. We do not yet know the packaging version where that change will take place so cannot add a versioned Depends easily. As this package isn't in the archive yet, it's not worth coordinating. Signed-off-by: Robie Basak <robie.basak@oss.qualcomm.com>
1 parent 613e5df commit 9b5c09f

File tree

9 files changed

+6
-243
lines changed

9 files changed

+6
-243
lines changed

debian/adsprpcd.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ User=fastrpc
77
Group=fastrpc
88
Restart=always
99
Type=exec
10-
ExecStart=/bin/sh -c '. /usr/share/fastrpc/guess-dsp.sh && /usr/sbin/adsprpcd'
10+
ExecStart=/usr/sbin/adsprpcd

debian/cdsprpcd.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ User=fastrpc
77
Group=fastrpc
88
Restart=always
99
Type=exec
10-
ExecStart=/bin/sh -c '. /usr/share/fastrpc/guess-dsp.sh && /usr/sbin/cdsprpcd'
10+
ExecStart=/usr/sbin/cdsprpcd

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Maintainer: Robie Basak <robie.basak@oss.qualcomm.com>
33
Standards-Version: 4.6.2
44
Section: misc
55
Priority: optional
6-
Build-Depends: debhelper-compat (= 13)
6+
Build-Depends: debhelper-compat (= 13), libyaml-dev, pkgconf
77
Homepage: https://github.com/qualcomm/fastrpc
88
Vcs-Git: https://github.com/qualcomm-linux/pkg-fastrpc -b debian/latest
99
Vcs-Browser: https://github.com/qualcomm-linux/pkg-fastrpc

debian/copyright

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,3 @@ License: BSD-1-Clause
5454
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
5555
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
5656
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
57-
58-
Files: debian/guess-dsp.sh
59-
Copyright: Copyright (c) 2021-2024 Linaro
60-
Comment: the source file declares SPDX MIT but doesn't include the license
61-
text. Since this matches the Expat license according to dep5, the Expat
62-
license text is used here.
63-
License: Expat
64-
Permission is hereby granted, free of charge, to any person obtaining
65-
a copy of this software and associated documentation files (the
66-
"Software"), to deal in the Software without restriction, including
67-
without limitation the rights to use, copy, modify, merge, publish,
68-
distribute, sublicense, and/or sell copies of the Software, and to
69-
permit persons to whom the Software is furnished to do so, subject to
70-
the following conditions:
71-
.
72-
The above copyright notice and this permission notice shall be included
73-
in all copies or substantial portions of the Software.
74-
.
75-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
76-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
77-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
78-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
79-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
80-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
81-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

debian/fastrpc-support.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
debian/adsprpcd.service usr/lib/systemd/system/
22
debian/cdsprpcd.service usr/lib/systemd/system/
3-
debian/guess-dsp.sh usr/share/fastrpc/
43
usr/bin/adsprpcd usr/sbin
54
usr/bin/cdsprpcd usr/sbin
65
usr/bin/sdsprpcd usr/sbin

debian/guess-dsp.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

debian/patches/open-shell-path

Lines changed: 0 additions & 169 deletions
This file was deleted.

debian/patches/series

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/rules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
%:
44
dh $@ --with autoreconf
55

6+
override_dh_auto_configure:
7+
dh_auto_configure -- --with-config-base-dir=/usr/share/hexagon-dsp
8+
69
override_dh_installsystemd:
710
dh_installsystemd -p fastrpc-support adsprpcd.service cdsprpcd.service
811

0 commit comments

Comments
 (0)