root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Debian package: No need to pass $(VERSION) around in debian/rules 

The source disttribution is responsible for its own version string.

[#131643765]
[#130992027]
This commit is contained in:
Jean-Sébastien Pédron 2016-12-07 13:05:34 +01:00
parent 0ebaf287b8
commit a9cc7496c5
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/debs/Debian/Makefile
View File

@ -34,7 +34,6 @@ all: package
package: clean package: clean
cp -a $(SOURCE_DIST_FILE) $(DEBIAN_ORIG_TARBALL) cp -a $(SOURCE_DIST_FILE) $(DEBIAN_ORIG_TARBALL)
xzcat $(DEBIAN_ORIG_TARBALL) | tar -xf - xzcat $(DEBIAN_ORIG_TARBALL) | tar -xf -
cp -a debian $(UNPACKED_DIR)
rsync -a \ rsync -a \
--exclude '.sw?' --exclude '.*.sw?' \ --exclude '.sw?' --exclude '.*.sw?' \
--exclude '.git*' \ --exclude '.git*' \

2
packaging/debs/Debian/debian/postrm.in → packaging/debs/Debian/debian/postrm
View File

@ -61,5 +61,3 @@ esac
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

10
packaging/debs/Debian/debian/rules
View File

@ -5,7 +5,6 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
DEB_DESTDIR = debian/rabbitmq-server DEB_DESTDIR = debian/rabbitmq-server
VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {version=$$0; sub(/Version: /, "", version); sub(/-.*/, "", version); print version;}')
unexport DEPS_DIR unexport DEPS_DIR
@ -26,14 +25,11 @@ export PREFIX RMQ_ROOTDIR
override_dh_auto_install: PREFIX = /usr override_dh_auto_install: PREFIX = /usr
override_dh_auto_install: RMQ_ROOTDIR = $(PREFIX)/lib/rabbitmq override_dh_auto_install: RMQ_ROOTDIR = $(PREFIX)/lib/rabbitmq
override_dh_auto_install: RMQ_ERLAPP_DIR = $(RMQ_ROOTDIR)/lib/rabbitmq_server-$(VERSION) override_dh_auto_install: RMQ_ERLAPP_DIR = $(RMQ_ROOTDIR)/lib/rabbitmq_server-*
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- VERSION=$(VERSION) dh_auto_install
$(MAKE) install-bin DESTDIR=$(DEB_DESTDIR) VERSION=$(VERSION) $(MAKE) install-bin DESTDIR=$(DEB_DESTDIR)
sed -e 's|@RABBIT_LIB@|$(RMQ_ERLAPP_DIR)|g' \
< debian/postrm.in > debian/postrm
sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
-e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \ -e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \