diff options
| author |   Martin Väth <martin@mvath.de> | 2010-11-21 21:45:30 +0100 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:46:20 +0200 |
| commit | be40c91d8d283fb8a9edabc2d6ac4f590e94e6a1 (patch) | |
| tree | 495a15b89e1a1ea7be56236ea4adbcfcd3cfacf0 /sys-fs | |
| parent | Remove ccache, since ccache-3.1.1 is now in the portage tree (diff) | |
| download | mv-be40c91d8d283fb8a9edabc2d6ac4f590e94e6a1.tar.gz mv-be40c91d8d283fb8a9edabc2d6ac4f590e94e6a1.tar.bz2 mv-be40c91d8d283fb8a9edabc2d6ac4f590e94e6a1.zip | |
Bump aufs2 to aufs2.1. Bump compcache-tools for kernel 2.6.36
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/aufs2/ChangeLog | 4 | ||||
| -rw-r--r-- | sys-fs/aufs2/Manifest | 4 | ||||
| -rw-r--r-- | sys-fs/aufs2/aufs2-99999999.ebuild | 24 |
3 files changed, 17 insertions, 15 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 8c95518d..c242e80b 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header $ + 21 Nov 2010; Martin Väth <martin@mvath.de> + Default to aufs2.1. Do not install broken Kbuild files. + Call epatch only once with collected list of patches. + 23 Aug 2010; Martin Väth <martin@mvath.de> Fix treatment of EGIT_PRUNE. Bump EAPI. diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest index 37643509..5413b54e 100644 --- a/sys-fs/aufs2/Manifest +++ b/sys-fs/aufs2/Manifest @@ -1,3 +1,3 @@ -EBUILD aufs2-99999999.ebuild 3908 RMD160 a5209236317c45509cba809f02296e651e2fd579 SHA1 4bda361d992d9b0fd326acf5e1d660c94110fd73 SHA256 3388be69e6208018f6fef208d44fa42f016fe5b8a6ab13c4aca509220e9ee0d9 -MISC ChangeLog 1137 RMD160 9bcc019bfc741067d64aee92bc19476c2c55c86f SHA1 7b7281d903a6951b79cee6ee2b2f60b97a4f3121 SHA256 443d29f4384c6585a8931f9e4be722920940630f7d91fd137b6cbd6d74940932 +EBUILD aufs2-99999999.ebuild 3976 RMD160 ed28d72dda0cd3c873f6a7e84eee2ecc766c2b99 SHA1 d4e31085a37ec043bf93b09f4a417d633231b054 SHA256 7a78281d5d54c3346292c933967fe1ab9a1224de395bbcb125420f0dbfdf87cc +MISC ChangeLog 1316 RMD160 f3dc590441c43da9e4dc71d0a9798f815688a18d SHA1 5bd0523283ab0d9f1508682da68aac881eca3c17 SHA256 a9253d56b16cfa8c645ccc8b44cd579105981d706f08a4e3256d88a0a2a81768 MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d diff --git a/sys-fs/aufs2/aufs2-99999999.ebuild b/sys-fs/aufs2/aufs2-99999999.ebuild index d7b806d4..41307d86 100644 --- a/sys-fs/aufs2/aufs2-99999999.ebuild +++ b/sys-fs/aufs2/aufs2-99999999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header $ EAPI="3" EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git" EGIT_PROJECT="aufs2" # BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version) -EGIT_BRANCH="aufs2" -EGIT_COMMIT="aufs2" +EGIT_BRANCH="aufs2.1" +EGIT_COMMIT="${EGIT_BRANCH}" [ -n "${EGIT_OFFLINE:-${ESCM_OFFLINE}}" ] || EGIT_PRUNE=true inherit git linux-info eutils @@ -44,14 +44,15 @@ pkg_setup() { if [ -n "${AUFS2BRANCH}" ] then EGIT_BRANCH="${AUFS2BRANCH}" - else [ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2-${KV_PATCH}" + else [ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.1-${KV_PATCH}" fi elog elog "Using aufs2 branch: ${EGIT_BRANCH}" elog "If this guess for the branch is wrong, set AUFS2BRANCH." - elog "For example, to use the aufs2 branch for kernel version 2.6.30, use:" - elog " AUFS2BRANCH=aufs2-30 emerge -1 aufs2" - elog "For the most current kernel it might be necessary to use" + elog "For example, to use the aufs2.1 branch for kernel version 2.6.36, use:" + elog " AUFS2BRANCH=aufs2.1-36 emerge -1 aufs2" + elog "For the most current kernel it might be necessary to use one of" + elog " AUFS2BRANCH=aufs2.1 emerge -1 aufs2" elog " AUFS2BRANCH=aufs2 emerge -1 aufs2" msg='' [ -n "${ESCM_OFFLINE}" ] && msg="${msg} ESCM_OFFLINE=''" @@ -102,6 +103,7 @@ src_install() { dodir "${k}/fs/aufs" cp -pPR -- fs/aufs/* "${dk}/fs/aufs" cp -pPR -- include "${dk}" + find "${dk}"/include -name Kbuild -type f -exec rm -v -- '{}' ';' if use doc && test -e Documentation then cp -pPR -- Documentation "${dk}" @@ -116,7 +118,6 @@ src_install() { } pkg_postinst() { - local i [ "${#my_patchlist[@]}" -eq 0 ] && { cd -- "${KV_DIR}" >/dev/null 2>&1 && for i in *.patch *.diff do test -f "${i}" && my_patchlist+=("${i}") @@ -125,10 +126,7 @@ pkg_postinst() { if use kernel-patch then cd -- "${KV_DIR}" >/dev/null 2>&1 || die "cannot cd to ${KV_DIR}" - for i in "${my_patchlist[@]}" - do test -f "${i}" || continue - use kernel-patch && epatch "${i}" - done + use kernel-patch && epatch "${my_patchlist[@]}" elog "Your kernel has been patched. Cleanup and recompile it, selecting" else elog "You will have to apply the following patch to your kernel:" |