summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTurbo Fredriksson <[email protected]>2013-04-23 16:45:45 -0700
committerBrian Behlendorf <[email protected]>2013-04-24 16:18:11 -0700
commit16253cff43bf4865be01fb6f0b03cc7eeb1ece1b (patch)
tree18e0dfbce7cde9e2531017fd0baf99f2b074f9bf
parent2c213707465e8e904064f97ead08a23ed51b79b9 (diff)
Add --bump=0 to alien
Preserve the release field when creating Debian packages. The --keep-version option was not used because it results in a failure when the git '<commit>_<hash>' syntax is used for the release. The '_' is a valid character for RPM packages but not for DEBs. Signed-off-by: Brian Behlendorf <[email protected]> Signed-off-by: Turbo Fredriksson <[email protected]> Issue zfsonlinux/zfs#1402 Issue zfsonlinux/zfs#928
-rw-r--r--config/deb.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/deb.am b/config/deb.am
index 5efbd9d36..a2bad0260 100644
--- a/config/deb.am
+++ b/config/deb.am
@@ -34,7 +34,7 @@ if CONFIG_KERNEL
version=${VERSION}-${RELEASE}; \
arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \
pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \
- fakeroot $(ALIEN) --scripts --to-deb $$pkg1; \
+ fakeroot $(ALIEN) --bump=0 --scripts --to-deb $$pkg1; \
$(RM) $$pkg1
endif
@@ -44,7 +44,7 @@ if CONFIG_USER
version=${VERSION}-${RELEASE}; \
arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
pkg1=$${name}-$${version}.$${arch}.rpm; \
- fakeroot $(ALIEN) --scripts --to-deb $$pkg1; \
+ fakeroot $(ALIEN) --bump=0 --scripts --to-deb $$pkg1; \
$(RM) $$pkg1
endif