debian: port packaging improvements from trixie to resolute#28
Open
cjha01 wants to merge 32 commits into
Open
Conversation
Copy debian/ directory from qcom/ubuntu/resolute branch which appears to be the freshest. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Copy latest pkg-pr-hook.yml GitHub Actions workflow from qcom-build-utils. NB: The upstream workflows should not affect this repository as they are either on a schedule (which will only be considered from the default branch) or on specific target branches which aren't present. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Pick the agreed -0qli1~ base version for the default version. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Set --extend-diff-ignore to ignore the addition of github workflows in the packaging branches. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
List and consolidate all copyright statements for upstream sources. License debian/* under BSD-3-Clause. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
When building locally from git repository, .github and .git directories were copied in the resulting packages. Extend find pruning to including all dotfiles. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
No need to restate the obvious; keep the file tidy, as for kgsl. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Relax superfluous camx-dkms deps. - drop init-system-helpers dependency as no call to its utilities seem present - drop grub-efi-arm64 Recommends as we also boot camx systems with pure systemd-boot - drop the dkms dependency as it's added to misc:Depends aleady Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Add Vcs-Browser and Vcs-Git. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
These drivers are GPL but only useful with a proprietary userspace; this matches contrib nicely. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Pass -j`nproc` to make to build module sources in parallel. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Out of 42 dkms packages, only 3 depend on kernel headers. Since kernel headers are named differently in Ubuntu, drop the dependency altogether. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Set debian-brannch to qcom/debian/latest, adding missing prefix. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
The optional Priority is the default; don't set it. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
The modern default for the R-R-R field is already no, so no need to set this. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
The upstream repository name is actually "camera-driver". Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Add a meaningful Uploaders field to avoid NMU warnings and to provide a contact point. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
List one build-dep per line to have nicer diffs and a more readable control. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Revisit long and short descriptions to make them nicer to read and more informative. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
The term UAPI is uncommon in DKMS packages, while linux-dev is typically used for kernel headers. Rename the camx-uapi-dev package to camx-linux-dev. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Add .gitignore file for artifacts created during package builds. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Make override_dh_auto_* targets easier to read. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
dkms-build and -clean scripts already have a bash shebang, no need to call them under bash and to have a .sh extension. Fix this, and set their permissions to 755 in the packaging git repo. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Use dh_install *.install files and the debhelper compat env variable expansion to simplify installation logic. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Avoid the extra dh_dkms call by using execute_after_dh_ instead of override_dh_. Reindent the shell-in-make logic to be more consistent and add proper quoting. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Packaging rename and fixes
Provide the camx-uapi-dev name for backwards compat. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
d/control: add camx-uapi-dev Provides
Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Adjust git-buildpackage branch information for this branch. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
Adapt gbp.conf for the Ubuntu resolute branch. The trixie branch uses qcom/debian/trixie; this branch targets qcom/ubuntu/resolute instead.
Drop the trixie backport entry which does not belong on this Ubuntu branch. Use ~ubuntu1 version suffix instead of ~bpo13+1 and restore the GitHub Service Bot trailer from the original resolute branch.
Contributor
|
@cjha01 merge conflicts to address first |
Contributor
|
@cjha01 sorry nevermind; the branch looks good, but you can't land it as a merge, you have to rename / delete the old branch and push this one or force push this one instead |
Contributor
Author
Thanks for review @lool . I don't have direct push access to qualcomm-linux/pkg-camx-dkms. I had permission when repository was not public, but my access was unfortunately revoked. I've prepared the branch correctly with your trixie Could you please do Pull from my fork branch and force push yourself: My branch: https://github.com/cjha01/pkg-camx-dkms1/tree/resolute or option 2 pull my change and push fetch your branchgit fetch https://github.com/cjha01/pkg-camx-dkms1.git resolute:cjha/resolute verify it looks correctgit log --oneline -5 cjha/resolute force push to replace the upstream branchgit push origin cjha/resolute:qcom/ubuntu/resolute --force-with-lease I’m working on getting the required permissions; meanwhile, could you please proceed from your side if possible? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport Loïc Minier's Debian packaging improvements
from qcom/debian/trixie into qcom/ubuntu/resolute.
All changes are confined to debian/. No upstream source
files are modified.
Loïc's commits are backported as-is under his authorship.
Two resolute-specific adaptation commits are added on top:
Note: Conflicts limited to debian/changelog and
debian/gbp.conf due to diverged branch history.