Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 887151 - net-misc/adjtimex-1.29-r2 - file collision with net-misc/sntpd-3.1
Summary: net-misc/adjtimex-1.29-r2 - file collision with net-misc/sntpd-3.1
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Robin Johnson
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: usrmerge, usrmerge-fixes
  Show dependency tree
 
Reported: 2022-12-19 09:55 UTC by Toralf Förster
Modified: 2022-12-20 15:50 UTC (History)
2 users (show)

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


Attachments
emerge-info.txt (emerge-info.txt,17.95 KB, text/plain)
2022-12-19 09:55 UTC, Toralf Förster
Details
emerge-history.txt (emerge-history.txt,131.92 KB, text/plain)
2022-12-19 09:55 UTC, Toralf Förster
Details
etc.clang.tar.bz2 (etc.clang.tar.bz2,702 bytes, application/x-bzip)
2022-12-19 09:55 UTC, Toralf Förster
Details
etc.portage.tar.bz2 (etc.portage.tar.bz2,34.54 KB, application/x-bzip)
2022-12-19 09:55 UTC, Toralf Förster
Details
logs.tar.bz2 (logs.tar.bz2,5.75 KB, application/x-bzip)
2022-12-19 09:55 UTC, Toralf Förster
Details
net-misc:adjtimex-1.29-r2:20221219-021421.log (net-misc:adjtimex-1.29-r2:20221219-021421.log,6.25 KB, text/plain)
2022-12-19 09:55 UTC, Toralf Förster
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Toralf Förster gentoo-dev 2022-12-19 09:55:19 UTC
 * Press Ctrl-C to Stop
 * 
 * net-misc/sntpd-3.1:0::gentoo
 * 	/usr/bin/adjtimex
 * 
 * Package 'net-misc/adjtimex-1.29-r2' NOT merged due to file collisions.

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 17.1_desktop_systemd_merged_usr-j4-20221217-210005

  -------------------------------------------------------------------

GNUMAKEFLAGS="$GNUMAKEFLAGS --jobserver-style=pipe"
GNUMAKEFLAGS="$GNUMAKEFLAGS --shuffle"
gcc-config -l:
 [1] x86_64-pc-linux-gnu-12 *
clang/llvm (if any):
clang version 15.0.6
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/lib/llvm/15/bin
Configuration file: /etc/clang/clang.cfg
/usr/lib/llvm/15
15.0.6
Python 3.10.9
Available Ruby profiles:
  [1]   ruby27 *
Available Rust versions:
  [1]   rust-bin-1.65.0 *
php cli (if any):
  [1]   php8.2 *

  HEAD of ::gentoo
commit 2a25404a9db5e65e993f40ce7fd190f514bdc28e
Author: Repository mirror & CI <repomirrorci@gentoo.org>
Date:   Mon Dec 19 01:47:08 2022 +0000

    2022-12-19 01:47:08 UTC

emerge -qpvO net-misc/adjtimex
[ebuild  N    ] net-misc/adjtimex-1.29-r2
Comment 1 Toralf Förster gentoo-dev 2022-12-19 09:55:21 UTC
Created attachment 843661 [details]
emerge-info.txt
Comment 2 Toralf Förster gentoo-dev 2022-12-19 09:55:22 UTC
Created attachment 843663 [details]
emerge-history.txt
Comment 3 Toralf Förster gentoo-dev 2022-12-19 09:55:23 UTC
Created attachment 843665 [details]
etc.clang.tar.bz2
Comment 4 Toralf Förster gentoo-dev 2022-12-19 09:55:24 UTC
Created attachment 843667 [details]
etc.portage.tar.bz2
Comment 5 Toralf Förster gentoo-dev 2022-12-19 09:55:25 UTC
Created attachment 843669 [details]
logs.tar.bz2
Comment 6 Toralf Förster gentoo-dev 2022-12-19 09:55:26 UTC
Created attachment 843671 [details]
net-misc:adjtimex-1.29-r2:20221219-021421.log
Comment 7 Larry the Git Cow gentoo-dev 2022-12-20 15:50:30 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b1d42503bbade5239e8ca9d812f43ea6be337c

commit f0b1d42503bbade5239e8ca9d812f43ea6be337c
Author:     Conrad Kostecki <conikost@gentoo.org>
AuthorDate: 2022-12-20 13:35:35 +0000
Commit:     Conrad Kostecki <conikost@gentoo.org>
CommitDate: 2022-12-20 15:48:54 +0000

    net-misc/sntpd: add soft blocker against net-misc/adjtimex
    
    Closes: https://bugs.gentoo.org/887151
    Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

 net-misc/sntpd/{sntpd-3.1.ebuild => sntpd-3.1-r1.ebuild} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f5fb45287ce8288eb6d5341a6567b1fc873011

commit f3f5fb45287ce8288eb6d5341a6567b1fc873011
Author:     Conrad Kostecki <conikost@gentoo.org>
AuthorDate: 2022-12-20 13:34:09 +0000
Commit:     Conrad Kostecki <conikost@gentoo.org>
CommitDate: 2022-12-20 15:48:53 +0000

    net-misc/adjtimex: add soft blocker against net-misc/sntpd[adjtimex]
    
    Bug: https://bugs.gentoo.org/887151
    Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

 .../adjtimex/{adjtimex-1.29-r2.ebuild => adjtimex-1.29-r3.ebuild}    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)