diff options
29 files changed, 202 insertions, 151 deletions
diff --git a/smf-base/debian/changelog b/smf-base/debian/changelog new file mode 100644 index 0000000..bd6b420 --- /dev/null +++ b/smf-base/debian/changelog @@ -0,0 +1,5 @@ +smf-base (5.11.0-1~3) unstable; urgency=low + + * Initial release. + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 26 May 2012 01:39:16 +0000 diff --git a/smf/debian/compat b/smf-base/debian/compat index 45a4fb7..45a4fb7 100644 --- a/smf/debian/compat +++ b/smf-base/debian/compat diff --git a/smf-base/debian/control b/smf-base/debian/control new file mode 100644 index 0000000..48a34fd --- /dev/null +++ b/smf-base/debian/control @@ -0,0 +1,24 @@ +Source: smf-base +Section: admin +Priority: required +Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + debhelper ( >= 8 ), +Standards-Version: 3.9.2 +Homepage: http://illumos.org/ + +Package: smf-base +Essential: yes +Priority: required +Section: admin +Architecture: all +Depends: ${misc:Depends} +Description: service management facility (SMF): core services + SMF is a framework that handles system boot-up, process management, and + self-healing. It addresses the shortcomings of startup scripts and creates + an infrastructure to manage daemons after the host has booted. + . + This package includes manifests, methods, shared files for + core SMF services and milestones, such as mounting filesystems, + network configration, console login and others. + diff --git a/smf/debian/smf-base.docs b/smf-base/debian/docs index 4171555..4171555 100644 --- a/smf/debian/smf-base.docs +++ b/smf-base/debian/docs diff --git a/smf/debian/smf-base.install b/smf-base/debian/install index 8b73bb0..af5d8e4 100644 --- a/smf/debian/smf-base.install +++ b/smf-base/debian/install @@ -1,11 +1,6 @@ -usr/share/lib/xml/dtd/service_bundle.dtd.1 - lib/svc/share/fs_include.sh lib/svc/share/net_include.sh -lib/svc/share/smf_include.sh -# See usr/src/cmd/svc/milestone/Makefile -# for a list of manifests and methods: lib/svc/manifest/milestone/multi-user-server.xml lib/svc/manifest/milestone/multi-user.xml lib/svc/manifest/milestone/name-services.xml @@ -20,13 +15,11 @@ lib/svc/manifest/network/network-physical.xml lib/svc/manifest/network/network-service.xml lib/svc/manifest/system/device/devices-audio.xml lib/svc/manifest/system/device/devices-local.xml -lib/svc/manifest/system/early-manifest-import.xml lib/svc/manifest/system/filesystem/local-fs.xml lib/svc/manifest/system/filesystem/minimal-fs.xml lib/svc/manifest/system/filesystem/root-fs.xml lib/svc/manifest/system/filesystem/usr-fs.xml lib/svc/manifest/system/identity.xml -lib/svc/manifest/system/manifest-import.xml lib/svc/manifest/system/rmtmpfiles.xml lib/svc/manifest/system/svc/global.xml lib/svc/manifest/system/svc/restarter.xml @@ -39,7 +32,6 @@ lib/svc/method/fs-root lib/svc/method/fs-usr lib/svc/method/identity-domain lib/svc/method/identity-node -lib/svc/method/manifest-import lib/svc/method/net-init lib/svc/method/net-install lib/svc/method/net-loc @@ -49,4 +41,3 @@ lib/svc/method/net-physical lib/svc/method/net-svc lib/svc/method/rmtmpfiles -usr/share/man/man5/smf* diff --git a/smf/debian/patches/01-mount-var-run-lock.patch b/smf-base/debian/patches/01-mount-var-run-lock.patch index c2e77ba..6768c5a 100644 --- a/smf/debian/patches/01-mount-var-run-lock.patch +++ b/smf-base/debian/patches/01-mount-var-run-lock.patch @@ -1,5 +1,5 @@ ---- /lib/svc/method/fs-minimal 2011-11-13 05:56:46.000000000 +0000 -+++ /lib/svc/method/fs-minimal.new 2012-05-22 22:56:55.815215659 +0000 +--- a/lib/svc/method/fs-minimal 2011-11-13 05:56:46.000000000 +0000 ++++ b/lib/svc/method/fs-minimal.new 2012-05-22 22:56:55.815215659 +0000 @@ -66,6 +66,7 @@ mounted /var/run - tmpfs < /etc/mnttab if [ $? != 0 ] ; then diff --git a/smf/debian/rules b/smf-base/debian/rules index c442f68..03bbedd 100755 --- a/smf/debian/rules +++ b/smf-base/debian/rules @@ -5,21 +5,16 @@ dh $@ # For a while we use binary "sources" +override_dh_auto_clean: override_dh_auto_configure: override_dh_auto_build: override_dh_auto_test: override_dh_auto_install: ln -sf ../../root_i386 debian/tmp -override_dh_auto_clean: override_dh_install: dh_install cd debian/smf-base && \ - patch -p0 < ../../debian/patches/01-mount-var-run-lock.patch - -override_dh_installdocs: - dh_installdocs -p smf-base - dh_installdocs -p smf-init --link-doc=smf-base - dh_installdocs -p smf-utils --link-doc=smf-base + patch -p1 < ../../debian/patches/01-mount-var-run-lock.patch diff --git a/smf-base/debian/source/format b/smf-base/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/smf-base/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/smf-init/debian/changelog b/smf-init/debian/changelog new file mode 100644 index 0000000..9c39146 --- /dev/null +++ b/smf-init/debian/changelog @@ -0,0 +1,5 @@ +smf-init (5.11.0-1~3) unstable; urgency=low + + * Initial release. + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 26 May 2012 01:02:08 +0000 diff --git a/smf-init/debian/compat b/smf-init/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/smf-init/debian/compat @@ -0,0 +1 @@ +8 diff --git a/smf-init/debian/control b/smf-init/debian/control new file mode 100644 index 0000000..1c01927 --- /dev/null +++ b/smf-init/debian/control @@ -0,0 +1,33 @@ +Source: smf-init +Section: admin +Priority: required +Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + debhelper ( >= 8 ), +Standards-Version: 3.9.2 +Homepage: http://illumos.org/ + +Package: smf-init +Essential: yes +Priority: required +Section: admin +Architecture: illumos-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, +# for restore_repository: + sqlite, + libz1-oi, libxml2-oi, + ksh | mksh | pdksh | zsh | system-shell, +Description: service management facility (SMF): core binaries + SMF is a framework that handles system boot-up, process management, and + self-healing. It addresses the shortcomings of startup scripts and creates + an infrastructure to manage daemons after the host has booted. + . + This package includes: + /sbin/init - SMF aware init program, + /lib/svc/bin/svc.startd - master restarter, + /lib/svc/bin/svc.configd - repository daemon, + /lib/svc/bin/mfstscan - manifest change detection utility, + /lib/svc/bin/lsvcrun - run an rc?.d script as a SMF service, + /lib/svc/bin/restore_repository - shell script used by svc.configd, + /usr/lib/inet/inetd - restarter for inet services. + diff --git a/smf-init/debian/dirs b/smf-init/debian/dirs new file mode 100644 index 0000000..db75a9a --- /dev/null +++ b/smf-init/debian/dirs @@ -0,0 +1,8 @@ +etc/svc +etc/svc/profile +etc/svc/profile/site +etc/svc/volatile +lib/svc/manifest +lib/svc/method +var/svc/manifest +var/svc/method diff --git a/smf-init/debian/install b/smf-init/debian/install new file mode 100644 index 0000000..940352b --- /dev/null +++ b/smf-init/debian/install @@ -0,0 +1,22 @@ +etc/inittab +etc/ioctl.syscon +etc/sock2path.d/* +lib/svc/bin/lsvcrun +lib/svc/bin/mfstscan +lib/svc/bin/restore_repository +lib/svc/bin/svc.configd +lib/svc/bin/svc.startd +lib/svc/manifest/system/early-manifest-import.xml +lib/svc/manifest/system/manifest-import.xml +lib/svc/method/manifest-import +lib/svc/share/smf_include.sh +sbin/init +sbin/rc2 +sbin/rc3 +sbin/rcS +usr/share/lib/xml/dtd/service_bundle.dtd.1 +usr/share/man/man1m/init.1m +usr/share/man/man1m/svc.configd.1m +usr/share/man/man1m/svc.startd.1m +usr/share/man/man4/inittab.4 +usr/share/man/man5/smf* diff --git a/smf-init/debian/links b/smf-init/debian/links new file mode 100644 index 0000000..bb4c0ea --- /dev/null +++ b/smf-init/debian/links @@ -0,0 +1 @@ +/usr/bin/sqlite /lib/svc/bin/sqlite diff --git a/smf-init/debian/postinst b/smf-init/debian/postinst new file mode 100644 index 0000000..b77b05f --- /dev/null +++ b/smf-init/debian/postinst @@ -0,0 +1,17 @@ +#!/sbin/sh -e + +run_import_manifests() +{ + /lib/svc/method/manifest-import || true +} + +if [ "$1" = triggered ]; then + run_import_manifests + exit 0 +fi + +[ "$1" = configure ] || exit 0 + +#DEBHELPER# + +exit 0 diff --git a/smf-init/debian/rules b/smf-init/debian/rules new file mode 100755 index 0000000..8d8b352 --- /dev/null +++ b/smf-init/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + + +%: + dh $@ + +# For a while we use binary "sources" +override_dh_auto_clean: +override_dh_auto_configure: +override_dh_auto_build: +override_dh_auto_test: +override_dh_auto_install: + ln -sf ../../root_i386 debian/tmp + + diff --git a/smf-init/debian/source/format b/smf-init/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/smf-init/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/smf-init/debian/triggers b/smf-init/debian/triggers new file mode 100644 index 0000000..c0a99af --- /dev/null +++ b/smf-init/debian/triggers @@ -0,0 +1,2 @@ +interest /lib/svc/manifest +interest /var/svc/manifest diff --git a/smf-tools/debian/changelog b/smf-tools/debian/changelog new file mode 100644 index 0000000..1f09c8e --- /dev/null +++ b/smf-tools/debian/changelog @@ -0,0 +1,5 @@ +smf-tools (5.11.0-1~3) unstable; urgency=low + + * Initial release. + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 26 May 2012 02:13:32 +0000 diff --git a/smf-tools/debian/compat b/smf-tools/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/smf-tools/debian/compat @@ -0,0 +1 @@ +8 diff --git a/smf-tools/debian/control b/smf-tools/debian/control new file mode 100644 index 0000000..ef5618d --- /dev/null +++ b/smf-tools/debian/control @@ -0,0 +1,28 @@ +Source: smf-tools +Section: admin +Priority: required +Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + debhelper ( >= 8 ), +Standards-Version: 3.9.2 +Homepage: http://illumos.org/ + +Package: smf-tools +Essential: yes +Priority: required +Section: admin +Architecture: illumos-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: service management facility (SMF): administrative tools + SMF is a framework that handles system boot-up, process management, and + self-healing. It addresses the shortcomings of startup scripts and creates + an infrastructure to manage daemons after the host has booted. + . + This package includes: + svcs - service status listing, + svcadm - administrative actions, + svccfg - property modification, can be batch or interactive mode, + svcprop - property reporting, suitable for scripting, + inetadm - administrative and property modification for inetd services, + inetconv - convert legacy inetd.conf entries to SMF manifest and service. + diff --git a/smf-tools/debian/install b/smf-tools/debian/install new file mode 100644 index 0000000..aca6f0b --- /dev/null +++ b/smf-tools/debian/install @@ -0,0 +1,14 @@ +usr/bin/svcprop +usr/bin/svcs +usr/sbin/inetadm +usr/sbin/inetconv +usr/sbin/svcadm +usr/sbin/svccfg +usr/share/man/man1/svcprop.1 +usr/share/man/man1/svcprop.1 +usr/share/man/man1/svcs.1 +usr/share/man/man1m/inetadm.1m +usr/share/man/man1m/inetconv.1m +usr/share/man/man1m/svcadm.1m +usr/share/man/man1m/svccfg.1m +usr/lib/libtecla.so.1 usr/lib/i386-illumos/ diff --git a/smf-tools/debian/rules b/smf-tools/debian/rules new file mode 100755 index 0000000..2334f50 --- /dev/null +++ b/smf-tools/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + + +%: + dh $@ + +# For a while we use binary "sources" +override_dh_auto_clean: +override_dh_auto_configure: +override_dh_auto_build: +override_dh_auto_test: +override_dh_auto_install: + ln -sf ../../root_i386 debian/tmp + diff --git a/smf-tools/debian/source/format b/smf-tools/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/smf-tools/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/smf/debian/changelog b/smf/debian/changelog deleted file mode 100644 index b7be8cb..0000000 --- a/smf/debian/changelog +++ /dev/null @@ -1,17 +0,0 @@ -smf (5.11.0-1~2) unstable; urgency=low - - * Create /var/run/lock/ after boot - - -- Igor Pashev <pashev.igor@gmail.com> Tue, 22 May 2012 23:15:32 +0000 - -smf (5.11.0-1~1) unstable; urgency=low - - * Added /etc/svc and /etc/svc/volatile dirs - - -- Igor Pashev <pashev.igor@gmail.com> Tue, 22 May 2012 18:02:10 +0000 - -smf (5.11.0-0.1) unstable; urgency=low - - * Initial release. - - -- Igor Pashev <pashev.igor@gmail.com> Tue, 22 May 2012 01:31:24 +0000 diff --git a/smf/debian/control b/smf/debian/control deleted file mode 100644 index a5d1612..0000000 --- a/smf/debian/control +++ /dev/null @@ -1,64 +0,0 @@ -Source: smf -Section: admin -Priority: required -Maintainer: Igor Pashev <pashev.igor@gmail.com> -Build-Depends: - debhelper ( >= 8 ), -Standards-Version: 3.9.2 -Homepage: http://illumos.org/ - -Package: smf-base -Essential: yes -Priority: required -Section: admin -Architecture: all -Depends: ${misc:Depends} -Description: service management facility (SMF): shared files - SMF is a framework that handles system boot-up, process management, and - self-healing. It addresses the shortcomings of startup scripts and creates - an infrastructure to manage daemons after the host has booted. - . - This package includes shared scripts, manifests, milestones, etc. - -Package: smf-utils -Essential: yes -Priority: required -Section: admin -Architecture: illumos-amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: service management facility (SMF): utilities - SMF is a framework that handles system boot-up, process management, and - self-healing. It addresses the shortcomings of startup scripts and creates - an infrastructure to manage daemons after the host has booted. - . - This package includes: - svcs - service status listing, - svcadm - administrative actions, - svccfg - property modification, can be batch or interactive mode, - svcprop - property reporting, suitable for scripting, - inetadm - administrative and property modification for inetd services, - inetconv - convert legacy inetd.conf entries to SMF manifest and service. - -Package: smf-init -Essential: yes -Priority: required -Section: admin -Architecture: illumos-amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, -# for restore_repository: - sqlite, - libz1-oi, libxml2-oi -Description: service management facility (SMF): core binaries - SMF is a framework that handles system boot-up, process management, and - self-healing. It addresses the shortcomings of startup scripts and creates - an infrastructure to manage daemons after the host has booted. - . - This package includes: - /sbin/init - SMF aware init program, - /lib/svc/bin/svc.startd - master restarter, - /lib/svc/bin/svc.configd - repository daemon, - /lib/svc/bin/mfstscan - manifest change detection utility, - /lib/svc/bin/lsvcrun - run an rc?.d script as a SMF service, - /lib/svc/bin/restore_repository - shell script used by svc.configd, - /usr/lib/inet/inetd - restarter for inet services. - diff --git a/smf/debian/smf-base.dirs b/smf/debian/smf-base.dirs deleted file mode 100644 index 9dc42d0..0000000 --- a/smf/debian/smf-base.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/svc -etc/svc/volatile -var/svc/manifest diff --git a/smf/debian/smf-init.install b/smf/debian/smf-init.install deleted file mode 100644 index 0d1e0bb..0000000 --- a/smf/debian/smf-init.install +++ /dev/null @@ -1,15 +0,0 @@ -etc/inittab -etc/ioctl.syscon -etc/sock2path.d/* -lib/svc/bin/lsvcrun -lib/svc/bin/mfstscan -lib/svc/bin/restore_repository -lib/svc/bin/svc.configd -lib/svc/bin/svc.startd -sbin/init -sbin/rc2 -sbin/rc3 -sbin/rcS -usr/share/man/man1m/svc.configd.1m -usr/share/man/man1m/svc.startd.1m - diff --git a/smf/debian/smf-utils.install b/smf/debian/smf-utils.install deleted file mode 100644 index 99c143e..0000000 --- a/smf/debian/smf-utils.install +++ /dev/null @@ -1,34 +0,0 @@ -etc/halt -etc/killall -etc/reboot -etc/shutdown -etc/sulogin -sbin/sulogin -usr/bin/last -usr/bin/mesg -usr/bin/svcprop -usr/bin/svcs -usr/sbin/halt -usr/sbin/inetadm -usr/sbin/inetconv -usr/sbin/killall -usr/sbin/reboot -usr/sbin/shutdown -usr/sbin/svcadm -usr/sbin/svccfg -usr/share/man/man1/last.1 -usr/share/man/man1/mesg.1 -usr/share/man/man1/svcprop.1 -usr/share/man/man1/svcprop.1 -usr/share/man/man1/svcs.1 -usr/share/man/man1m/halt.1m -usr/share/man/man1m/inetadm.1m -usr/share/man/man1m/inetconv.1m -usr/share/man/man1m/killall.1m -usr/share/man/man1m/reboot.1m -usr/share/man/man1m/shutdown.1m -usr/share/man/man1m/sulogin.1m -usr/share/man/man1m/svcadm.1m -usr/share/man/man1m/svccfg.1m -# 32-bits, until we rebuild all -usr/lib/libtecla.so.1 usr/lib/i386-illumos/ |