summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-10-01 20:10:17 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-10-01 20:10:17 +0400
commitb4dfc956ad49596bf0296687385c65fab22e7e14 (patch)
tree8ae0755fe3dfd05044f1ccd077ba6e64350d6ca4
parentc046f7bcc92281465917e026f83fd0d38569cb06 (diff)
downloadrsyslog-master.tar.gz
rsyslog (8.4.1-1+dyson1) unstable; urgency=mediumHEADdyson/8.4.1-1+dyson1master
* Package for Dyson * Use dh-smf on illumos-any
-rw-r--r--debian/changelog7
-rw-r--r--debian/control1
-rw-r--r--debian/rsyslog.install1
-rw-r--r--debian/rsyslog.postinst.smf18
-rw-r--r--debian/rsyslog.prerm.smf11
-rw-r--r--debian/rsyslog.smf/manifest/system/rsyslog.xml (renamed from debian/smf/manifest/system/rsyslog.xml)0
-rw-r--r--debian/rsyslog.smf/method/rsyslog (renamed from debian/smf/method/rsyslog)0
-rwxr-xr-xdebian/rules6
8 files changed, 11 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog
index 07fcdec..7ab4ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rsyslog (8.4.1-1+dyson1) unstable; urgency=medium
+
+ * Package for Dyson
+ * Use dh-smf on illumos-any
+
+ -- Igor Pashev <pashev.igor@gmail.com> Wed, 01 Oct 2014 19:48:13 +0400
+
rsyslog (8.4.1-1) unstable; urgency=high
* New upstream release.
diff --git a/debian/control b/debian/control
index ca0e0e3..6868842 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends: debhelper (>= 8),
libjson-c-dev,
uuid-dev,
pkg-config,
+ dh-smf [illumos-any],
bison
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/collab-maint/rsyslog.git
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index 084c5bd..9a31a57 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -27,4 +27,3 @@ usr/lib/rsyslog/ommail.so
usr/lib/rsyslog/omprog.so
usr/lib/rsyslog/omuxsock.so
usr/lib/rsyslog/pm*.so
-lib/systemd/system/rsyslog.service
diff --git a/debian/rsyslog.postinst.smf b/debian/rsyslog.postinst.smf
deleted file mode 100644
index 244b098..0000000
--- a/debian/rsyslog.postinst.smf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-fmri=svc:/system/system-log:rsyslog
-
-if [ "$1" = configure ]; then
- state=`svcstatus $fmri`
- case "$state" in
- online)
- # Restart only on upgrades.
- # On new install the service will start automatically
- if [ -n "$2" ]; then
- svcadm -v restart $fmri || true
- fi
- ;;
- maintenance) svcadm -v clear $fmri || true;;
- offline) svcadm -v refresh $fmri || true;;
- esac
-fi
-
diff --git a/debian/rsyslog.prerm.smf b/debian/rsyslog.prerm.smf
deleted file mode 100644
index c0032ea..0000000
--- a/debian/rsyslog.prerm.smf
+++ /dev/null
@@ -1,11 +0,0 @@
-fmri=svc:/system/system-log:rsyslog
-state=`svcstatus $fmri`
-
-case "$1" in
- remove)
- case "$state" in
- online) svcadm -v disable -s $fmri || true;;
- esac
- ;;
-esac
-
diff --git a/debian/smf/manifest/system/rsyslog.xml b/debian/rsyslog.smf/manifest/system/rsyslog.xml
index 2b3e6d0..2b3e6d0 100644
--- a/debian/smf/manifest/system/rsyslog.xml
+++ b/debian/rsyslog.smf/manifest/system/rsyslog.xml
diff --git a/debian/smf/method/rsyslog b/debian/rsyslog.smf/method/rsyslog
index 96ef0ee..96ef0ee 100644
--- a/debian/smf/method/rsyslog
+++ b/debian/rsyslog.smf/method/rsyslog
diff --git a/debian/rules b/debian/rules
index f41acfe..51d9263 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,20 +60,20 @@ override_dh_auto_install:
override_dh_install:
dh_install -X .la --list-missing
ifeq ($(DEB_HOST_ARCH_OS), linux)
+ dh_install -p rsyslog lib/systemd/system/rsyslog.service
install --mode=644 debian/tmp/usr/lib/rsyslog/imkmsg.so \
debian/rsyslog/usr/lib/rsyslog/
install --mode=644 debian/tmp/usr/lib/rsyslog/imptcp.so \
debian/rsyslog/usr/lib/rsyslog/
endif
ifeq (illumos,$(DEB_HOST_ARCH_OS))
+ dh_smf
rm -rf debian/rsyslog/etc/systemd
rm -rf debian/rsyslog/lib/systemd
+ rm -rf debian/rsyslog/usr/lib/tmpfiles.d
install --mode=644 debian/tmp/usr/lib/rsyslog/imsolaris.so \
debian/rsyslog/usr/lib/rsyslog/
echo '$$ModLoad imsolaris' > debian/rsyslog/etc/rsyslog.d/00-load-imsolaris.conf
- dh_install -p rsyslog debian/smf/* /lib/svc/
- cat debian/rsyslog.postinst.smf >> debian/rsyslog.postinst.debhelper
- cat debian/rsyslog.prerm.smf >> debian/rsyslog.prerm.debhelper
else
install --mode=644 debian/tmp/usr/lib/rsyslog/imklog.so \
debian/rsyslog/usr/lib/rsyslog/