Skip to content

debian: packaging improvements and fixes for Ubuntu resolute#26

Closed
Chandan Jha (cjha01) wants to merge 0 commit into
qualcomm-linux:qcom/ubuntu/resolutefrom
cjha01:resolute
Closed

debian: packaging improvements and fixes for Ubuntu resolute#26
Chandan Jha (cjha01) wants to merge 0 commit into
qualcomm-linux:qcom/ubuntu/resolutefrom
cjha01:resolute

Conversation

@cjha01

Copy link
Copy Markdown
Contributor

Summary

This PR ports and adapts the Debian packaging improvements from the
qcom/debian/trixie branch into the qcom/ubuntu/resolute branch.
All changes are confined to the debian/ directory. No upstream
source files are modified.

Changes

Correctness fixes

  • Fix debian/control section from non-free to contrib — the
    driver is GPL-2.0 but depends on non-free firmware at runtime
  • Fix debian/copyright to add missing co-copyright holders
    (Linux Foundation, QINC) and add a separate debian/* stanza
    licensed under BSD-3-Clause
  • Fix debian/changelog to reset bloated auto-generated entries
    to a clean * Initial release. with correct 1.0.3-0qli1~
    versioning scheme
  • Fix debian/rules to use execute_after_dh_dkms: instead of
    override_dh_dkms: — the correct debhelper hook for
    post-processing after dh_dkms runs
  • Fix debian/rules to prune dotfiles from the DKMS staged
    source tree

Package naming

  • Rename binary package camx-uapi-devcamx-linux-dev to
    follow Debian naming convention for Linux UAPI header packages
  • Add Provides: camx-uapi-dev to camx-linux-dev for backwards
    compatibility with existing dependents

Packaging hygiene

  • Simplify install logic using declarative .install files
    (camx-dkms.install, camx-linux-dev.install) replacing
    manual find|cpio calls in debian/rules
  • Rename dkms-build.sh / dkms-clean.shdkms-build /
    dkms-clean and mark executable (scripts with a shebang
    don't need .sh extension or explicit bash prefix)
  • Rewrite package descriptions with detailed, lintian-compliant
    text explaining CamX subsystems and what each package provides
  • Wrap Build-Depends: one-per-line per Debian convention
  • Drop redundant Priority: optional and Rules-Requires-Root: no
    fields (both are defaults in debhelper compat 13)
  • Drop redundant Recommends: linux-headers-generic (DKMS handles
    kernel headers automatically) and overly strict versioned Depends
  • Add Vcs-Browser and Vcs-Git headers pointing to the
    packaging repository
  • Add debian/upstream/metadata (DEP-12) with upstream bug
    tracker and repository URLs
  • Add debian/.gitignore to exclude debhelper build artifacts
  • Add debian/source/options to exclude .github/ workflows
    from the Debian source package diff
  • Use parallel make -j$(nproc) in dkms-build for faster builds
  • Update debian/gbp.conf branch to qcom/ubuntu/resolute

Notes

  • debian/changelog trailer keeps the original
    GitHub Service Bot identity and timestamp from the resolute
    branch — not replaced with a personal identity
  • debian/gbp.conf uses qcom/ubuntu/resolute (not
    qcom/debian/trixie) — adapted for this branch
  • The trixie backport changelog entry (1.0.3-0qli1~bpo13+1)
    is intentionally absent — it does not belong on this branch

@lool

Copy link
Copy Markdown
Contributor

Hi Chandan Jha (@cjha01), your git history looks weird; it looks like you took all my commits, and rebase them with you as the author.

What I would expect is either:

  • you rebase the Ubuntu branch once to have a more recent common ancestor, then merge; merge commits should look nice
  • or you just merge, and fix the delta once; your first merge will look ugly, next ones will be ok
  • you start from trixie branch, and reapply remaining Ubuntu delta as new patches on top (cleanest); your history is perfectly linear and nice; perhaps you do merges in the future like I would between debian/ branches

@cjha01

Copy link
Copy Markdown
Contributor Author

Redone using Option 3 — your trixie commits are now kept as-is under your name. I only added 2 commits on top with the resolute-specific adaptations (gbp.conf branch name and changelog version/trailer).

@cjha01

Copy link
Copy Markdown
Contributor Author

#28

@lool

Copy link
Copy Markdown
Contributor

I'm not sure you can sent that as a merge though

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants