diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-29 13:11:14 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-29 13:11:14 +0000 |
| commit | bfa73256ac98da4e94954c46552ac0a5a5139ec7 (patch) | |
| tree | c74e0f34adfebea9f6aeb447d9f640f40b1afee3 /sys-freebsd | |
| parent | Version bump. (diff) | |
| download | gentoo-2-bfa73256ac98da4e94954c46552ac0a5a5139ec7.tar.gz gentoo-2-bfa73256ac98da4e94954c46552ac0a5a5139ec7.tar.bz2 gentoo-2-bfa73256ac98da4e94954c46552ac0a5a5139ec7.zip | |
Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild | 24 |
2 files changed, 11 insertions, 18 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 1d83b1ed4ec3..58fdb6db150b 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.81 2013/01/27 22:21:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.82 2013/01/29 13:11:14 aballier Exp $ + + 29 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.1.ebuild: + Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH 27 Jan 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-sources-9.1_rc1.ebuild, -freebsd-sources-9.1_rc2.ebuild, diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild index 23f06d93ee73..1dcf6dbba18d 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild,v 1.1 2013/01/27 21:28:20 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild,v 1.2 2013/01/29 13:11:14 aballier Exp $ inherit bsdmk freebsd flag-o-matic DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" +SLOT="${RV}" KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="symlink" @@ -19,10 +19,6 @@ RESTRICT="strip binchecks" S="${WORKDIR}/sys" -MY_PVR="${PVR}" - -[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" - PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-9.1-gentoo.patch" "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" @@ -59,27 +55,21 @@ src_compile() { } src_install() { - insinto "/usr/src/sys-${MY_PVR}" + insinto "/usr/src/sys-${RV}" doins -r "${S}/"* } pkg_postinst() { if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ + einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..." + ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \ eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - # just in case... - [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." elif use symlink; then einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." - rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ + rm "${ROOT}/usr/src/sys" || \ eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ + ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \ eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." fi if use sparc-fbsd ; then |