Skip to content
Browse files

debian: fix a few bits around and resync with rpm packaging

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
  • Loading branch information...
1 parent 5df5216 commit b32ad7521c90d6deec64c875a77a22913b83a00d @fabbione committed Jan 10, 2013
Showing with 15 additions and 8 deletions.
  1. +2 −0 .gitignore
  2. +10 −2 Makefile.am
  3. +0 −5 TODO
  4. +2 −0 debian/kronosnetd.install
  5. +1 −1 debian/{kronosnetd.postinst → kronosnetd.postinst.in}
View
2 .gitignore
@@ -20,6 +20,8 @@ compile
config.*
configure*
debian/changelog
+debian/kronosnetd.postinst
+debian/patches
depcomp
install-sh
libtoolize
View
12 Makefile.am
@@ -18,11 +18,12 @@ ACLOCAL_AMFLAGS = -I m4
SPEC = $(PACKAGE_NAME).spec
DEBCHANGELOG = debian/changelog
+DEBPOSTINST = debian/kronosnetd.postinst
TARGZFILE = $(PACKAGE_NAME)-$(VERSION).tar.gz
EXTRA_DIST = build-aux autogen.sh .version \
- debian $(DEBCHANGELOG) \
+ debian $(DEBCHANGELOG) $(DEBPOSTINST) \
$(SPEC) $(SPEC).in
SUBDIRS = init libtap libknet kronosnetd
@@ -113,6 +114,13 @@ rpm: clean
## make deb
+$(DEBPOSTINST): $(DEBPOSTINST).in config.h
+ mkdir -p debian
+ rm -f $@-t $@
+ sed -e "s#@defaultadmgroup@#$(DEFAULTADMGROUP)#g" $< > $@-t
+ chmod a-w $@-t
+ mv $@-t $@
+
$(DEBCHANGELOG): $(DEBCHANGELOG).in .version
mkdir -p debian
rm -f $@-t $@
@@ -162,7 +170,7 @@ debs: deb-clean dist
gitver="$(shell cat .tarball-version)"; \
else \
gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
- gitver=`echo $$gitver | sed -e "s/^v//"`; \
+ gitver=`echo $$gitver | sed -e "s/^v//" -e "s/-g/-/" -e "s/-/./"`; \
fi && \
cp $(TARGZFILE) ../$(PACKAGE_NAME)_$$gitver.orig.tar.gz
dpkg-buildpackage -uc -us
View
5 TODO
@@ -1,8 +1,3 @@
-debian packaging (mostly resync from rpm packaging):
- - (sync) Check policy on /etc/pam.d/* install/usage
- - (sync) Make groupadd kronosnetadm silent and dynamic
- - (sync) install /etc/default/kronosnetd
-
rpm packaging:
- (issue) check why systemd doesn't let me set scheduler priority
fixed for systemd unit file, LSB init + systemd still fails
View
2 debian/kronosnetd.install
@@ -1,5 +1,7 @@
etc/kronosnet/*
+etc/default/kronosnetd
etc/init.d/kronosnetd
etc/logrotate.d/kronosnetd
+etc/pam.d/kronosnetd
usr/sbin/*
usr/share/man/man8/*
View
2 debian/kronosnetd.postinst → debian/kronosnetd.postinst.in
@@ -4,7 +4,7 @@ set -e
case "$1" in
configure)
- groupadd --force --system kronosnetadm
+ groupadd --force --system @defaultadmgroup@ > /dev/null 2>&1
;;
purge|abort-upgrade|abort-remove|abort-deconfigure)
;;

0 comments on commit b32ad75

Please sign in to comment.
Something went wrong with that request. Please try again.