Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 638816 - sys-apps/coreutils::gentoo_prefix: update cygwin patch
Summary: sys-apps/coreutils::gentoo_prefix: update cygwin patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: Prefix Support (show other bugs)
Hardware: All Other
: Normal normal (vote)
Assignee: Gentoo Prefix
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-11-25 19:33 UTC by Egor Y. Egorov
Modified: 2018-01-10 09:07 UTC (History)
1 user (show)

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


Attachments
coreutils-8.28-cygwin-3 (coreutils-8.28-cygwin-3.patch,37.17 KB, patch)
2017-11-29 08:16 UTC, Egor Y. Egorov
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Egor Y. Egorov 2017-11-25 19:33:50 UTC
$ emerge -av1 coreutils

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild   R    ] sys-apps/coreutils-8.28-r1::gentoo_prefix  USE="kill nls stdbuf (-acl) -caps -gmp -hostname -multicall (-selinux) -static {-test} -uptime -vanilla -xattr" 0 KiB

Total: 1 package (1 reinstall), Size of downloads: 0 KiB

Would you like to merge these packages? [Yes/No] 

>>> Verifying ebuild manifests

>>> Emerging (1 of 1) sys-apps/coreutils-8.28-r1::gentoo_prefix
 * coreutils-8.28.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                                                                             [ ok ]
 * coreutils-8.28-patches-1.1.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                                                                 [ ok ]
 * coreutils-8.28-man.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                                                                         [ ok ]
>>> Unpacking source...
>>> Unpacking coreutils-8.28.tar.xz to /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work
>>> Unpacking coreutils-8.28-patches-1.1.tar.xz to /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work
>>> Unpacking coreutils-8.28-man.tar.xz to /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work
>>> Source unpacked in /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work
>>> Preparing source in /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work/coreutils-8.28 ...
 * Applying 003_all_coreutils-gentoo-uname.patch ...                                                                                                      [ ok ]
 * Applying 010_all_coreutils-tests-r1.patch ...                                                                                                          [ ok ]
 * Applying 020_all_sysmacros.patch ...                                                                                                                   [ ok ]
 * Applying 030_all_coreutils-more-dir-colors.patch ...                                                                                                   [ ok ]
 * Applying 040_all_coreutils-cp-mkdir-eexist.patch ...                                                                                                   [ ok ]
 * Applying 051_all_coreutils-mangen.patch ...                                                                                                            [ ok ]
 * Applying 060_all_coreutils-readdir-mountpoint-inode-test.patch ...                                                                                     [ ok ]
 * Applying coreutils-8.22-mint.patch ...                                                                                                                 [ ok ]

 * Cannot find $EPATCH_SOURCE!  Value for $EPATCH_SOURCE is:
 * 
 *   /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/files/coreutils-8.28-cygwin-3.patch
 *   ( coreutils-8.28-cygwin-3.patch )

 * ERROR: sys-apps/coreutils-8.28-r1::gentoo_prefix failed (prepare phase):
 *   Cannot find $EPATCH_SOURCE!
 * 
 * Call stack:
 *     ebuild.sh, line  124:  Called __call-ebuildshell 'src_prepare'
 *     ebuild.sh, line  538:  Called src_prepare
 *   environment, line 3511:  Called epatch '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/files/coreutils-8.28-cygwin-3.patch'
 *   environment, line 1043:  Called die
 * The specific snippet of code:
 *                   die "Cannot find \$EPATCH_SOURCE!";
 * 
 * If you need support, post the output of `emerge --info '=sys-apps/coreutils-8.28-r1::gentoo_prefix'`,
 * the complete build log and the output of `emerge -pqv '=sys-apps/coreutils-8.28-r1::gentoo_prefix'`.
 * The complete build log is located at '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/temp/build.log'.
 * The ebuild environment file is located at '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/temp/environment'.
 * Working directory: '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work/coreutils-8.28'
 * S: '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work/coreutils-8.28'

>>> Failed to emerge sys-apps/coreutils-8.28-r1, Log file:

>>>  '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/temp/build.log'

 * Messages for package sys-apps/coreutils-8.28-r1:

 * Cannot find $EPATCH_SOURCE!  Value for $EPATCH_SOURCE is:
 * 
 *   /home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/files/coreutils-8.28-cygwin-3.patch
 *   ( coreutils-8.28-cygwin-3.patch )
 * ERROR: sys-apps/coreutils-8.28-r1::gentoo_prefix failed (prepare phase):
 *   Cannot find $EPATCH_SOURCE!
 * 
 * Call stack:
 *     ebuild.sh, line  124:  Called __call-ebuildshell 'src_prepare'
 *     ebuild.sh, line  538:  Called src_prepare
 *   environment, line 3511:  Called epatch '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/files/coreutils-8.28-cygwin-3.patch'
 *   environment, line 1043:  Called die
 * The specific snippet of code:
 *                   die "Cannot find \$EPATCH_SOURCE!";
 * 
 * If you need support, post the output of `emerge --info '=sys-apps/coreutils-8.28-r1::gentoo_prefix'`,
 * the complete build log and the output of `emerge -pqv '=sys-apps/coreutils-8.28-r1::gentoo_prefix'`.
 * The complete build log is located at '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/temp/build.log'.
 * The ebuild environment file is located at '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/temp/environment'.
 * Working directory: '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work/coreutils-8.28'
 * S: '/home/e_egorov/gentoo/var/tmp/portage/sys-apps/coreutils-8.28-r1/work/coreutils-8.28'
Comment 1 Michael Haubenwallner (RETIRED) gentoo-dev 2017-11-29 08:06:09 UTC
Thanks for the report!

Upstream Cygwin does not provide coreutils-8.28 yet - up to 8.26 only.

As that patch isn't really simple and doesn't apply to 8.28, I've masked >=coreutils-8.27 for the moment.
Comment 2 Egor Y. Egorov 2017-11-29 08:16:06 UTC
Created attachment 507058 [details, diff]
coreutils-8.28-cygwin-3

I try to adapt patch for 8.26. I not sure It is correct or not, but it work in my case
Comment 3 Michael Haubenwallner (RETIRED) gentoo-dev 2017-11-29 08:55:23 UTC
(In reply to Egor Y. Egorov from comment #2)
> Created attachment 507058 [details, diff] [details, diff]
> coreutils-8.28-cygwin-3

Ah, thanks, will try that one.

> I try to adapt patch for 8.26.

Well, the patch for 8.26 _is_ available at the Cygwin distro, it's Gentoo that is at 8.28 already.
Comment 4 Egor Y. Egorov 2017-11-29 09:01:35 UTC
apparently, I did not accurately express the thought
patch for 8.28 is the coreutils-8.26-cygwin-3 that I adapted from the port tree. I'm not sure that it is 100% correct
Comment 5 Larry the Git Cow gentoo-dev 2017-11-29 09:38:04 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2818707d8a7f87ddc2ccfbd3c6d99e9578f31854

commit 2818707d8a7f87ddc2ccfbd3c6d99e9578f31854
Author:     Michael Haubenwallner <haubi@gentoo.org>
AuthorDate: 2017-11-29 09:37:54 +0000
Commit:     Michael Haubenwallner <haubi@gentoo.org>
CommitDate: 2017-11-29 09:37:54 +0000

    sys-apps/coreutils: update cygwin patch for 8.28
    
    Thanks to: Egor Y. Egorov, for the updated patch.
    Closes: https://bugs.gentoo.org/638816
    Package-Manager: Portage-2.3.10-prefix, Repoman-2.3.3

 sys-apps/coreutils/coreutils-8.28-r1.ebuild        |    2 +-
 .../files/coreutils-8.28-cygwin-8.26-3.patch       | 1043 ++++++++++++++++++++
 2 files changed, 1044 insertions(+), 1 deletion(-)
Comment 6 Sven Eden 2017-12-28 09:44:48 UTC
Sorry for commenting on a RESOLVED/FIXED bug, but when does the fix go live?

When bootstrapping with the script from today, the patch isn't available, and coreutils still fail, as bootstrap_tree() fetches prefix-overlay-20171112.tar.bz2

(In the meantime I place the patch in by hand, no problem. I am just curious.)
Comment 7 Larry the Git Cow gentoo-dev 2017-12-29 11:45:09 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e5ed806b4a2784ced621efd8c5b036bddef780f8

commit e5ed806b4a2784ced621efd8c5b036bddef780f8
Author:     Fabian Groffen <grobian@gentoo.org>
AuthorDate: 2017-12-28 16:12:54 +0000
Commit:     Fabian Groffen <grobian@gentoo.org>
CommitDate: 2017-12-28 16:12:54 +0000

    atom_explode: be more careful with eating suffix letters
    
    Make sure we don't just eat a char at the end of the atom, because if
    that char appears after a -, it will be seen as version part.  An
    example is xerces-c, where the parsed atom form would just be xerces.
    
    Bug: https://bugs.gentoo.org/638816

 libq/atom_explode.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)}
Comment 8 Fabian Groffen gentoo-dev 2017-12-29 11:47:04 UTC
sorry that commit has a wrong reference in it, it should be #639978
Comment 9 Michael Haubenwallner (RETIRED) gentoo-dev 2017-12-29 22:16:19 UTC
(In reply to Sven Eden from comment #6)

Going "live" requires bumping the tree snapshot, but you can use the LATEST_TREE_YES=1 environment variable with bootstrap-prefix.sh (before it is going to download the snapshot), to see if current state actually is worth another snapshot.
Comment 10 Fabian Groffen gentoo-dev 2018-01-03 14:54:54 UTC
Tomorrow I will bump the snapshot (meant to do this sooner, sorry).
Comment 11 Larry the Git Cow gentoo-dev 2018-01-04 09:46:22 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bd802a20f3c8d250fd85ed66272df93583edde2a

commit bd802a20f3c8d250fd85ed66272df93583edde2a
Author:     Fabian Groffen <grobian@gentoo.org>
AuthorDate: 2018-01-04 09:46:00 +0000
Commit:     Fabian Groffen <grobian@gentoo.org>
CommitDate: 2018-01-04 09:46:00 +0000

    scripts/bootstrap-prefix: update snapshots
    
    Bug: https://bugs.gentoo.org/642656
    Bug: https://bugs.gentoo.org/618396
    Bug: https://bugs.gentoo.org/632500
    Bug: https://bugs.gentoo.org/638816

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)}
Comment 12 Sven Eden 2018-01-10 09:07:09 UTC
(In reply to Fabian Groffen from comment #10)
> Tomorrow I will bump the snapshot (meant to do this sooner, sorry).

Thank you very much!