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

adding dh_installsystemd

Browse Source 
Former-commit-id: 39817055d85b4f6a0d575b94737f1b1b2c952708
This commit is contained in:
Ben Schermel 2020-05-26 12:44:25 -04:00 committed by John Sully
parent ab97cf3cf8
commit ebac0d5943
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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-pro-$version$distname pkg_name=keydb-pro-$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-pro_$version.orig.tar.gz ./$pkg_name mv ../../../keydb-pro_$version.orig.tar.gz ./$pkg_name
cd $pkg_name/tmp cd $pkg_name/tmp
changelog_str="keydb-pro ($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-pro ($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
@ -55,6 +55,6 @@ sudo pbuilder --build *.dsc --logfile /mnt/pbuilderlog.log
# move new packages to deb_files_generated and clean up # move new packages to deb_files_generated and clean up
cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
sudo pbuilder --autocleanaptcache sudo pbuilder clean
cd ../ cd ../
rm -rf $pkg_name rm -rf $pkg_name

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

@ -27,24 +27,26 @@ do
NAME="keydb" NAME="keydb"
BINARY_EXEC="keydb-server" BINARY_EXEC="keydb-server"
BINARY_NAME="keydb-pro-server" BINARY_NAME="keydb-pro-server"
TARGET_NAME="keydb-pro-server"
;; ;;
keydb-sentinel) keydb-sentinel)
NAME="sentinel" NAME="sentinel"
BINARY_EXEC="keydb-sentinel" BINARY_EXEC="keydb-sentinel"
BINARY_NAME="keydb-sentinel" BINARY_NAME="keydb-sentinel"
TARGET_NAME="keydb-pro-sentinel"
;; ;;
esac esac
case "${MODE}" in case "${MODE}" in
default) default)
EXTRA="Alias=${NAME}.service" EXTRA="Alias=${NAME}.service"
TARGET="debian/${BINARY}.service" TARGET="debian/${TARGET_NAME}.${BINARY}.service"
NAMESPACED="${NAME}" NAMESPACED="${NAME}"
DESCRIPTION="Advanced key-value store" DESCRIPTION="Advanced key-value store"
;; ;;
templated) templated)
EXTRA="" EXTRA=""
TARGET="debian/${BINARY}@.service" TARGET="debian/${TARGET_NAME}.${BINARY}@.service"
NAMESPACED="${NAME}-%i" NAMESPACED="${NAME}-%i"
DESCRIPTION="Advanced key-value store (%I)" DESCRIPTION="Advanced key-value store (%I)"
;; ;;
@ -81,8 +83,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

8
pkg/deb/debian/rules
View File

@ -18,13 +18,15 @@ endif
override_dh_auto_install: override_dh_auto_install:
debian/bin/generate-systemd-service-files debian/bin/generate-systemd-service-files
dh_installsystemd --name keydb-server --restart-after-upgrade
dh_installsystemd --name keydb-sentinel --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:

4
pkg/deb/master_changelog
View File

@ -1,6 +1,6 @@
keydb (6.0.7-1distribution_placeholder) codename_placeholder; urgency=medium keydb (6.0.8-1distribution_placeholder) codename_placeholder; urgency=medium
* 6.0.7 Updating builds from deb source package * 6.0.8 Updating builds from deb source package
* Naming conventions are now updated * Naming conventions are now updated
* Builds now genrated accross different distributions/architectures automatically. * Builds now genrated accross different distributions/architectures automatically.
* Same changelog used for all distribitions/architectures and will be updated on each release * Same changelog used for all distribitions/architectures and will be updated on each release