* Package: sys-fs/aufs3-3_p20150622 * Repository: gentoo * Maintainer: jlec@gentoo.org * USE: abi_x86_64 amd64 elibc_glibc kernel-patch kernel_linux userland_GNU * FEATURES: distcc preserve-libs sandbox splitdebug usersandbox * Determining the location of the kernel source code * Found kernel source directory: * /usr/src/linux * Found kernel object directory: * /lib/modules/3.14.46-gentoo/build * Found sources for kernel version: * 3.14.46-gentoo * Checking for suitable kernel configuration options... [ ok ] * It seems you are using gentoo-sources with aufs3 * Please use sys-kernel/aufs-sources * This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade >>> Unpacking aufs3-standalone-3_p20150622.tar.xz to /var/tmp/portage/sys-fs/aufs3-3_p20150622/temp * Using origin/aufs3.14.12+ as patch source fatal: Cannot update paths and switch to branch 'local-aufs3.14.12+' at the same time. Did you intend to checkout 'origin/aufs3.14.12+' which can not be resolved as commit? * ERROR: sys-fs/aufs3-3_p20150622::gentoo failed (setup phase): * (no error message) * The actual branch list is: ${T}/aufs3-standalone # git branch -a list * master remotes/origin/HEAD -> origin/master remotes/origin/aufs3.0 remotes/origin/aufs3.1 remotes/origin/aufs3.10 remotes/origin/aufs3.10.x remotes/origin/aufs3.11 remotes/origin/aufs3.12 remotes/origin/aufs3.12.31+ remotes/origin/aufs3.12.x remotes/origin/aufs3.13 remotes/origin/aufs3.14 remotes/origin/aufs3.14.21+ remotes/origin/aufs3.14.40+ [...] ..and the check in the ebuild is for [ ${KV_PATCH} -ge 21 ], so I expect this is just a typo with 21 reversed to 12. The following is what I used to fix it on my systel locally. I can apply this to the tree (and to all ebuilds rather than just the latest) with your go-ahead. --- aufs3-3_p20150622.ebuild 22 Jun 2015 08:06:18 -0000 1.1 +++ aufs3-3_p20150622.ebuild 20 Jul 2015 13:58:08 -0000 @@ -55,8 +55,10 @@ if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then PATCH_BRANCH="x-rcN" + elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "40" ]]; then + PATCH_BRANCH="${KV_MINOR}".40+ elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then - PATCH_BRANCH="${KV_MINOR}".12+ + PATCH_BRANCH="${KV_MINOR}".21+ elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then PATCH_BRANCH="${KV_MINOR}".1+ else
Created attachment 407264 [details, diff] ebuild patch that autodetects which patch branch to use You might alternatively find this patch useful -- instead of having a determinstic list of alternative patch branches to use, this code can mine it out of the repository tarball instead. So far as I can tell, this doesn't need active network/internet access to complete, but all i did to test was ebuild ... prepare while not connected to any network.
+ 29 Jul 2015; Justin Lecher <jlec@gentoo.org> aufs3-3_p20150406.ebuild, + aufs3-3_p20150420.ebuild, aufs3-3_p20150504.ebuild, aufs3-3_p20150511.ebuild, + aufs3-3_p20150518.ebuild, aufs3-3_p20150525.ebuild, aufs3-3_p20150608.ebuild, + aufs3-3_p20150622.ebuild: + Fix typo, bug #555472 +
