From 330c0943672a521122d45f12e5a31feb72051248 Mon Sep 17 00:00:00 2001 From: Chinmay Patil Date: Fri, 18 Sep 2026 12:52:27 +0530 Subject: [PATCH 1/2] debian: align packaging with qli/debian/latest Move from the upstream.conf script-driven tarball fetch to the standard uscan-based packaging used on qli/debian/latest, so both branches share one build flow. * d/watch: new, adapted from qli/debian/latest with prebuilt_trixie retargeted to prebuilt_resolute. Verified with uscan against the live Artifactory instance: resolves camx-headers_1.1.0_arm64.tar.gz, and both downloadurlmangle and filenamemangle apply as expected. * upstream.conf: drop, superseded by d/watch. The pinned TAG=260712 was stale and required a manual edit for every refresh. * d/rules: drop override_dh_auto_install. The hand-copy referenced a data/ component that the upstream tarball does not contain; with 3.0 (quilt), dpkg-source strips the tarball's leading directory and dh_install handles the rest. Add maintainerclean. * d/libcamx-dev.install: repoint at libcamx-dev/arm64/usr/include, which is the layout the tarball actually ships once unpacked. * d/gbp.conf: new, with debian-branch and debian-tag set for this branch and its existing resolute/ tag convention. * d/README.source: new, documents that the upstream tarball's own changelog version must not be reused in d/changelog. * d/source/options, .gitignore: ignore the unpacked libcamx-dev/ tree. d/changelog is deliberately left untouched, as Debian and Ubuntu releases have diverged. d/control, d/copyright and d/source/format are also unchanged. Signed-off-by: Chinmay Patil --- .gitignore | 1 + debian/README.source | 8 ++++++++ debian/gbp.conf | 3 +++ debian/libcamx-dev.install | 4 ++-- debian/rules | 9 ++------- debian/source/options | 1 + debian/watch | 6 ++++++ upstream.conf | 4 ---- 8 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 .gitignore create mode 100644 debian/README.source create mode 100644 debian/gbp.conf create mode 100644 debian/watch delete mode 100644 upstream.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09c5c34 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +libcamx-dev/ diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..624d9da --- /dev/null +++ b/debian/README.source @@ -0,0 +1,8 @@ +Note that the changelog contained in the upstream tarball contains an +unreliable version that should not be reused in d/changelog; see: +https://github.com/qualcomm-linux/pkg-camx-dev/issues/8 + +The version to be used in d/changelog is the one that will come from the +upstream tarball name, and the content of the shipped +libcamx-dev/arm64/usr/share/doc/libcamx-dev/changelog.gz file should be +ignored. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..6d56da2 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch=qcom/ubuntu/resolute +debian-tag=resolute/%(version)s diff --git a/debian/libcamx-dev.install b/debian/libcamx-dev.install index 158db0f..cfc7e3b 100644 --- a/debian/libcamx-dev.install +++ b/debian/libcamx-dev.install @@ -1,2 +1,2 @@ -usr/include/camx-v1 usr/include -usr/include/camx-v2 usr/include +libcamx-dev/arm64/usr/include/camx-v1 usr/include +libcamx-dev/arm64/usr/include/camx-v2 usr/include diff --git a/debian/rules b/debian/rules index ca79c8e..ae088b4 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,5 @@ %: dh $@ -override_dh_auto_install: -ifeq ($(DEB_HOST_ARCH),arm64) - mkdir -p debian/tmp - cp -a data/libcamx-dev/arm64/* debian/tmp/ - rm -rf $(CURDIR)/debian/tmp/usr/share/doc -endif - : +maintainerclean: + rm -r libcamx-dev/ diff --git a/debian/source/options b/debian/source/options index 7f07968..34a86a0 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1,2 @@ extend-diff-ignore = ^\.github +extend-diff-ignore = ^\.gitignore diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..5dfd05f --- /dev/null +++ b/debian/watch @@ -0,0 +1,6 @@ +version=4 +opts=searchmode=plain,\ +downloadurlmangle=s%/api/storage/qsc_releases-cache/%/qsc_releases/%,\ +filenamemangle=s/camx-headers/camx-dev/; \ +https://qartifactory-edge.qualcomm.com/artifactory/api/search/artifact?name=camx-headers \ +https://qartifactory-edge.qualcomm.com/artifactory/api/storage/qsc_releases-cache/software/chip/component/camx\.qclinux\.0\.0/[\d.]+/prebuilt_resolute/camx-headers_@ANY_VERSION@_arm64.tar.gz diff --git a/upstream.conf b/upstream.conf deleted file mode 100644 index 9d5be18..0000000 --- a/upstream.conf +++ /dev/null @@ -1,4 +0,0 @@ -export ARTIFACTORY="https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0" -export TAG="260712" -export DISTRO="prebuilt_resolute" -export PACKAGE_NAME="camx-headers.tar.gz" From f807e717271c9349c9fb965aee7ca1030dd2c3fc Mon Sep 17 00:00:00 2001 From: Chinmay Patil Date: Fri, 18 Sep 2026 16:19:57 +0530 Subject: [PATCH 2/2] debian/changelog: bump to 1.1.1-1 for new upstream release Set the open UNRELEASED stanza to the version of the upstream tarball being packaged, replacing the 1.0.0-2~ placeholder. The suite is left as UNRELEASED for the Release workflow to substitute. Signed-off-by: Chinmay Patil --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd0c348..f193144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -camx-dev (1.0.0-2~) UNRELEASED; urgency=medium +camx-dev (1.1.1-1) UNRELEASED; urgency=medium - * WIP — update changelog before next release + * New upstream release - -- Qualcomm Camera Team Wed, 15 Jul 2026 17:50:11 +0000 + -- Qualcomm Camera Team Fri, 18 Sep 2026 10:48:19 +0000 camx-dev (1.0.0-1) resolute; urgency=medium