Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corrections to create a package for Solaris 11 on SPARC #1012

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Corrections to create a package for Solaris 11 on SPARC #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9e1bf
modify manifests to allow SMF restart services on error
topinet Nov 9, 2023
caf93ee
correct package version and arch
topinet Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/solaris/ncpa_listener.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<exec_method timeout_seconds="60" type="method" name="start"
exec="/usr/local/ncpa/ncpa_listener" />
<exec_method timeout_seconds="60" type="method" name="stop"
exec="kill `cat /usr/local/ncpa/var/run/ncpa_listener.pid`" />
exec=":kill" />
<exec_method timeout_seconds="60" type="method" name="refresh"
exec=":true" />
<property_group type="framework" name="startd">
<propval type="astring" name="duration" value="transient" />
<propval type="astring" name="duration" value="daemon" />
</property_group>
<instance enabled="true" name="default" />
<template>
Expand Down
4 changes: 2 additions & 2 deletions build/solaris/ncpa_passive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<exec_method timeout_seconds="60" type="method" name="start"
exec="/usr/local/ncpa/ncpa_passive" />
<exec_method timeout_seconds="60" type="method" name="stop"
exec="kill `cat /usr/local/ncpa/var/run/ncpa_passive.pid`" />
exec=":kill" />
<exec_method timeout_seconds="60" type="method" name="refresh"
exec=":true" />
<property_group type="framework" name="startd">
<propval type="astring" name="duration" value="transient" />
<propval type="astring" name="duration" value="daemon" />
</property_group>
<instance enabled="true" name="default" />
<template>
Expand Down
5 changes: 4 additions & 1 deletion build/solaris/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ DIR=$(dirname "$(readlink -f "$0")")
BUILD_DIR=$($realpath "$DIR/..")
VERSION=$(cat $BUILD_DIR/../VERSION)
ARCH=$(arch)
if [[ $ARCH == "sun4" ]]; then
ARCH=sparc
fi

# Set up package info
sed "s/VERSION=.*/ARCH=$VERSION/" $DIR/pkginfo > $DIR/pkginfo.tmp
sed "s/VERSION=.*/VERSION=$VERSION/" $DIR/pkginfo > $DIR/pkginfo.tmp
sed "s/ARCH=.*/ARCH=$ARCH/" $DIR/pkginfo.tmp > $BUILD_DIR/pkginfo
rm -rf $DIR/pkginfo.tmp

Expand Down
4 changes: 2 additions & 2 deletions build/solaris/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
if [ -d /lib/svc/manifest/site ]; then
svcbundle -i -s service-name=site/ncpa_listener \
-s start-method='/usr/local/ncpa/ncpa_listener' \
-s stop-method='kill $(cat /usr/local/ncpa/var/run/ncpa_listener.pid)'
-s stop-method=':kill' -s duration='daemon'
svcbundle -i -s service-name=site/ncpa_passive \
-s start-method='/usr/local/ncpa/ncpa_passive' \
-s stop-method='kill $(cat /usr/local/ncpa/var/run/ncpa_passive.pid)'
-s stop-method=':kill' -s duration='daemon'
else
mv /usr/local/ncpa/ncpa_listener.xml /var/svc/manifest/site/ncpa_listener.xml
mv /usr/local/ncpa/ncpa_passive.xml /var/svc/manifest/site/ncpa_passive.xml
Expand Down