diff --git a/.github/workflows/pkg-pr-hook.yml b/.github/workflows/pkg-pr-hook.yml index c52b587..b176b60 100644 --- a/.github/workflows/pkg-pr-hook.yml +++ b/.github/workflows/pkg-pr-hook.yml @@ -5,6 +5,10 @@ on: branches: [ debian/*, qcom/** ] types: [ opened, synchronize, reopened, closed ] +concurrency: + group: pr-build-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + permissions: contents: read packages: read @@ -13,9 +17,9 @@ jobs: build: name: PR Build if: ${{ github.event.action != 'closed' || github.event.pull_request.merged == true }} - uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-build-reusable-workflow.yml@main + uses: qualcomm-linux/qli-ci/.github/workflows/pkg-build-reusable-workflow.yml@main with: - qcom-build-utils-ref: main + qli-ci-ref: main # PRE-MERGE: use the PR head branch (github.head_ref) # POST-MERGE: use the base branch name from the PR debian-ref: ${{ (github.event.action == 'closed' && github.event.pull_request.merged) && github.event.pull_request.base.ref || github.head_ref }} @@ -23,3 +27,4 @@ jobs: secrets: DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }} DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }} + DEB_PKG_BOT_CI_TOKEN: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }} diff --git a/debian/changelog b/debian/changelog index 235259d..42d5329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,35 @@ -fastrpc (1.0.7-1qli2~) UNRELEASED; urgency=medium +fastrpc (1.0.7-2qli1~) UNRELEASED; urgency=medium - * Unreleased changes + [ Robie Basak ] + * Merge changes from 1.0.7-2. Remaining changes: + - Cherry-pick 8dc6e21 to re-add fastrpc-tests package. + * d/gbp.conf: update debian-branch for qli branch prefix. -- Debusine Action Bot Thu, 27 Aug 2026 09:31:15 +0000 +fastrpc (1.0.7-2) unstable; urgency=medium + + * d/control: Build-Depends on dh-sequence-installsysusers, so that + dh_installsysusers generates the postinst snippet creating the + fastrpc system group; it is not run by default at debhelper compat + 13, and the group is required by the shipped udev rules to set the + ownership of the DSP device nodes. + - The build-dependency form is used rather than "dh --with + installsysusers" as the latter triggers a false positive + missing-build-dependency-for-dh-addon from lintian, which lacks + installsysusers in its list of debhelper-provided add-ons. + * d/control: drop the now unused adduser from fastrpc-support Depends; + the fastrpc group is created via systemd-sysusers, which is pulled + in through ${misc:Depends}. + * d/control: fastrpc-support Depends on acl, as the shipped udev rules + call setfacl to grant the fastrpc group access to the system DMA + heap. + * Add patch fix-hexagon-path with upstream fix from PR #387; fixes + lookup of non-machine specific Hexagon DSP files which were missing + a / separator. + + -- Loïc Minier Tue, 08 Sep 2026 21:51:19 +0200 + fastrpc (1.0.7-1qli1) forky; urgency=medium [ Robie Basak ] diff --git a/debian/control b/debian/control index b3389db..736fd0e 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Standards-Version: 4.6.2 Section: contrib/misc Build-Depends: debhelper-compat (= 13), + dh-sequence-installsysusers, libbsd-dev, libyaml-dev, pkgconf, @@ -43,7 +44,10 @@ Description: Qualcomm FastRPC - support daemons and udev rules . This package provides the necessary support daemons used to supply object code to the DSPs and the udev rules to make the DSPs available to users. -Depends: adduser, libfastrpc1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: acl, + libfastrpc1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Recommends: hexagon-dsp-binaries Package: fastrpc-tests diff --git a/debian/gbp.conf b/debian/gbp.conf index 17d382d..d40fb43 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,3 @@ [DEFAULT] -debian-branch = debian/latest +debian-branch = qli/debian/latest upstream-tag = upstream/v%(version)s diff --git a/debian/patches/fix-hexagon-path-separator b/debian/patches/fix-hexagon-path-separator new file mode 100644 index 0000000..53e8fff --- /dev/null +++ b/debian/patches/fix-hexagon-path-separator @@ -0,0 +1,23 @@ +Description: Add path separator in HEXAGON_LIBS_PATH_PREFIX + HEXAGON_LIBS_PATH_PREFIX concatenates CONFIG_BASE_DIR with "hexagon" + without a '/', so builds using --with-config-base-dir without a trailing + slash (including Debian's /usr/share/hexagon-dsp) produce a malformed + architecture-specific DSP search path such as + /usr/share/hexagon-dsphexagon/v73. +Author: Vinayak Katoch +Origin: upstream, https://github.com/qualcomm/fastrpc/pull/387/commits/6ae1bcc4af8350d8e29757864144fdea3380b259 +Bug: https://github.com/qualcomm/fastrpc/issues/386 +Forwarded: https://github.com/qualcomm/fastrpc/pull/387 +Last-Update: 2026-09-08 + +--- a/src/fastrpc_apps_user.c ++++ b/src/fastrpc_apps_user.c +@@ -77,7 +77,7 @@ + + #define VENDOR_DSP_LOCATION "/vendor/dsp/" + #define VENDOR_DOM_LOCATION "/vendor/dsp/xdsp/" +-#define HEXAGON_LIBS_PATH_PREFIX CONFIG_BASE_DIR "hexagon" ++#define HEXAGON_LIBS_PATH_PREFIX CONFIG_BASE_DIR "/hexagon" + + char DSP_LIBS_LOCATION[PATH_MAX] = DEFAULT_DSP_SEARCH_PATHS; + static char DSP_SEARCH_PATHS_CACHE[NUM_DOMAINS][PATH_MAX] = {{0}}; diff --git a/debian/patches/series b/debian/patches/series index f1623d3..c04043a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ udev-start-offline-dsp-remoteprocs +fix-hexagon-path-separator