summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-10-14 06:32:13 +0000
committerJustin Lecher <jlec@gentoo.org>2013-10-14 06:32:13 +0000
commit28f799e1f5bec66e322200a9570b1f750832ca68 (patch)
treee53b02592dd10bf1fb3097ade3ddf4f7e741d0c7 /sys-kernel
parentEnhanced DESCRIPTION (#487908 by Jonas Stein) (diff)
downloadgentoo-2-28f799e1f5bec66e322200a9570b1f750832ca68.tar.gz
gentoo-2-28f799e1f5bec66e322200a9570b1f750832ca68.tar.bz2
gentoo-2-28f799e1f5bec66e322200a9570b1f750832ca68.zip
sys-kernel/aufs-sources: Bump to latest aufs3, linux and genpatches release
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/aufs-sources/ChangeLog8
-rw-r--r--sys-kernel/aufs-sources/aufs-sources-3.4.66.ebuild (renamed from sys-kernel/aufs-sources/aufs-sources-3.4.60.ebuild)26
2 files changed, 24 insertions, 10 deletions
diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 25b4dd195bb7..cec16a4e13f4 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-kernel/aufs-sources
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.63 2013/10/13 16:48:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.64 2013/10/14 06:32:13 jlec Exp $
+
+*aufs-sources-3.4.66 (14 Oct 2013)
+
+ 14 Oct 2013; Justin Lecher <jlec@gentoo.org> -aufs-sources-3.4.60.ebuild,
+ +aufs-sources-3.4.66.ebuild:
+ Bump to latest aufs3, linux and genpatches release
13 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs-sources-3.10.15.ebuild,
aufs-sources-3.11.4.ebuild, metadata.xml:
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.4.60.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.4.66.ebuild
index fef52591abf0..a0ab8af8bfb9 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.4.60.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.4.66.ebuild
@@ -1,36 +1,44 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.4.60.ebuild,v 1.1 2013/09/18 08:04:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.4.66.ebuild,v 1.1 2013/10/14 06:32:13 jlec Exp $
EAPI=5
ETYPE="sources"
K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="41"
+K_GENPATCHES_VER="47"
K_DEBLOB_AVAILABLE="1"
inherit kernel-2 eutils
detect_version
detect_arch
-AUFS_VERSION=3.4_p20130915
+AUFS_VERSION=3.4_p20131014
AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
KEYWORDS="~amd64 ~x86"
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob module proc"
+IUSE="deblob module proc vanilla"
DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}"
-
-UNIPATCH_LIST="
- "${WORKDIR}"/aufs3-kbuild.patch
- "${WORKDIR}"/aufs3-base.patch"
+SRC_URI="
+ ${KERNEL_URI}
+ ${ARCH_URI}
+ ${AUFS_URI}
+ !vanilla? ( ${GENPATCHES_URI} )
+ "
PDEPEND=">=sys-fs/aufs-util-3.2"
src_unpack() {
+ if use vanilla; then
+ unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+ ewarn "You are using USE=vanilla"
+ ewarn "This will drop all support from the gentoo kernel security team"
+ fi
+
+ UNIPATCH_LIST=""${WORKDIR}"/aufs3-kbuild.patch "${WORKDIR}"/aufs3-base.patch"
use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc_map.patch"
unpack ${AUFS_TARBALL}