1 |
commit: acdb79aa45f78d7d2fe9592d7d352bdf59c2ac3e |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 19 07:53:51 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 19 08:18:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdb79aa |
7 |
|
8 |
sys-fs/aufs3: Bump to latest aufs release |
9 |
|
10 |
* Bump to EAPI=6 |
11 |
* Try to wrap lines at 80 chars |
12 |
|
13 |
Package-Manager: portage-2.2.27 |
14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
15 |
|
16 |
sys-fs/aufs3/Manifest | 2 +- |
17 |
...3_p20160215.ebuild => aufs3-3_p20160219.ebuild} | 65 +++++++++++++--------- |
18 |
2 files changed, 40 insertions(+), 27 deletions(-) |
19 |
|
20 |
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest |
21 |
index 7f063bb..928212f 100644 |
22 |
--- a/sys-fs/aufs3/Manifest |
23 |
+++ b/sys-fs/aufs3/Manifest |
24 |
@@ -1,2 +1,2 @@ |
25 |
DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153 |
26 |
-DIST aufs3-standalone-3_p20160215.tar.xz 3220152 SHA256 e1e468e799826a128ab9ffb5b15dade4c721a4703ffff522f305de91d7b81489 SHA512 ff57fe257575bd217622b408e89daaff1dad0954c2c0a599d4d4117f190a0b59aee9ac9c39f9b6d820604108fa2643d84833e78848cc12e0ea4b84e0dd9e9c7a WHIRLPOOL fa1037e6411c928b99e92e75a7b11aeb5acc0e5c31c45c05cdf21f3368f75fa4ccca199687964fb61ee50927a9df274ea624ea7b363600a4a943cfc171a417cc |
27 |
+DIST aufs3-standalone-3_p20160219.tar.xz 3256736 SHA256 23652c6d8fd12a9a29454293f13add7e0f97f2ec542b69e5dfecbc99064c4247 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af WHIRLPOOL 1ed7042c9e1e8efc29fa36fcbd2f09a10ffa51cc9d6b349869f6f6947ed27399deb2fa1035df7dbaf69dcbfa7eddb6f240b934a343732ace26f77bcf2e72167a |
28 |
|
29 |
diff --git a/sys-fs/aufs3/aufs3-3_p20160215.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild |
30 |
similarity index 74% |
31 |
rename from sys-fs/aufs3/aufs3-3_p20160215.ebuild |
32 |
rename to sys-fs/aufs3/aufs3-3_p20160219.ebuild |
33 |
index e98fe7f..73a014f 100644 |
34 |
--- a/sys-fs/aufs3/aufs3-3_p20160215.ebuild |
35 |
+++ b/sys-fs/aufs3/aufs3-3_p20160219.ebuild |
36 |
@@ -2,9 +2,9 @@ |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
# $Id$ |
39 |
|
40 |
-EAPI=5 |
41 |
+EAPI=6 |
42 |
|
43 |
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs |
44 |
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs |
45 |
|
46 |
AUFS_VERSION="${PV%%_p*}" |
47 |
# highest branch version |
48 |
@@ -12,7 +12,7 @@ PATCH_MAX_VER=19 |
49 |
# highest supported version |
50 |
KERN_MAX_VER=20 |
51 |
# lowest supported version |
52 |
-KERN_MIN_VER=14 |
53 |
+KERN_MIN_VER=18 |
54 |
|
55 |
DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
56 |
HOMEPAGE="http://aufs.sourceforge.net/" |
57 |
@@ -42,13 +42,16 @@ pkg_setup() { |
58 |
use nfs && CONFIG_CHECK+=" EXPORTFS" |
59 |
use fuse && CONFIG_CHECK+=" ~FUSE_FS" |
60 |
use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" |
61 |
- use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" |
62 |
+ use pax_kernel && CONFIG_CHECK+=" PAX" \ |
63 |
+ && ERROR_PAX="Please use hardened sources" |
64 |
|
65 |
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system |
66 |
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
67 |
+ # this is needed so merging a binpkg ${PN} is |
68 |
+ # possible w/out a kernel unpacked on the system |
69 |
+ [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return |
70 |
|
71 |
get_version |
72 |
- kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade." |
73 |
+ kernel_is lt 3 ${KERN_MIN_VER} 0 && \ |
74 |
+ die "the kernel version isn't supported by upstream anymore. Please upgrade." |
75 |
kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" |
76 |
|
77 |
linux-mod_pkg_setup |
78 |
@@ -76,19 +79,30 @@ pkg_setup() { |
79 |
;; |
80 |
esac |
81 |
|
82 |
- pushd "${T}" &> /dev/null |
83 |
+ pushd "${T}" &> /dev/null || die |
84 |
unpack ${A} |
85 |
+ |
86 |
cd ${PN}-standalone || die |
87 |
+ |
88 |
local module_branch=origin/${PN}.${PATCH_BRANCH} |
89 |
+ |
90 |
einfo "Using ${module_branch} as patch source" |
91 |
git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die |
92 |
- combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch |
93 |
- combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch |
94 |
+ |
95 |
+ combinediff \ |
96 |
+ ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch |
97 |
+ combinediff \ |
98 |
+ "${T}"/combined-1.patch ${PN}-mmap.patch \ |
99 |
+ > ${PN}-standalone-base-mmap-combined.patch |
100 |
+ |
101 |
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then |
102 |
if use kernel-patch; then |
103 |
cd ${KV_DIR} |
104 |
ewarn "Patching your kernel..." |
105 |
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null |
106 |
+ patch \ |
107 |
+ --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \ |
108 |
+ < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \ |
109 |
+ > /dev/null |
110 |
epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch |
111 |
ewarn "You need to compile your kernel with the applied patch" |
112 |
ewarn "to be able to load and use the aufs kernel module" |
113 |
@@ -99,13 +113,15 @@ pkg_setup() { |
114 |
die "missing kernel patch, please apply it first" |
115 |
fi |
116 |
fi |
117 |
+ |
118 |
popd &> /dev/null |
119 |
export PKG_SETUP_HAS_BEEN_RAN=1 |
120 |
} |
121 |
|
122 |
set_config() { |
123 |
for option in $*; do |
124 |
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" |
125 |
+ grep -q "^CONFIG_AUFS_${option} =" config.mk || \ |
126 |
+ die "${option} is not a valid config option" |
127 |
sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die |
128 |
done |
129 |
} |
130 |
@@ -129,15 +145,11 @@ src_prepare() { |
131 |
use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 |
132 |
use ramfs && set_config BR_RAMFS |
133 |
|
134 |
- if use pax_kernel; then |
135 |
- if kernel_is ge 3 11; then |
136 |
- epatch "${FILESDIR}"/pax-3.11.patch |
137 |
- else |
138 |
- epatch "${FILESDIR}"/pax-3.patch |
139 |
- fi |
140 |
- fi |
141 |
+ use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch |
142 |
|
143 |
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
144 |
+ sed \ |
145 |
+ -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \ |
146 |
+ -i Makefile || die |
147 |
} |
148 |
|
149 |
src_compile() { |
150 |
@@ -155,18 +167,19 @@ src_compile() { |
151 |
src_install() { |
152 |
linux-mod_src_install |
153 |
|
154 |
- insinto /usr/share/doc/${PF} |
155 |
- |
156 |
- use doc && doins -r Documentation |
157 |
+ use doc && dodoc -r Documentation |
158 |
|
159 |
- use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch |
160 |
+ use kernel-patch || \ |
161 |
+ doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch |
162 |
|
163 |
- dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch |
164 |
+ dodoc \ |
165 |
+ Documentation/filesystems/aufs/README \ |
166 |
+ "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch |
167 |
|
168 |
readme.gentoo_create_doc |
169 |
} |
170 |
|
171 |
pkg_postinst() { |
172 |
- readme.gentoo_pkg_postinst |
173 |
+ readme.gentoo_print_elog |
174 |
linux-mod_pkg_postinst |
175 |
} |