kbuild: deb-pkg: require debian_revision when creating source package
PATCH 1/1 kbuild: deb-pkg: require debian_revision when creating source package
Debian Policy [1] specifies the version format as follows:
[epoch:]upstream_version[-debian_revision]
Here, the presence of the debian_revision part indicates a non-native package, while its absence indicates a native package.
Kbuild adopts the source format 3.0 (quilt), meaning the kernel is a non-native package and therefore requires the revision portion.
This commit prevents the creation of an invalid source package when KDEB_PKGVERSION contains no hyphen.
[1]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
---
scripts/package/mkdebian | 8 ++++++++ 1 file changed, 8 insertions(+)
scripts/package/mkdebian +8 -0
@@ -94,6 +94,14 @@ set_debarch() { # Create debian/source/ if it is a source package build gen_source () { + # The Debian Policy requires -debian_revision portion in the version. + # Since the source format 3.0 (quilt) is used here, a hyphen is + # required in the version. + if [ "${KDEB_PKGVERSION:+set}" ] && ! echo "${KDEB_PKGVERSION}" | grep -- '-..*'; then + echo "error: KDEB_PKGVERSION must include a hyphen to create a source package" >&2 + exit 1 + fi + mkdir -p debian/source echo "3.0 (quilt)" > debian/source/format
Signature · 1 line
2.43.0
Quoted 26 lines · Masahiro Yamada
Debian Policy [1] specifies the version format as follows:
[epoch:]upstream_version[-debian_revision]
Here, the presence of the
debian_revisionpart indicates a non-native package, while its absence indicates a native package.
Kbuildadopts the source format 3.0 (quilt), meaning the kernel is a non-native package and therefore requires the revision portion.This commit prevents the creation of an invalid source package when
KDEB_PKGVERSIONcontains no hyphen.[1]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
Signed-off-by Masahiro Yamada <[email protected]>---
scripts/package/mkdebian | 8 ++++++++ 1 file changed, 8 insertions(+)scripts/package/mkdebian +0
-0
scripts/package/mkdebian set_debarch() { · line 100
Quoted 7 lines
scripts/package/mkdebian +4
-0@@ -94,6 +94,14 @@ set_debarch() { # Create debian/source/ if it is a source package build gen_source () { + # The Debian Policy requires -debian_revision portion in the version. + # Since the source format 3.0 (quilt) is used here, a hyphen is + # required in the version. + if [ "${KDEB_PKGVERSION:+set}" ] && ! echo "${KDEB_PKGVERSION}" | grep -- '-..*'; then
Thanks. At first, I thought that the check pattern could be enhanced, but testing with '--' as version suffix led to
dpkg-buildpackage: warning: debian/changelog(l1): version '6.14rc5+me--' is invalid: revision cannot be empty
LINE: linux-upstream (6.14rc5+avm--) trixie; urgency=low
dpkg-buildpackage: info: source package linux-upstream
dpkg-buildpackage: info: source version unknown
dpkg-buildpackage: error: version number does not start with digit
thus this is great as it is.
Quoted 39 lines · Nicolas Schier
Quoted 26 lines · Masahiro Yamada
Debian Policy [1] specifies the version format as follows:
[epoch:]upstream_version[-debian_revision]
Here, the presence of the
debian_revisionpart indicates a non-native package, while its absence indicates a native package.
Kbuildadopts the source format 3.0 (quilt), meaning the kernel is a non-native package and therefore requires the revision portion.This commit prevents the creation of an invalid source package when
KDEB_PKGVERSIONcontains no hyphen.[1]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
Signed-off-by Masahiro Yamada <[email protected]>---
scripts/package/mkdebian | 8 ++++++++ 1 file changed, 8 insertions(+)scripts/package/mkdebian +0
-0scripts/package/mkdebian set_debarch() { · line 100
Quoted 7 lines
scripts/package/mkdebian +4
-0@@ -94,6 +94,14 @@ set_debarch() { # Create debian/source/ if it is a source package build gen_source () { + # The Debian Policy requires -debian_revision portion in the version. + # Since the source format 3.0 (quilt) is used here, a hyphen is + # required in the version. + if [ "${KDEB_PKGVERSION:+set}" ] && ! echo "${KDEB_PKGVERSION}" | grep -- '-..*'; thenThanks. At first, I thought that the check pattern could be enhanced, but testing with '--' as version suffix led to
Quoted 7 lines
dpkg-buildpackage: warning: debian/changelog(l1): version '6.14rc5+me--' is invalid: revision cannot be empty
LINE: linux-upstream (6.14rc5+avm--) trixie; urgency=low
dpkg-buildpackage: info: source package linux-upstream
dpkg-buildpackage: info: source version unknown
dpkg-buildpackage: error: version number does not start with digitthus this is great as it is.
Good point.
The debian tool already rejects incorrect version format. So, we could simplify the version check to:
grep -- -
However, on second thought, this patch might be unnecessary because it is better to leave all the version checks up to the debian tools.
When KDEB_PKGVERSION does not contain a hyphen, this warning is shown:
dpkg-source: warning: non-native package version does not contain a revision
It still produces a source package.
If this is just a warning instead of an error, it is fine.
Quoted 2 lines
Reviewed-by Nicolas Schier <[email protected]>
Thanks for the review.
Signature · 2 lines
Best Regards Masahiro Yamada