From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 394BA138010 for ; Fri, 29 Mar 2013 15:26:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92C30E0D20; Fri, 29 Mar 2013 15:26:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E276EE0D20 for ; Fri, 29 Mar 2013 15:26:54 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFE8F33BF5F for ; Fri, 29 Mar 2013 15:26:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 82C602171D; Fri, 29 Mar 2013 15:26:52 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: systemd-9999.ebuild ChangeLog X-VCS-Directories: sys-apps/systemd X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130329152652.82C602171D@flycatcher.gentoo.org> Date: Fri, 29 Mar 2013 15:26:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a2b308a-3889-4033-b396-734d5d0fdadb X-Archives-Hash: ef22646075664167de6fe8032de063e9 mgorny 13/03/29 15:26:52 Modified: systemd-9999.ebuild ChangeLog Log: Move udev executables to rootfs to avoid breaking the few systems which install systemd but aren't prepared for it. Symlink to the new locations for compat. (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) Revision Changes Path 1.32 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.32&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.32&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.31&r2=1.32 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- systemd-9999.ebuild 26 Mar 2013 22:02:45 -0000 1.31 +++ systemd-9999.ebuild 29 Mar 2013 15:26:52 -0000 1.32 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.31 2013/03/26 22:02:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.32 2013/03/29 15:26:52 mgorny Exp $ EAPI=5 @@ -152,6 +152,13 @@ udevlibexecdir="${MY_UDEVDIR}" \ dist_udevhwdb_DATA= + # keep udev working without initramfs, for openrc compat + dodir /sbin + mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die + mv "${D}"/usr/bin/udevadm "${D}"/sbin/udevadm || die + dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd + dosym ../../sbin/udevadm /usr/bin/udevadm + # zsh completion insinto /usr/share/zsh/site-functions newins shell-completion/systemd-zsh-completion.zsh "_${PN}" @@ -188,8 +195,12 @@ /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd # Check whether we won't break user's system. - [[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.' - [[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.' + local x + for x in /bin/systemd /usr/bin/systemd \ + /usr/bin/udevadm /usr/lib/systemd/systemd-udevd + do + [[ -x ${D}${x} ]] || die "${x} symlink broken, aborting." + done } pkg_preinst() { 1.103 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.103&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.103&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.102&r2=1.103 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- ChangeLog 28 Mar 2013 22:57:21 -0000 1.102 +++ ChangeLog 29 Mar 2013 15:26:52 -0000 1.103 @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.102 2013/03/28 22:57:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.103 2013/03/29 15:26:52 mgorny Exp $ + + 29 Mar 2013; Michał Górny systemd-9999.ebuild: + Move udev executables to rootfs to avoid breaking the few systems which + install systemd but aren't prepared for it. Symlink to the new locations for + compat. 28 Mar 2013; Mike Gilbert +files/199-firmware.patch, systemd-199.ebuild: