aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-01-22 19:10:52 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2009-01-22 19:10:52 +0100
commit46da91fb74eea70e758ee5e4cfecf0b1b46ef69f (patch)
tree477f5806f2b3065003593834314b5460a84b772d /sci-misc
parentMoar init fixups. (diff)
downloadsci-46da91fb74eea70e758ee5e4cfecf0b1b46ef69f.tar.gz
sci-46da91fb74eea70e758ee5e4cfecf0b1b46ef69f.tar.bz2
sci-46da91fb74eea70e758ee5e4cfecf0b1b46ef69f.zip
More updates.
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/boinc-bin/ChangeLog8
-rw-r--r--sci-misc/boinc-bin/boinc-bin-6.4.5.ebuild20
-rw-r--r--sci-misc/boinc-bin/boinc-bin-6.5.0.ebuild20
-rw-r--r--sci-misc/boinc-bin/files/boinc.init10
4 files changed, 27 insertions, 31 deletions
diff --git a/sci-misc/boinc-bin/ChangeLog b/sci-misc/boinc-bin/ChangeLog
index 6d1ca4290..6a6471708 100644
--- a/sci-misc/boinc-bin/ChangeLog
+++ b/sci-misc/boinc-bin/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> files/boinc.init,
+ boinc-bin-6.4.5.ebuild, boinc-bin-6.5.0.ebuild:
+ Moar init.d fixups.
+
+ 22 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> files/boinc.conf,
+ files/boinc.init, boinc-bin-6.4.5.ebuild, boinc-bin-6.5.0.ebuild:
+ Update initscripts and ebuilds a bit.
+
*boinc-bin-6.4.5 (21 Jan 2009)
21 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> +boinc-bin-6.5.0.ebuild:
diff --git a/sci-misc/boinc-bin/boinc-bin-6.4.5.ebuild b/sci-misc/boinc-bin/boinc-bin-6.4.5.ebuild
index 3a70b8784..4c552249c 100644
--- a/sci-misc/boinc-bin/boinc-bin-6.4.5.ebuild
+++ b/sci-misc/boinc-bin/boinc-bin-6.4.5.ebuild
@@ -56,27 +56,21 @@ done
src_unpack() {
local target
use x86 && target="i686" || target="x86_64"
- cp "${DISTDIR}"/${MY_PN}_${PV}_${target}-pc-linux-gnu.sh "${WORKDIR}"
+ cp "${DISTDIR}"/${MY_PN}_${PV}_${target}-pc-linux-gnu.sh "${WORKDIR}" \
+ || die "failed to prepare binary"
cd "${WORKDIR}"
- sh ${MY_PN}_${PV}_${target}-pc-linux-gnu.sh
- # patch up certificates
- mkdir "${S}"/curl/
- ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
+ sh ${MY_PN}_${PV}_${target}-pc-linux-gnu.sh &> /dev/null # annoying messages
}
src_install() {
- dodir /var/lib/${MY_PN}
newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN}
- # fix ${PN}.conf file for binary package
- sed -i \
- -e "s:/usr/bin/${MY_PN}_client:/opt/${MY_PN}/${MY_PN}:g" \
- "${D}"/etc/conf.d/${MY_PN} || die "sed failed"
+ # fancy X stuff
if use X; then
# icon
newicon "${S}"/${MY_PN}mgr.48x48.png ${MY_PN}.png
# desktop
- make_desktop_entry /opt/${MY_PN}/run_manager "${MY_PN}" ${MY_PN} "Education;Science" /var/lib/${MY_PN}
+ make_desktop_entry /opt/bin/boinc "${MY_PN}" ${MY_PN} "Education;Science" /var/lib/${MY_PN}
fi
# use correct path in scripts
sed -i \
@@ -86,19 +80,19 @@ src_install() {
# install binaries
exeopts -m0755
exeinto /opt/${MY_PN}
-
doexe "${S}"/{${MY_PN},${MY_PN}cmd,${MY_PN}mgr,run_manager}
fowners 0:${MY_PN} /opt/${MY_PN}/{${MY_PN},${MY_PN}cmd,${MY_PN}mgr,run_manager}
# symlink the important ones to the /opt/bin/
dosym /opt/${MY_PN}/run_manager /opt/bin/boinc
# locale
- mkdir -p "${D}"/opt/${MY_PN}/locale
insopts -m0644
insinto /opt/${MY_PN}/locale
cd "${S}"/locale/
for LNG in ${LINGUAS}; do
doins -r "${LNG}"
done
+ # certificates
+ dosym /etc/ssl/certs/ca-certificates.crt /opt/${MY_PN}/ca-bundle.crt
}
pkg_preinst() {
diff --git a/sci-misc/boinc-bin/boinc-bin-6.5.0.ebuild b/sci-misc/boinc-bin/boinc-bin-6.5.0.ebuild
index 3a70b8784..4c552249c 100644
--- a/sci-misc/boinc-bin/boinc-bin-6.5.0.ebuild
+++ b/sci-misc/boinc-bin/boinc-bin-6.5.0.ebuild
@@ -56,27 +56,21 @@ done
src_unpack() {
local target
use x86 && target="i686" || target="x86_64"
- cp "${DISTDIR}"/${MY_PN}_${PV}_${target}-pc-linux-gnu.sh "${WORKDIR}"
+ cp "${DISTDIR}"/${MY_PN}_${PV}_${target}-pc-linux-gnu.sh "${WORKDIR}" \
+ || die "failed to prepare binary"
cd "${WORKDIR}"
- sh ${MY_PN}_${PV}_${target}-pc-linux-gnu.sh
- # patch up certificates
- mkdir "${S}"/curl/
- ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
+ sh ${MY_PN}_${PV}_${target}-pc-linux-gnu.sh &> /dev/null # annoying messages
}
src_install() {
- dodir /var/lib/${MY_PN}
newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN}
- # fix ${PN}.conf file for binary package
- sed -i \
- -e "s:/usr/bin/${MY_PN}_client:/opt/${MY_PN}/${MY_PN}:g" \
- "${D}"/etc/conf.d/${MY_PN} || die "sed failed"
+ # fancy X stuff
if use X; then
# icon
newicon "${S}"/${MY_PN}mgr.48x48.png ${MY_PN}.png
# desktop
- make_desktop_entry /opt/${MY_PN}/run_manager "${MY_PN}" ${MY_PN} "Education;Science" /var/lib/${MY_PN}
+ make_desktop_entry /opt/bin/boinc "${MY_PN}" ${MY_PN} "Education;Science" /var/lib/${MY_PN}
fi
# use correct path in scripts
sed -i \
@@ -86,19 +80,19 @@ src_install() {
# install binaries
exeopts -m0755
exeinto /opt/${MY_PN}
-
doexe "${S}"/{${MY_PN},${MY_PN}cmd,${MY_PN}mgr,run_manager}
fowners 0:${MY_PN} /opt/${MY_PN}/{${MY_PN},${MY_PN}cmd,${MY_PN}mgr,run_manager}
# symlink the important ones to the /opt/bin/
dosym /opt/${MY_PN}/run_manager /opt/bin/boinc
# locale
- mkdir -p "${D}"/opt/${MY_PN}/locale
insopts -m0644
insinto /opt/${MY_PN}/locale
cd "${S}"/locale/
for LNG in ${LINGUAS}; do
doins -r "${LNG}"
done
+ # certificates
+ dosym /etc/ssl/certs/ca-certificates.crt /opt/${MY_PN}/ca-bundle.crt
}
pkg_preinst() {
diff --git a/sci-misc/boinc-bin/files/boinc.init b/sci-misc/boinc-bin/files/boinc.init
index 775a5c478..45fc82497 100644
--- a/sci-misc/boinc-bin/files/boinc.init
+++ b/sci-misc/boinc-bin/files/boinc.init
@@ -16,6 +16,7 @@ create_work_directory() {
eeror "Directory $RUNTIMEDIR could not be created!"
return 1
fi
+ ln -s /etc/ssl/certs/ca-certificates.crt $RUNTIMEDIR/ca-bundle.crt
fi
}
@@ -48,7 +49,7 @@ start() {
generate_logs
- if [ ${ALLOW_REMOTE_RPC} = "yes" ]; then
+ if [[ ${ALLOW_REMOTE_RPC} = "yes" ]]; then
ARGS="${ARGS} -allow_remote_gui_rpc"
fi
@@ -60,15 +61,14 @@ start() {
--exec ${BOINCBIN} --chuid ${USER}:${GROUP} \
--background --stdout ${LOGFILE} --stderr ${LOGFILE} \
--nicelevel ${NICELEVEL} -- ${ARGS}
- # FIXME: no logs here?
RESULT=$?
- if [ "${CPU_SHARE}" -a -d /sys/kernel/uids ]; then
+ if [[ "${CPU_SHARE}" -a -d /sys/kernel/uids ]]; then
BUID=`id -u ${USER}`
# It might take a moment for start-stop-daemon to chuid
- [ -d /sys/kernel/uids/${BUID} ] || sleep 5 # 5 was working always here
- if [ -w /sys/kernel/uids/${BUID}/cpu_share ]; then
+ [[ -d /sys/kernel/uids/${BUID} ]] || sleep 5 # 5 was working always here
+ if [[ -w /sys/kernel/uids/${BUID}/cpu_share ]]; then
echo ${CPU_SHARE} > /sys/kernel/uids/${BUID}/cpu_share
fi
fi