Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 490790 - =sys-fs/aufs3-3_p20131104 fails build due to combinediff misuse
Summary: =sys-fs/aufs3-3_p20131104 fails build due to combinediff misuse
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Justin Lecher (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-08 23:57 UTC by Marios Andreopoulos
Modified: 2013-11-11 15:47 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
aufs3-3_p20131104.ebuild.patch (file_490790.txt,749 bytes, patch)
2013-11-11 14:18 UTC, Tom Wijsman (TomWij) (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Marios Andreopoulos 2013-11-08 23:57:30 UTC
sys-fs/aufs3-3_p20131104 fails during emerge.

The culprit seems to be a misuse of combinediff.
Specifically, combinediff accepts two file arguments. This was also the case with older ebuilds.

In this ebuild however, combinediff is given three file arguments and fails. This can be seen during emerge —you will see the help output of combinediff instead of the normal output.

The thing is that if you applied the patch once correctly to the kernel, then despite the fail, since your kernel sources are already patched, the emerge will be successful.
This is the reason I guess that this bug escaped the maintainer.

These are the changes I made to the ebuild, in order to emerge it succesfully:

--- aufs3-3_p20131104.ebuild    2013-11-09 01:43:25.932802446 +0200
+++ aufs3-3_p20131104.ebuild-corected   2013-11-09 01:51:29.651115860 +0200
@@ -75,7 +75,8 @@
        cd ${PN}-standalone || die
        local module_branch=origin/${PN}.${PATCH_BRANCH}
        git checkout -q -b local-gentoo ${module_branch} || die
-       combinediff ${PN}-base.patch ${PN}-mmap.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
+       combinediff ${PN}-base.patch ${PN}-mmap.patch > ${PN}-intermediate.patch
+       combindeiff ${PN}-intermediate.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
        if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.patch > /dev/null ); then
                if use kernel-patch; then
                        cd ${KV_DIR}


Reproducible: Always
Comment 1 Tom Wijsman (TomWij) (RETIRED) gentoo-dev 2013-11-11 14:18:50 UTC
Created attachment 363068 [details, diff]
aufs3-3_p20131104.ebuild.patch

Attached patch.
Comment 2 Justin Lecher (RETIRED) gentoo-dev 2013-11-11 15:47:01 UTC
+*aufs3-3_p20131111 (11 Nov 2013)
+
+  11 Nov 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131104.ebuild,
+  +aufs3-3_p20131111.ebuild:
+  Bump to latest aufs3-release; fix combinedif issue, #490790
+