From a52721f58d276c6c3fb55da748214ad701c65845 Mon Sep 17 00:00:00 2001 From: Wim Muskee Date: Sun, 11 Mar 2012 13:36:57 +0100 Subject: ltsp-server: version bump to 5.3.5 + changes to profile --- net-misc/ltsp-server/ChangeLog | 5 + net-misc/ltsp-server/Manifest | 4 +- net-misc/ltsp-server/ltsp-server-5.3.3.ebuild | 138 ------------------------- net-misc/ltsp-server/ltsp-server-5.3.5.ebuild | 141 ++++++++++++++++++++++++++ profiles/ChangeLog | 4 + profiles/ltsp/make.defaults | 2 +- profiles/ltsp/package.use | 3 + 7 files changed, 156 insertions(+), 141 deletions(-) delete mode 100644 net-misc/ltsp-server/ltsp-server-5.3.3.ebuild create mode 100644 net-misc/ltsp-server/ltsp-server-5.3.5.ebuild diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog index 0ae8a9e..777cf7c 100644 --- a/net-misc/ltsp-server/ChangeLog +++ b/net-misc/ltsp-server/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*ltsp-server-5.3.5 (11 03 2012) + + 11 03 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.5: + Version bump. + *ltsp-server-5.3.3 (28 02 2012) 28 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.3: diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest index 1b43696..11fcc83 100644 --- a/net-misc/ltsp-server/Manifest +++ b/net-misc/ltsp-server/Manifest @@ -4,6 +4,6 @@ AUX ltsp-server-5.2.18-quickstart.patch 444 RMD160 d24ad8deb657ed9087ff707c5c8be AUX ltsp-server-5.2.18-setstage.patch 678 RMD160 195f2a67352d4255917c157ef34798add1940aef SHA1 2572a93fbad8b5ba75f93c656e6146a6c73eaf68 SHA256 172842e76958c2086f57b7f2112018154ff9f8f62d2f786271923a2ba284edca EBUILD ltsp-server-5.2.18-r2.ebuild 2811 RMD160 6df6c6107f313a7825549d917a2641f556970648 SHA1 a37bcd633b14b854c82e055943bc48c66e37201e SHA256 fd82379585881cc94654899b1b9c737ba6cd08d86db18494d08b2486699014d8 EBUILD ltsp-server-5.2.19.ebuild 3284 RMD160 86733ed44faed433ab7b975b60cb868576c1ad51 SHA1 9acb91ba3f0f32a2f8a13f618ed3054e10f243e9 SHA256 bcf8cfd2ff2b12d0825ca6800356deb8cec6fdfd0acd2acd080730a7be64b1a3 -EBUILD ltsp-server-5.3.3.ebuild 3259 RMD160 2b3dd0fd6a2ce087b45f5278455cd2aa36bf370f SHA1 0f88a8514963c0bef2022dd79775cc88000d6779 SHA256 fefa43802a1d1825b017226dab4b07e98a201cf2c52e21f8170a3e36483c3143 -MISC ChangeLog 4821 RMD160 210a86a8ad51e19b16bb5c1f2180727cd65258e4 SHA1 c80dddd344e26614769d606b46a9bee556891473 SHA256 4e33cef68406d6f36841820dea4de8915ff762544a92babaf16f0de30b39218f +EBUILD ltsp-server-5.3.5.ebuild 3326 RMD160 80ca529f523515ad0573258db0a4db5a56ba11b2 SHA1 be85044147c4f56eb4da5460017101e607f55ac8 SHA256 79117618d3982ccbe3e904251533d9e9b29c182c799cc862982693b0dd056dda +MISC ChangeLog 4935 RMD160 0955bc8e809d4bd55a297bb1a99631ecc95fa8b0 SHA1 d24540354c769b7d2796b90fbc48f55f1c452bff SHA256 6e1e249e9d54dcab540b50919d608d07c7fc863713545477fd513a0e74c42eaa MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e diff --git a/net-misc/ltsp-server/ltsp-server-5.3.3.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.3.ebuild deleted file mode 100644 index 1cc0af5..0000000 --- a/net-misc/ltsp-server/ltsp-server-5.3.3.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -EBZR_REVISION="2114" -EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk" - -inherit bzr - -DESCRIPTION="LTSP server" -HOMEPAGE="http://www.ltsp.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# Default to nfs until nbd works -IUSE="doc dhcp examples nbd +nfs" -DEPEND="" - -# NOTES on the dependencies -# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession -# iproute2 - ltsp-update-sshkeys requires ip -RDEPEND="!net-misc/ltsp-client - x11-apps/xdm - media-sound/pulseaudio - x11-base/xorg-server - net-misc/openssh - virtual/tftp - dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) ) - nfs? ( - >net-fs/nfs-utils-1.1.5 - ) - nbd? ( - sys-apps/xinetd - sys-block/nbd - sys-fs/squashfs-tools - ) - sys-fs/ltspfs - sys-apps/lsb-release - >sys-apps/quickstart-0.6 - sys-apps/iproute2 - >=app-portage/layman-1.3 - sys-boot/syslinux - net-misc/ldminfod" - -src_unpack() { - bzr_src_unpack -} - -src_install() { - ltspdir="/usr/share/ltsp" - - insinto /etc/ltsp/profiles - doins server/configs/Gentoo/*.profile - dosym quickstart-5.2.profile /etc/ltsp/profiles/quickstart.profile - dosym kicktoo-5.2.profile /etc/ltsp/profiles/kicktoo.profile - - insinto ${ltspdir} - doins ltsp-common-functions - - insinto ${ltspdir}/plugins - doins -r server/plugins/* - - insinto /etc/ltsp - doins server/configs/Gentoo/ltsp-build-client.conf - - dobin localapps/ltsp-localapps - - dosbin server/ltsp-info - dosbin server/ltsp-keys - dosbin server/ltsp-build-client - dosbin server/ltsp-update-kernels - dosbin server/ltsp-update-sshkeys - dosbin server/scripts/debian/ltsp-chroot - - doman 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 - - if use nbd; then - dosbin server/ltsp-update-image - dosbin server/ltsp-swapfile-delete - dosbin server/nbdrootd - dosbin server/nbdswapd - - insinto /etc/xinetd.d - doins server/xinetd.d/nbd* - - insinto /etc/ltsp - doins server/configs/nbdswapd.conf - - doman server/doc/ltsp-update-image.8 - doman server/doc/nbdrootd.8 - doman server/doc/nbdswapd.8 - fi - - if use doc; then - dodoc TODO - dodoc server/doc/CodingStyle - dodoc server/doc/QuickInstall - dodoc server/doc/lts-parameters.txt - dodoc server/doc/plugins - dodoc server/doc/swap - fi - - if use examples; then - docinto examples - dodoc localapps/doc/examples/* - dodoc server/doc/examples/* - fi -} - -pkg_postinst(){ - einfo - 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 5.2 client." - einfo - einfo "Starting from ltsp-server-5.2.19, the default install" - einfo "architecture is i686, instead of x86. To keep using" - einfo "your binary packages, rename the arch dirs in the portage" - einfo "package dir accordingly." - - if use nbd; then - einfo - einfo "Only NFS is supported for mounting the client chroot." - einfo "Mounting swap over NBD is supported." - fi - - einfo - einfo "Don't forget to install a window manager," - einfo "you can't log in to your ltsp-client without one." -} - diff --git a/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild new file mode 100644 index 0000000..3058c71 --- /dev/null +++ b/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +EBZR_REVISION="2136" +EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk" + +inherit bzr + +DESCRIPTION="LTSP server" +HOMEPAGE="http://www.ltsp.org/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# Default to nfs until nbd works +IUSE="doc dhcp examples nbd +nfs" +DEPEND="" + +# NOTES on the dependencies +# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession +# iproute2 - ltsp-update-sshkeys requires ip +RDEPEND="!net-misc/ltsp-client + x11-apps/xdm + media-sound/pulseaudio + x11-base/xorg-server + net-misc/openssh + virtual/tftp + dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) ) + nfs? ( + >net-fs/nfs-utils-1.1.5 + ) + nbd? ( + sys-apps/xinetd + sys-block/nbd + sys-fs/squashfs-tools + ) + sys-fs/ltspfs + sys-apps/lsb-release + >sys-apps/quickstart-0.6 + sys-apps/iproute2 + >=app-portage/layman-1.3 + sys-boot/syslinux + net-misc/ldminfod" + +src_unpack() { + bzr_src_unpack +} + +src_install() { + ltspdir="/usr/share/ltsp" + + # executables + dobin localapps/ltsp-localapps + dosbin server/ltsp-info + dosbin server/ltsp-keys + dosbin server/ltsp-build-client + dosbin server/ltsp-update-kernels + dosbin server/ltsp-update-sshkeys + dosbin server/scripts/debian/ltsp-chroot + + # plugins and libraries + insinto ${ltspdir} + doins ltsp-common-functions + + insinto ${ltspdir}/plugins + doins -r server/plugins/* + + # configuration + insinto /etc/ltsp + doins server/configs/Gentoo/ltsp-build-client.conf + + insinto /etc/ltsp/profiles + doins server/configs/Gentoo/*.profile + dosym quickstart-5.2.profile /etc/ltsp/profiles/quickstart.profile + dosym kicktoo-5.2.profile /etc/ltsp/profiles/kicktoo.profile + + # man pages + doman 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 + + if use nbd; then + dosbin server/ltsp-update-image + dosbin server/ltsp-swapfile-delete + dosbin server/nbdrootd + dosbin server/nbdswapd + + insinto /etc/xinetd.d + doins server/xinetd.d/nbd* + + insinto /etc/ltsp + doins server/configs/nbdswapd.conf + + doman server/doc/ltsp-update-image.8 + doman server/doc/nbdrootd.8 + doman server/doc/nbdswapd.8 + fi + + if use doc; then + dodoc TODO + dodoc server/doc/CodingStyle + dodoc server/doc/QuickInstall + dodoc server/doc/lts-parameters.txt + dodoc server/doc/plugins + dodoc server/doc/swap + fi + + if use examples; then + docinto examples + dodoc localapps/doc/examples/* + dodoc server/doc/examples/* + fi +} + +pkg_postinst(){ + einfo + 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 5.2 client." + einfo + einfo "Starting from ltsp-server-5.2.19, the default install" + einfo "architecture is i686, instead of x86. To keep using" + einfo "your binary packages, rename the arch dirs in the portage" + einfo "package dir accordingly." + + if use nbd; then + einfo + einfo "Only NFS is supported for mounting the client chroot." + einfo "Mounting swap over NBD is supported." + fi + + einfo + einfo "Don't forget to install a window manager," + einfo "you can't log in to your ltsp-client without one." +} + diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 76e7456..a54f24f 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Mar 2012; Wim Muskee + ltsp/: + Add -news feature and -zlib USE for pciutils. + 02 Mar 2012; Wim Muskee ltsp/: Add client use to ltspfs. diff --git a/profiles/ltsp/make.defaults b/profiles/ltsp/make.defaults index 91feb4b..281adf7 100644 --- a/profiles/ltsp/make.defaults +++ b/profiles/ltsp/make.defaults @@ -2,5 +2,5 @@ EMERGE_DEFAULT_OPTS="--usepkg --buildpkg" CONFIG_PROTECT_MASK="/etc /etc/conf.d /etc/init.d" CLEAN_DELAY="0" EMERGE_WARNING_DELAY="0" -FEATURES="${FEATURES} nodoc noinfo" +FEATURES="${FEATURES} nodoc noinfo -news" USE="${USE} alsa pulseaudio svg xml X -cups" diff --git a/profiles/ltsp/package.use b/profiles/ltsp/package.use index e599729..84d84af 100644 --- a/profiles/ltsp/package.use +++ b/profiles/ltsp/package.use @@ -1,6 +1,9 @@ # req by pulseaudio sys-fs/udev extras hwdb +# req by udev +sys-apps/pciutils -zlib + # req by xorg-server dev-libs/libxml2 python -- cgit v1.2.3-65-gdbad