Promotion to 1.0.2

Docs/conf_guideline.md

@@ -0,0 +1,94 @@
+📄 **YAML Configuration Usage Guide**
+
+---
+
+### 🔧 **Purpose**
+The YAML configuration file enables **fastrpc** to set machine-specific configurations at runtime. Each machine entry corresponds to a specific hardware platform.
+
+- fastrpc supports reading YAML configuration files from a particular directory. Users should ensure all configuration files are stored in that same directory.
+  - For Linux platforms: `/usr/share/qcom/conf.d/`
+- In case of multiple configuration files defining path for a single machine, the directory is parsed in lexicographical order and the latest one carrying the
+  machine path is picked.
+- **Machine Name**: Obtain the machine name for your platform from:
+  ```
+  /sys/firmware/devicetree/base/model
+  ```
+  (fastrpc uses same path for matching machine names)
+---
+### 📄 **Current Properties**
+- **DSP_LIBRARY_PATH**: Specifies the path to DSP binaries and resources for the Machine.
+---
+
+### 📁 **Format Guidelines**
+The configuration uses YAML format with the following structure:
+```
+machines:
+  "Machine Name":
+    DSP_LIBRARY_PATH: "/relative/path/to/dsp/binaries/"
+```
+
+**Key Points:**
+- The root element is `machines:`
+- Each machine name is a quoted string key under `machines:`
+- Properties are indented under each machine name
+- Use proper YAML indentation
+- Paths should be quoted strings
+
+---
+
+### ✅ **Example Configuration**
+```
+machines:
+  "Qualcomm Technologies, Inc. DB820c":
+    DSP_LIBRARY_PATH: "/apq8096/Qualcomm/db820c/"
+  "Thundercomm Dragonboard 845c":
+    DSP_LIBRARY_PATH: "/sdm845/Thundercomm/db845c/"
+```
+
+---
+
+### ⚠️ **Important Notes**
+- Do **not** modify machine names unless adding a new supported Machine.
+- Ensure `DSP_LIBRARY_PATH` values:
+  - Are enclosed in double quotes (`"..."`).
+  - Are **relative to `/usr/share/qcom/`**.
+- Follow YAML syntax rules:
+  - Use consistent indentation.
+  - Ensure proper spacing after colons (`: `).
+  - Quote strings containing special characters or spaces.
+  - Avoid tabs (use spaces only).
+- Maintain:
+  - Proper YAML structure and hierarchy.
+  - Consistent formatting across entries.
+- When adding new properties:
+  - Document their purpose **here**.
+  - Follow the same indentation pattern.
+- Do **not** create duplicate Machine entries.
+- Validate YAML syntax before deployment to avoid parsing errors.
+
+---
+
+### ➕ **Adding New Platforms**
+To add a new Machine, follow the existing YAML format:
+```
+machines:
+  "New Machine Name":
+    DSP_LIBRARY_PATH: "/new_machine/path/"
+```
+
+Ensure the new entry is properly indented under the `machines:` root element and follows YAML syntax conventions.
+
+---
+
+### 📝 **File Naming**
+Configuration files should use the `.yaml` or `.yml` extension and be placed in the designated configuration directory (`/usr/share/qcom/conf.d/` on Linux platforms).
+
+### ✅ Schema Validation
+To ensure the configuration file adheres to the required structure, validate it against the schema provided.
+
+Schema File Location:
+<ROOT>/Docs/schemas/fastrpc-config-schema.yaml
+
+Validation Command:
+Use Yamale for schema validation:
+yamale -s fastrpc-config-schema.yaml <yaml file>

Docs/schemas/fastrpc-config-schema.yaml

@@ -0,0 +1 @@
+machines: map(key=str(), value=map(DSP_LIBRARY_PATH=regex('^/.+/')))

ci/MACHINES.json

@@ -1,4 +1,20 @@
 {
-    "qcs9100-ride-r3": ["sa8775p-ride", "qcs9100-ride"],
-    "qcs8300-ride": ["qcs8300-ride", "qcs8300-ride"]
-}
+  "qcs6490-rb3gen2": {
+    "deviceTree": "qcs6490-rb3gen2",
+    "linuxFirmware": "qcs6490",
+    "lavaDeviceName": "qcs6490",
+    "hexDSPBinary": "qcm6490"
+  },
+  "qcs9100-ride-r3": {
+    "deviceTree": "qcs9100-ride-r3",
+    "linuxFirmware": "sa8775p",
+    "lavaDeviceName": "qcs9100-ride",
+    "hexDSPBinary": "sa8775p"
+  },
+  "qcs8300-ride": {
+    "deviceTree": "qcs8300-ride",
+    "linuxFirmware": "qcs8300",
+    "lavaDeviceName": "qcs8300-ride",
+    "hexDSPBinary": "qcs8300"
+  }
+}

configure.ac

@@ -43,6 +43,26 @@ AM_PROG_CC_C_O
 
 # Checks for library functions.
 
+# Enable pkg-config
+PKG_PROG_PKG_CONFIG
+
+# Check for libyaml only if not Android
+AS_IF([test "$compile_for_android" = no], [
+  PKG_CHECK_MODULES([YAML], [yaml-0.1], [],
+    [AC_MSG_ERROR([libyaml (yaml-0.1) is required but not found.])])
+  AC_SUBST(YAML_CFLAGS)
+  AC_SUBST(YAML_LIBS)
+])
+
+# Configure config base path option (--with-config-base-dir)
+AC_ARG_WITH([config-base-dir],
+  [AS_HELP_STRING([--with-config-base-dir=PATH],
+                  [Base directory for config files (default: /usr/share/qcom)])],
+  [config_base_dir="$withval"],
+  [config_base_dir="/usr/share/qcom/"])
+AC_MSG_NOTICE([Config base path: $config_base_dir])
+AC_SUBST([CONFIG_BASE_DIR], ["$config_base_dir"])
+
 AC_CONFIG_FILES([
 Makefile
 inc/Makefile

debian/adsprpcd.service

@@ -7,4 +7,4 @@ User=fastrpc
 Group=fastrpc
 Restart=always
 Type=exec
-ExecStart=/bin/sh -c '. /usr/share/fastrpc/guess-dsp.sh && /usr/sbin/adsprpcd'
+ExecStart=/usr/sbin/adsprpcd

debian/cdsprpcd.service

@@ -7,4 +7,4 @@ User=fastrpc
 Group=fastrpc
 Restart=always
 Type=exec
-ExecStart=/bin/sh -c '. /usr/share/fastrpc/guess-dsp.sh && /usr/sbin/cdsprpcd'
+ExecStart=/usr/sbin/cdsprpcd

debian/changelog

@@ -1,3 +1,20 @@
+fastrpc (1.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * d/p/dlopen-abi-version: drop (fixed upstream).
+  * d/gbp.conf: set upstream tag pattern.
+  * 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
+
+ -- Robie Basak <[email protected]>  Thu, 15 Jan 2026 19:58:21 +0000
+
 fastrpc (1.0.0-1) unstable; urgency=medium
 
   * Initial packaging. (Closes: #1116042)

debian/control

@@ -3,7 +3,7 @@ Maintainer: Robie Basak <[email protected]>
 Standards-Version: 4.6.2
 Section: misc
 Priority: optional
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13), libyaml-dev, pkgconf
 Homepage: https://github.com/qualcomm/fastrpc
 Vcs-Git: https://github.com/qualcomm-linux/pkg-fastrpc -b debian/latest
 Vcs-Browser: https://github.com/qualcomm-linux/pkg-fastrpc

debian/copyright

@@ -54,28 +54,3 @@ License: BSD-1-Clause
  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.
-
-Files: debian/guess-dsp.sh
-Copyright: Copyright (c) 2021-2024 Linaro
-Comment: the source file declares SPDX MIT but doesn't include the license
- text. Since this matches the Expat license according to dep5, the Expat
- license text is used here.
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

debian/fastrpc-support.install

@@ -1,6 +1,5 @@
 debian/adsprpcd.service usr/lib/systemd/system/
 debian/cdsprpcd.service usr/lib/systemd/system/
-debian/guess-dsp.sh usr/share/fastrpc/
 usr/bin/adsprpcd usr/sbin
 usr/bin/cdsprpcd usr/sbin
 usr/bin/sdsprpcd usr/sbin