gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding dh_installsystemd

Browse Source 
Former-commit-id: aa3f5de16fa8f5326baeace48475b026f2d2362f
This commit is contained in:
Ben Schermel 2020-05-26 12:40:28 -04:00 committed by John Sully
parent 441a5a0d74
commit 0a1c677b1a
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/deb/deb-buildsource.sh
View File

@ -19,7 +19,7 @@ elif [ "$distributor" == "Ubuntu" ]; then
fi fi
codename=$(lsb_release --codename --short) codename=$(lsb_release --codename --short)
date=$(date +%a," "%d" "%b" "%Y" "%T) date=$(date +%a," "%d" "%b" "%Y" "%T)
pkg_name=keydb-$version$distname pkg_name=keydb-$majorv:$version$distname
# create build tree # create build tree
cd ../../../ cd ../../../
@ -30,7 +30,7 @@ cp -r debian $pkg_name/tmp
cp master_changelog $pkg_name/tmp/debian/changelog cp master_changelog $pkg_name/tmp/debian/changelog
mv ../../../keydb_$version.orig.tar.gz ./$pkg_name mv ../../../keydb_$version.orig.tar.gz ./$pkg_name
cd $pkg_name/tmp cd $pkg_name/tmp
changelog_str="keydb ($version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com> $date +0000\n\n" changelog_str="keydb ($majorv:$version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com> $date +0000\n\n"
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
sed -i "1s/^/$changelog_str\n/" debian/changelog sed -i "1s/^/$changelog_str\n/" debian/changelog
elif [ $# -eq 1 ] && [ "$1" != "None" ]; then elif [ $# -eq 1 ] && [ "$1" != "None" ]; then
@ -44,7 +44,11 @@ debuild -S -sa
cd ../ cd ../
# create pbuilder chrooted environment and build the deb package # create pbuilder chrooted environment and build the deb package
sudo pbuilder create --distribution $codename if [ "$codename" == "xenial" ]; then
sudo pbuilder create --distribution $codename --othermirror "deb http://archive.ubuntu.com/ubuntu $codename universe multiverse"
else
sudo pbuilder create --distribution $codename
fi
sudo pbuilder --update sudo pbuilder --update
sudo pbuilder --build *.dsc sudo pbuilder --build *.dsc

2
pkg/deb/debian/bin/generate-systemd-service-files
View File

@ -78,8 +78,6 @@ do
# #
# $ systemctl start ${BINARY}@myname.service # $ systemctl start ${BINARY}@myname.service
# $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file # $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
#
# -- Chris Lamb <lamby@debian.org> Mon, 09 Oct 2017 22:17:24 +0100
EOF EOF
fi fi

2
pkg/deb/debian/keydb-sentinel.manpages
View File

@ -1 +1 @@
debian/keydb-pro-sentinel.1 debian/keydb-sentinel.1

2
pkg/deb/debian/keydb-server.manpages
View File

@ -1 +1 @@
debian/keydb-pro-server.1 debian/keydb-server.1

7
pkg/deb/debian/rules
View File

@ -18,13 +18,14 @@ endif
override_dh_auto_install: override_dh_auto_install:
debian/bin/generate-systemd-service-files debian/bin/generate-systemd-service-files
dh_installsystemd --restart-after-upgrade
override_dh_auto_test: override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Avoid race conditions in upstream testsuite. # Avoid race conditions in upstream testsuite.
# ./runtest --clients 1 || true ./runtest || true
# ./runtest-cluster || true ./runtest-cluster || true
# ./runtest-sentinel || true ./runtest-sentinel || true
endif endif
override_dh_auto_clean: override_dh_auto_clean: