Re: [gentoo-kernel] [ANNOUNCE] genpatches-3.10-12 release

[Bertrand Jacquin]

D'ar gwener 16 a viz Eost 2013 e 01 eur 49, « Tom Wijsman » he deus skrivet :
> On Fri, 16 Aug 2013 01:27:23 +0200
> Bertrand Jacquin <beber@××××××××.net> wrote:
>
> > 3.10-12/2300_USB-mount-extd-inq-cmd-fix.patch does not apply anymore
> > as was included upstream at commit
> > 0ac10bd036f0f3b8ce7ac2390446eab9531c72eb (v3.10.6-1-g0ac10bd)
>
> Thank you very much for letting us know!
>
> There is one subtle difference here; specifically, it does apply.
>
> Unpacking source...
> Unpacking linux-3.10.tar.xz
> to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work
> Unpacking genpatches-3.10-12.base.tar.xz
> to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches
> Unpacking genpatches-3.10-12.extras.tar.xz
> to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches
>  * Applying 1000_linux-3.10.1.patch
>    (-p1) ... [ ok ]
>  * Applying 1001_linux-3.10.2.patch
>    (-p1) ... [ ok ]
>  * Applying 1002_linux-3.10.3.patch
>    (-p1) ... [ ok ]
>  * Applying 1003_linux-3.10.4.patch
>    (-p1) ... [ ok ]
>  * Applying 1004_linux-3.10.5.patch
>    (-p1) ... [ ok ]
>  * Applying 1005_linux-3.10.6.patch
>    (-p1) ... [ ok ]
>  * Applying 1006_linux-3.10.7.patch
>    (-p1) ... [ ok ]
>  * Applying 1500_XATTR_USER_PREFIX.patch
>    (-p1) ... [ ok ]
>  * Applying 1700_enable-thinkpad-micled.patch
>    (-p1) ... [ ok ]
>  * Applying
>    1801_block-cgroups-kconfig-build-bits-for-BFQ-v6r2-3.10.patch
>    (-p1) ... [ ok ]
>  * Applying 1802_block-introduce-the-BFQ-v6r2-I-O-sched-for-3.10.patch1
>    (-p1) ... [ ok ]
>  * Applying
>    1803_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v6r2-for-3.10.0.patch1
>    (-p1) ... [ ok ]
>  * Applying 2300_USB-mount-extd-inq-cmd-fix.patch
>    (-p1) ... [ ok ]
>  * Applying 2400_kcopy-patch-for-infiniband-driver.patch
>    (-p1) ... [ ok ]
>  * Applying 2700_ThinkPad-30-brightness-control-fix.patch
>    (-p1) ... [ ok ]
>  * Applying 2900_dev-root-proc-mount-fix.patch
>    (-p1) ... [ ok ]
>  * Applying 4200_fbcondecor-0.9.6.patch
>    (-p1) ... [ ok ]
>  * Applying 4500_nouveau-video-output-control-Kconfig.patch
>    (-p1) ... [ ok ]
>  * Applying 4567_distro-Gentoo-Kconfig.patch
>    (-p1) ... [ ok ]
> Source unpacked
> in /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work
>
> Inspecting it I agree it does apply a bit weirdly; although, it does
> make the intent of the code the same and should thus not be a problem.
>
>         if (sdev->skip_vpd_pages)
>                 goto fail;
>
>         if (sdev->skip_vpd_pages)
>                 goto fail;
>
> Using =sys-devel/patch-2.7.1-r2 here. Why does it not apply for you?

First of all, I'm not using gentoo-sources but a personal ebuild that
actually take patch, apply them, then build the kernel, see #472906 or
http://git.meleeweb.net/cgit.cgi/distros/gentoo/portage.git/tree/sys-kernel/longterm-sources
and
http://git.meleeweb.net/cgit.cgi/distros/gentoo/portage.git/tree/sys-kernel/stable-sources

This ebuild use epatch_user, so all my patchs are taken from
http://git.meleeweb.net/cgit.cgi/linux-patchset.git/tree/

$ git clone git://git.meleeweb.net/var/git/linux-patchset.git /etc/portage/patches/sys-kernel

Actually I have a simple script that 'prepare' the patch tree. I just
apply ja patch, 'git am' all my own/companie patch, then apply gentoo
one from genpatch svn.

That script first try to 'git am' the patch if that one has the good
format. If it does not, it simply do a 'patch -sNp1 < "${patch}"'

So it should not fail as '-N' (Ignore patches that seem to be reversed or
already applied). Argg ... :)

I use sys-devel/patch-2.7.1-r2 as you.

I need to inspect what do epatch a bit better to be able to reproduce.
But speaking in pure QA, it's better is this case :)

> Anyhow, just for safety reasons I'll push out a new genpatches; as it
> intends to fix a build issue, it doesn't require a revision bump. :)

Thanks !

-- 
Beber