Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 690298 - sys-cluster/drbd-utils: support for /usr merge
Summary: sys-cluster/drbd-utils: support for /usr merge
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Cluster Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: usrmerge, usrmerge-fixes
  Show dependency tree
 
Reported: 2019-07-20 16:32 UTC by Alexander Tsoy
Modified: 2021-02-17 09:41 UTC (History)
1 user (show)

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


Attachments
drbd-utils-8.9.6-r1:20190720-162617.log.gz (drbd-utils-8.9.6-r1:20190720-162617.log.gz,8.67 KB, application/gzip)
2019-07-20 16:32 UTC, Alexander Tsoy
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Alexander Tsoy 2019-07-20 16:32:40 UTC
Created attachment 583776 [details]
drbd-utils-8.9.6-r1:20190720-162617.log.gz

In the case of merged /usr drbdadm executable gets overwritten by symlink:

$ stat -c %N /sbin
'/sbin' -> 'usr/sbin'
$ stat -c %N /usr/sbin/drbdadm
'/usr/sbin/drbdadm' -> '/usr/sbin/drbdadm'

$ emerge --info drbd-utils
Portage 2.3.66 (python 3.6.5-final-0, default/linux/amd64/17.1, gcc-8.3.0, glibc-2.29-r2, 4.19.59-gentoo x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-4.19.59-gentoo-x86_64-AMD_Opteron_63xx_class_CPU-with-gentoo-2.6
KiB Mem:     4035480 total,   3594848 free
KiB Swap:    2097148 total,   2097148 free
Timestamp of repository gentoo: Fri, 19 Jul 2019 14:00:01 +0000
Head commit of repository gentoo: 38aac32b8a18e3c0b7b188e2da2d11746ed3f077
Head commit of repository puleglot: d74c792cdfa08aa68aeee3849b5492c8dc613bf4

sh dash 0.5.9.1-r3
ld GNU ld (Gentoo 2.32 p2) 2.32.0
distcc 3.3.2 x86_64-pc-linux-gnu [disabled]
app-shells/bash:          4.4_p23-r1::gentoo
dev-lang/perl:            5.28.2-r1::gentoo
dev-lang/python:          2.7.15::gentoo, 3.6.5::gentoo
dev-util/cmake:           3.14.3::gentoo
sys-apps/baselayout:      2.6-r1::gentoo
sys-apps/sandbox:         2.13::gentoo
sys-devel/autoconf:       2.69-r4::gentoo
sys-devel/automake:       1.16.1-r1::gentoo
sys-devel/binutils:       2.32-r1::gentoo
sys-devel/gcc:            8.3.0-r1::gentoo
sys-devel/gcc-config:     2.0::gentoo
sys-devel/libtool:        2.4.6-r3::gentoo
sys-devel/make:           4.2.1-r4::gentoo
sys-kernel/linux-headers: 4.14-r1::gentoo (virtual/os-headers)
sys-libs/glibc:           2.29-r2::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: rsync
    sync-uri: rsync://puleglot.ru/gentoo-portage
    priority: -1000
    sync-rsync-verify-jobs: 1
    sync-rsync-extra-opts: 
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-max-age: 24

crossdev
    location: /var/db/repos/crossdev
    masters: gentoo
    priority: 100

puleglot
    location: /var/db/repos/puleglot
    sync-type: git
    sync-uri: https://puleglot.ru/git/gentoo/puleglot-overlay.git
    masters: gentoo
    priority: 900

local
    location: /usr/local/portage
    masters: gentoo
    priority: 1000

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -pipe"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS="--dynamic-deps=n --with-bdeps=y --binpkg-respect-use=y --ask-enter-invalid"
ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg cgroup clean-logs compress-build-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned sandbox sfperms split-log strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://mirror.yandex.ru/gentoo-distfiles/ http://distfiles.gentoo.org/"
LANG="ru_RU.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j4"
PKGDIR="/var/cache/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="acl amd64 bash-completion berkdb bzip2 caps cli crypt cxx device-mapper dri fortran gdbm gpm hardened iconv ipv6 libtirpc lz4 lzma multilib ncurses nls nptl openmp pam pcre pie readline seccomp ssl ssp systemd udev unicode urandom vim-syntax xattr xtpax xz zlib zstd" ABI_X86="64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="pc" INPUT_DEVICES="libinput keyboard mouse" KERNEL="linux" L10N="en ru" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" RUBY_TARGETS="ruby24 ruby25" USERLAND="GNU" VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

=================================================================
                        Package Settings
=================================================================

sys-cluster/drbd-utils-8.9.6-r1::gentoo was built with the following:
USE="udev -heartbeat -pacemaker -xen" ABI_X86="(64)"
Comment 1 William Hubbs gentoo-dev 2019-07-20 18:26:57 UTC
Why do we link to the binary in the first place? It seems weird to have
a binary in two places on the path. Imo we should stick with one or the
other (preferably where upstream installs it).
Comment 2 Larry the Git Cow gentoo-dev 2021-02-17 09:37:06 UTC
The bug has been closed via the following commit(s):

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

commit 64bd02f1d3e9dbb8300cfb01af795b5ed374ca95
Author:     Jakov Smolic <jakov.smolic@sartura.hr>
AuthorDate: 2021-02-17 09:36:34 +0000
Commit:     David Seifert <soap@gentoo.org>
CommitDate: 2021-02-17 09:36:34 +0000

    sys-cluster/drbd-utils: Bump to 9.15.1
    
    Closes: https://bugs.gentoo.org/690298
    Closes: https://bugs.gentoo.org/698304
    Closes: https://bugs.gentoo.org/705614
    Closes: https://bugs.gentoo.org/715616
    Closes: https://bugs.gentoo.org/716810
    Closes: https://bugs.gentoo.org/718818
    Closes: https://bugs.gentoo.org/721110
    Closes: https://bugs.gentoo.org/725750
    Closes: https://bugs.gentoo.org/728166
    
    Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
    Signed-off-by: David Seifert <soap@gentoo.org>

 sys-cluster/drbd-utils/Manifest                    |   1 +
 sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild    | 104 +++++++++++++++++++++
 .../files/drbd-utils-9.15.1-run-lock.patch         |  13 +++
 .../files/drbd-utils-9.15.1-sysmacros.patch        |  41 ++++++++
 4 files changed, 159 insertions(+)