From: "Wim Muskee" <wimmuskee@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/
Date: Sun, 17 Feb 2013 10:14:00 +0000 (UTC) [thread overview]
Message-ID: <1361096021.57ee9e9120064a3fe68cd42fd89714200f309251.wim@gentoo> (raw)
commit: 57ee9e9120064a3fe68cd42fd89714200f309251
Author: Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Sun Feb 17 10:13:41 2013 +0000
Commit: Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Sun Feb 17 10:13:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=57ee9e91
ltsp-server: bump to 5.4.5, add nls support and build time man page generation
---
net-misc/ltsp-server/ChangeLog | 7 +-
net-misc/ltsp-server/Manifest | 5 +-
...erver-5.4.3.ebuild => ltsp-server-5.4.5.ebuild} | 112 +++++++++++--------
3 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index c0375fc..b0910f1 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for net-misc/ltsp-server
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ltsp-server-5.4.5 (17 02 2013)
+
+ 17 02 2013; Wim Muskee wimmuskee@gmail.com ltsp-server-5.4.5:
+ Version bump.
+
12 08 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.4.4:
Stable for amd64 and x86.
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index b36be50..ba43a9e 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,5 +1,6 @@
DIST ltsp-5.4.4.tar.xz 198148 SHA256 1e79fc23708573b1da7088a11073636bb0ebd06fa976a329ca8f4a659b38ea55 SHA512 2dd6b2a1975cb2526c636bb0b36384308dfa25706a0e480f1dd911279618e592a60ed415d2ae59811391f50f1317d09f9c316b017cfc62c46ebc89b4a98f0067 WHIRLPOOL 4a4757b29d8b49114ec0958015d841a214cf990b55f8af0c6a15bd7e8b7bc1baa113331846d58a07d17801899b0c8928cc9237cb032569308003eb00e6c93390
-EBUILD ltsp-server-5.4.3.ebuild 3866 SHA256 bb414c243f16789c8b7652fd0c26cc0837e746f9f21000186391ad3f5841f5f6 SHA512 6177738ffad8add2ee9de4643ed2af158c15f23227e7e6068c7f2546b378dcaee9bce46f90e28eff1e92800a80998c472c2b6a53725fd4d95d476f45aed9b2ef WHIRLPOOL 4b25983846e81d93ffb1457c5a2421f4fc2dff6c767a099f49eaed8ebf936b1e2305931f21be3d536e03c480acc6150264b5c07586ce61a6570b99b098af6379
+DIST ltsp-5.4.5.tar.xz 208532 SHA256 027eb66c49bfeb0fce7521cf8646f8e5d1f494181cca9456dddae3aff62a6e9e SHA512 540a6b0f8271c0eff555300673043dc4adb6ce3c60138985313355351f7b6b260808911d075e2864edb9538579a84f60eac27b1d0881027c48f3b978898b5300 WHIRLPOOL fc9f7e6d767e1185a030cf0b42b82a3f066a3c1832c26455b280d8c216d4492b31fcae2d08b6ef80f7452d39376ea01c920bbe8ad37fbb94e2f65a55e7c8dc17
EBUILD ltsp-server-5.4.4.ebuild 3836 SHA256 b53a438d5a13e2ae1c02f6350dc7d3c636e001ad84fbc3b880f7ab6fcf5b0185 SHA512 881a6d836c26188672b475a8c727782b528739e1f6cb4d83097a12cbb060dc1f89ffdb1fe9191c01ef7ac678b0659563a52d4b98bb58f8b2b842c81694839438 WHIRLPOOL cdb09b082a93996a6877cb6cdac93fc3d7a191647087640609fadc16f6bfd8fa4e328d75283341cb97996d609a5df818b04383a43ed5e6a4b661ac21caac4999
-MISC ChangeLog 6769 SHA256 140d6a187f14602d01172fb58d1d0fc616a9604eff5a91c3b5b03de1ccab8f06 SHA512 64eb708ed5dd10c2c5c703ab6c41a7ff2185b41f64031656bde4e96bbdf611d92d8cf2dd2e824bf7cc6e4765b9a97245466878116910f6c21f954d93fdcdafdd WHIRLPOOL ecb387d734ad0f24638fa931893cac0f76865114d8ac879dbeff8f645d8ec1290432e57b8da1ab102dafc24b2dded5ddad48b896416e193f20ebf8a4b61e3bcc
+EBUILD ltsp-server-5.4.5.ebuild 4094 SHA256 8ab4318d7f9d0a05575aa477409f7b4445a8e864e73436325f7817b8df59e89f SHA512 a8587d2d2325069ccb67ec75922af8db7058db6cbf2d0416b337f555643448d3efdb97c2785c3b9c91f03a3ec1fa54feac242877c40aefb27d658d92c81bc847 WHIRLPOOL 1db97fc02f9d7d8a799eeacffdd73c7f028573a7121259400ba8da66ae3be787df454ed12dfdf3b853abaf209a5ab4f7c2092811dc627ec1ec91f1cc9a232cdf
+MISC ChangeLog 6883 SHA256 8b631c2765239ba66ba1ed81229938a20830844c633f9250178924508d7f3abc SHA512 2cb9750c0d9eba74613de4934a0ff6bbe04a300caa60ef19f75111d60bf5aab5b13b463d1ac289a82286bce5fdfa6b536e020aaace11d17445757dc3af4105d4 WHIRLPOOL 4f1439804041357820d44c804d72fb0a38d3f37f0039da1310708bf036631b144c2670966973c870d631e97c78fe29463d9a0350fa7e4cf48c38902722b99b7a
MISC metadata.xml 528 SHA256 4adb661e3ac65b7092ff1360b903e0cfb4039ad305bf08102f16f0a689db1b4c SHA512 5fb79d5101906c1cdfd6cce2543f0e18f10964bb98186aa9b2166d33e917a7878a0eb1ad67d7ef4dfffb83c12cca7bd804f866bba70a201a3e17c8647256c348 WHIRLPOOL 0a9fa3c88a3c817aff74fb5f0cf78bfdf50cac6d0647b0a1fc8ad469539fccea8dcaf16b7e4653b59e1e655c1bb3074c4f9cd6b1a34d4f9c780a0b50d87899c2
diff --git a/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild b/net-misc/ltsp-server/ltsp-server-5.4.5.ebuild
similarity index 57%
rename from net-misc/ltsp-server/ltsp-server-5.4.3.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.4.5.ebuild
index 6f076e2..b22af0c 100644
--- a/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.4.5.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="4"
-EBZR_REVISION="2384"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-inherit bzr
+inherit autotools eutils
DESCRIPTION="LTSP server"
HOMEPAGE="http://www.ltsp.org/"
+SRC_URI="https://launchpad.net/ltsp/ltsp-trunk/${PV}/+download/ltsp-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-# Default to nfs until nbd works
-IUSE="doc dhcp examples nbd +nfs +pulseaudio +X"
-DEPEND=""
-
-# NOTES on the dependencies
+RESTRICT="mirror"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dhcp examples nbd nfs nls +pulseaudio +X"
+REQUIRED_USE="|| ( nbd nfs )"
+# lsb-release - required in the help2man man page generation
+DEPEND="sys-apps/lsb-release
+ nls? ( sys-devel/gettext )"
# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession
# iproute2 - ltsp-update-sshkeys requires ip
RDEPEND="net-misc/openssh
@@ -28,8 +27,9 @@ RDEPEND="net-misc/openssh
>net-fs/nfs-utils-1.1.5
)
nbd? (
+ >=sys-apps/kicktoo-0.4.4-r2
sys-apps/xinetd
- sys-block/nbd
+ >=sys-block/nbd-2.9.18
sys-fs/squashfs-tools
)
pulseaudio? (
@@ -40,15 +40,27 @@ RDEPEND="net-misc/openssh
x11-base/xorg-server
)
sys-fs/ltspfs
- sys-apps/lsb-release
- || ( >sys-apps/quickstart-0.6 >=sys-apps/kicktoo-0.4.3 )
+ || ( >=sys-apps/kicktoo-0.4.4-r2 >sys-apps/quickstart-0.6 )
sys-apps/iproute2
>=app-portage/layman-1.3
sys-boot/syslinux
net-misc/ldminfod"
+S=${WORKDIR}/ltsp
+
-src_unpack() {
- bzr_src_unpack
+src_prepare() {
+ pushd server/man
+ eautoreconf
+ popd
+
+ # remove ALTLinux translations, we don't need them
+ use nls && rm -rf server/ALTLinux/configs/po
+}
+
+src_configure() {
+ pushd server/man
+ ./configure --prefix="${D}/usr" || die "Could not configure manpages"
+ popd
}
src_install() {
@@ -87,16 +99,23 @@ src_install() {
dosym quickstart-5.3.profile ${ltspconf}/profiles/quickstart.profile
dosym kicktoo-5.3.profile ${ltspconf}/profiles/kicktoo.profile
+ # examples for ltsp-config
+ docinto examples
+ dodoc server/doc/examples/ltsp-server-dnsmasq.conf
+ dodoc server/configs/lts.conf
+ dodoc server/configs/dhcpd.conf
+ dosym ${P} /usr/share/doc/ltsp-server
+ docinto ""
+
# man pages
doman client/localapps/doc/ltsp-localapps.1
- doman server/doc/ltsp-build-client.8
- doman server/doc/ltsp-info.1
- doman server/doc/ltsp-update-kernels.8
- doman server/doc/ltsp-update-sshkeys.8
- doman server/doc/ltsp-chroot.8
- doman server/doc/ltsp-config.8
-
- if use nbd; then
+
+ pushd server/man
+ emake install || die "Could not make manpages"
+ popd
+
+
+ if use nbd; then
dosbin server/ltsp-update-image
dosbin server/ltsp-swapfile-delete
dosbin server/nbdswapd
@@ -106,46 +125,45 @@ src_install() {
insinto ${ltspconf}
doins server/configs/nbdswapd.conf
+ doins server/configs/nbd-server.allow
+ fi
- doman server/doc/ltsp-update-image.8
- doman server/doc/nbdswapd.8
- fi
+ if use nls; then
+ pushd po
+ emake DESTDIR="${D}" install || die "Could not make po files"
+ popd
+ fi
- if use doc; then
+ if use doc; then
dodoc common/doc/CodingStyle
dodoc server/doc/plugins
fi
if use examples; then
- docinto examples
- dodoc client/localapps/doc/examples/*
- dodoc server/doc/examples/ltsp-server-dnsmasq.conf
+ dodoc -r client/localapps/doc/examples
fi
}
pkg_postinst(){
- ewarn
- ewarn "You can choose to install a 5.2 or a 5.3+ client by pointing"
- ewarn "to it's appropriate build profile in /etc/ltsp/profiles."
- ewarn "Although not stable, the default is set to a 5.3+ client."
+ einfo "You can choose to install a 5.2 or a 5.3+ client by pointing"
+ einfo "to it's appropriate build profile in /etc/ltsp/profiles."
+ einfo "The default is set to a stable 5.3+ client."
if use nbd; then
einfo
- einfo "Only NFS is supported for mounting the client chroot."
- einfo "Mounting swap over NBD is supported."
+ einfo "An NBD bootable client can be built by setting"
+ einfo "INITRAMFS_BUILDER=\"dracut\"."
fi
-
+
+ if use nfs; then
+ einfo
+ einfo "An NFS bootable client can be built by setting"
+ einfo "INITRAMFS_BUILDER=\"genkernel\" or omitting this option."
+ fi
+
if use X; then
einfo
einfo "Don't forget to install a window manager,"
einfo "you can't log in with X onto your server without one."
fi
-
- ewarn
- ewarn "In line with upstream, the ltsp-update-kernels tool now also"
- ewarn "removes old boot files from the tftpdir. It removes all"
- ewarn "default genkernel generated filenames for which the version"
- ewarn "is different from the chroot kernel. For details, look at"
- ewarn "/usr/share/ltsp/ltsp-update-kernels-functions"
}
-
next reply other threads:[~2013-02-17 10:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-17 10:14 Wim Muskee [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-09 10:08 [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/ Wim Muskee
2012-11-24 10:23 Wim Muskee
2012-08-23 19:57 Wim Muskee
2012-08-23 19:57 Wim Muskee
2012-06-28 16:41 Wim Muskee
2012-06-16 9:14 Wim Muskee
2012-06-02 7:39 Wim Muskee
2012-05-08 14:54 Wim Muskee
2012-04-04 6:10 Wim Muskee
2012-03-11 21:32 Wim Muskee
2012-02-28 17:50 Wim Muskee
2012-02-17 16:59 Wim Muskee
2011-12-31 16:11 Wim Muskee
2011-12-29 21:02 Wim Muskee
2011-12-18 11:32 Wim Muskee
2011-10-13 17:26 Wim Muskee
2011-08-12 15:27 Wim Muskee
2011-08-02 17:11 Wim Muskee
2011-07-08 18:43 Wim Muskee
2011-03-24 17:48 Wim Muskee
2011-03-23 17:59 Wim Muskee
2011-03-22 18:29 Wim Muskee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361096021.57ee9e9120064a3fe68cd42fd89714200f309251.wim@gentoo \
--to=wimmuskee@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox