Skip to content

[CPBR-3673] Migrate packaging files from separate rpm/debian/archive branches to debian/ on nightly branch#677

Open
Saurabh Yadav (saurabhcnf) wants to merge 1 commit into7.4.xfrom
74x-syadav-branch-migration
Open

[CPBR-3673] Migrate packaging files from separate rpm/debian/archive branches to debian/ on nightly branch#677
Saurabh Yadav (saurabhcnf) wants to merge 1 commit into7.4.xfrom
74x-syadav-branch-migration

Conversation

@saurabhcnf
Copy link
Copy Markdown
Member

@saurabhcnf Saurabh Yadav (saurabhcnf) commented Apr 13, 2026

Description:

Summary

Migrate RPM, DEB, and archive packaging files from separate origin/rpm, origin/debian, and origin/archive branches into a unified debian/ directory on the code branch, following the nightly-branch pattern used by schema-registry,
common, and other components.

This is a prerequisite for s390x multi-arch RPM packaging support. This will be pint-merged till master.

What changed

  • Added debian/Makefile — unified Makefile combining RPM, DEB, and archive targets with PACKAGE_TYPE-based PREFIX switching and debian-control target for generating debian/control from control.in
  • Added debian/confluent-rest-utils.spec.in — RPM spec template (from origin/rpm)
  • Added debian/control.in — Debian control template with ##VERSION## placeholder (from origin/debian)
  • Added debian/compat, debian/changelog, debian/copyright, debian/gbp.conf, debian/rules, debian/source/format — standard Debian packaging metadata
  • Added debian/patches/series and debian/patches/standard_build_layout.patch

Key design decisions

  • Install logic from create_archive.sh inlined into Makefile install: target
  • RPM spec generation uses inline sed instead of create_spec.sh
  • Uses control.in (not static control) with debian-control: target to substitute version at build time
  • Follows the same unified Makefile pattern as common and schema-registry

Testing

Tested with packaging draft PR: https://github.com/confluentinc/packaging/pull/2294
Corresponding packaging job: https://semaphore.ci.confluent.io/workflows/52134350-65e1-4ff5-9a9d-071240602fa3?pipeline_id=8eb5e8cc-6d6e-4b2a-9ac5-c086f8170859

Artifacts comparison and verification

https://confluentinc.atlassian.net/browse/CPBR-3673?focusedCommentId=5050099

Issue

https://confluentinc.atlassian.net/browse/CPBR-3673

…debian/ on nightly branch

Unified Makefile combines RPM, DEB, and archive targets with PACKAGE_TYPE-based
PREFIX switching. Install logic inlined from create_archive.sh. Spec generation
uses inline sed instead of create_spec.sh.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@saurabhcnf Saurabh Yadav (saurabhcnf) changed the title Migrate packaging files from separate rpm/debian/archive branches to debian/ on nightly branch [CPBR-3673] Migrate packaging files from separate rpm/debian/archive branches to debian/ on nightly branch Apr 14, 2026
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