Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEP17: Move files to /usr #21

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
glibc (2.38-6deepin9) unstable; urgency=medium

* Declare Breaks against systemd and sysvinit (See: #1072373,
#1072375)

-- Tianyu Chen <[email protected]> Fri, 06 Dec 2024 16:14:54 +0800

glibc (2.38-6deepin8) unstable; urgency=medium

* DEP17: Move files to /usr.
* Add libc-upgrade and libc-major-upgrade trigger.

-- Tianyu Chen <[email protected]> Thu, 05 Dec 2024 10:39:00 +0800

glibc (2.38-6deepin7) unstable; urgency=medium

* Add LoongArch TLSDESC and tunable support from upstream.
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any], libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 255.2-4deepin4~), sysvinit (<< 3.09-2~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
Expand Down Expand Up @@ -237,7 +237,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any], libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 255.2-4deepin4~), sysvinit (<< 3.09-2~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
Expand Down Expand Up @@ -309,7 +309,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any], libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
Breaks: nscd (<< 2.38), locales (<< 2.38), locales-all (<< 2.38), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 255.2-4deepin4~), sysvinit (<< 3.09-2~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
Expand Down
2 changes: 1 addition & 1 deletion debian/control.in/libc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any], libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<< 1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 255.2-4deepin4~), sysvinit (<< 3.09-2~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
Expand Down
3 changes: 1 addition & 2 deletions debian/debhelper.in/libc-alt.install
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This file is used for biarch libraries.
TMPDIR/RTLDDIR/*.so* RTLDDIR
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/SLIBDIR/*.so* /usrSLIBDIR
TMPDIR/LIBDIR/gconv/* LIBDIR/gconv/

TMPDIR/etc/ld.so.conf.d /etc
31 changes: 31 additions & 0 deletions debian/debhelper.in/libc-alt.postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh
set -e

# begin-remove-after: released:forky
if [ "$1" = configure ]; then
# These symbolic links are either included in base-files or created by
# base-files via triggers, but we also create them to avoid a versioned
# dependency on base-files. Cleanup will be handled by base-files.
if ! [ -h "$DPKG_ROOTRTLDDIR" ]; then
ln -s "usrRTLDDIR" "$DPKG_ROOTRTLDDIR"
fi
if ! [ -h "$DPKG_ROOTSLIBDIR" ]; then
ln -s usrSLIBDIR "$DPKG_ROOTSLIBDIR"
fi
fi
# end-remove-after

if [ "$1" = configure -o "$1" = triggered ] && ! [ -h "$DPKG_ROOT/usrRTLDDIR/RTLD_SO" ]; then
# In principle, this package should contain this link, but it also is
# contained in the multiarch libc package. To avoid a conflict and the need
# for declaring Replaces (which work badly with the /usr-move due to
# aliasing), we manually create this link whenever we are installed or
# upgraded or the multiarch libc is installed, upgraded or importantly
# removed. The link target is given as absolute without /usr. The runtime
# linker directory is always one level deep, so we can simply prepend "..".
ln -s ..RTLD_TARGET "$DPKG_ROOT/usrRTLDDIR/RTLD_SO"
fi

#DEBHELPER#

exit 0
13 changes: 6 additions & 7 deletions debian/debhelper.in/libc-alt.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
set -e

if [ "$1" = remove ]; then
# Native multiarch packages declare a Replaces: on the corresponding
# biarch package. Therefore if both a biarch package and the corresponding
# multiarch package are installed, then the multiarch package is removed,
# and then the biarch package is removed, the dynamic linker symlink
# becomes a dangling symlink. Remove it in that case.
if [ -h RTLDDIR/RTLD_SO ] && [ ! -f RTLDDIR/RTLD_SO ]; then
rm RTLDDIR/RTLD_SO
# We manually installed this link in postinst if missing. It is also
# installed by the native multiarch package as a proper file. We have
# to remove it if we are the last package to provide it. Detect that
# situation by checking for a dangling link.
if [ -h /usrRTLDDIR/RTLD_SO ] && [ ! -f /usrRTLDDIR/RTLD_SO ]; then
rm /usrRTLDDIR/RTLD_SO
fi
fi

Expand Down
3 changes: 2 additions & 1 deletion debian/debhelper.in/libc-alt.preinst
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh
set -e

# begin-remove-after: released:forky
# We create the top-level lib symlink on merged-usr systems, so that we can
# cover cases where for example libc-i386 on amd64 is installed and then removed
# (which deletes the symlink too). Note that we only suppor the simplest case,
Expand All @@ -14,11 +15,11 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
# If it has not, is a directory already there? Half-merged systems are
# the problem of usrmerge, simply ignore them here.
if [ ! -L SLIBDIR ] && [ ! -d SLIBDIR ]; then
mkdir -p /usrSLIBDIR
ln -s usrSLIBDIR SLIBDIR
fi
fi
fi
# end-remove-after

#DEBHELPER#

3 changes: 3 additions & 0 deletions debian/debhelper.in/libc-alt.triggers
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Monitor the dynamic linker from the native multiarch package that is shared
# with us.
interest-noawait /usrRTLDDIR/RTLD_SO
2 changes: 1 addition & 1 deletion debian/debhelper.in/libc-bin.install
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ debian/local/etc/ld.so.conf.d etc
debian/local/etc/nsswitch.conf usr/share/libc-bin
debian/local/etc/nss etc/default
posix/gai.conf etc
sbin/ldconfig sbin
sbin/ldconfig usr/sbin
usr/bin/getconf
usr/bin/getent
usr/bin/iconv
Expand Down
6 changes: 3 additions & 3 deletions debian/debhelper.in/libc-bin.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# ldconfig must be executable even when the libc is not configured, and
# thus must be linked statically
statically-linked-binary sbin/ldconfig
shared-library-lacks-prerequisites [sbin/ldconfig]
statically-linked-binary usr/sbin/ldconfig
shared-library-lacks-prerequisites [usr/sbin/ldconfig]

# these manpages are provided by the manpages package
no-manual-page [sbin/ldconfig]
no-manual-page [usr/sbin/ldconfig]
no-manual-page [usr/bin/getent]
no-manual-page [usr/bin/iconv]
no-manual-page [usr/bin/ld.so]
Expand Down
22 changes: 11 additions & 11 deletions debian/debhelper.in/libc-udeb.install
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
lib*/ld*.so*
lib/*/ld*.so*
lib/*/libm.so.*
lib/*/libmvec.so.*
lib/*/libdl.so.*
lib/*/libresolv.so.*
lib/*/libc.so.*
lib/*/librt.so.*
lib/*/libpthread.so.*
lib/*/libnss_dns.so.*
lib/*/libnss_files.so.*
RTLDDIR/ld*.so* /usrRTLDDIR
SLIBDIR/ld*.so* /usrSLIBDIR
SLIBDIR/libm.so.* /usrSLIBDIR
SLIBDIR/libmvec.so.* /usrSLIBDIR
SLIBDIR/libdl.so.* /usrSLIBDIR
SLIBDIR/libresolv.so.* /usrSLIBDIR
SLIBDIR/libc.so.* /usrSLIBDIR
SLIBDIR/librt.so.* /usrSLIBDIR
SLIBDIR/libpthread.so.* /usrSLIBDIR
SLIBDIR/libnss_dns.so.* /usrSLIBDIR
SLIBDIR/libnss_files.so.* /usrSLIBDIR
26 changes: 13 additions & 13 deletions debian/debhelper.in/libc-udeb.install.hurd-amd64
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
lib*/ld*.so*
lib/*/ld*.so*
lib/*/libm.so.*
lib/*/libmvec.so.*
lib/*/libdl.so.*
lib/*/libresolv.so.*
lib/*/libc.so.*
lib/*/librt.so.*
lib/*/libpthread.so.*
lib/*/libnss_dns.so.*
lib/*/libnss_files.so.*
lib/*/libmachuser.so.*
lib/*/libhurduser.so.*
RTLDDIR/ld*.so* /usrRTLDDIR
SLIBDIR/ld*.so* /usrSLIBDIR
SLIBDIR/libm.so.* /usrSLIBDIR
SLIBDIR/libmvec.so.* /usrSLIBDIR
SLIBDIR/libdl.so.* /usrSLIBDIR
SLIBDIR/libresolv.so.* /usrSLIBDIR
SLIBDIR/libc.so.* /usrSLIBDIR
SLIBDIR/librt.so.* /usrSLIBDIR
SLIBDIR/libpthread.so.* /usrSLIBDIR
SLIBDIR/libnss_dns.so.* /usrSLIBDIR
SLIBDIR/libnss_files.so.* /usrSLIBDIR
SLIBDIR/libmachuser.so.* /usrSLIBDIR
SLIBDIR/libhurduser.so.* /usrSLIBDIR
28 changes: 14 additions & 14 deletions debian/debhelper.in/libc-udeb.install.hurd-i386
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
lib*/ld*.so*
lib/*/ld*.so*
lib/*/libm.so.*
lib/*/libmvec.so.*
lib/*/libdl.so.*
lib/*/libresolv.so.*
lib/*/libc.so.*
lib/*/libutil.so.*
lib/*/librt.so.*
lib/*/libpthread.so.*
lib/*/libnss_dns.so.*
lib/*/libnss_files.so.*
lib/*/libmachuser.so.*
lib/*/libhurduser.so.*
RTLDDIR/ld*.so* /usrRTLDDIR
SLIBDIR/ld*.so* /usrSLIBDIR
SLIBDIR/libm.so.* /usrSLIBDIR
SLIBDIR/libmvec.so.* /usrSLIBDIR
SLIBDIR/libdl.so.* /usrSLIBDIR
SLIBDIR/libresolv.so.* /usrSLIBDIR
SLIBDIR/libc.so.* /usrSLIBDIR
SLIBDIR/libutil.so.* /usrSLIBDIR
SLIBDIR/librt.so.* /usrSLIBDIR
SLIBDIR/libpthread.so.* /usrSLIBDIR
SLIBDIR/libnss_dns.so.* /usrSLIBDIR
SLIBDIR/libnss_files.so.* /usrSLIBDIR
SLIBDIR/libmachuser.so.* /usrSLIBDIR
SLIBDIR/libhurduser.so.* /usrSLIBDIR
4 changes: 2 additions & 2 deletions debian/debhelper.in/libc.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
etc/ld.so.conf.d
lib*/ld*.so*
lib/*/*.so*
RTLDDIR/ld*.so* /usrRTLDDIR
SLIBDIR/*.so* /usrSLIBDIR
usr/lib/*/gconv
33 changes: 7 additions & 26 deletions debian/debhelper.in/libc.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -148,32 +148,13 @@ then
fi # end upgrading and $preversion lt DEB_VERSION_UPSTREAM
fi # Upgrading

# Restart init. Currently handles chroots, systemd and upstart, and
# assumes anything else is going to not fail at behaving like
# sysvinit:
TELINIT=yes
if ischroot 2>/dev/null; then
# Don't bother trying to re-exec init from a chroot:
TELINIT=no
elif [ -n "${DPKG_ROOT:-}" ]; then
# Do not re-exec init if we are operating on a chroot from outside:
TELINIT=no
elif [ -d /run/systemd/system ]; then
# Restart systemd on upgrade, but carefully.
# The restart is wanted because of LP: #1942276 and Bug: #993821
# The care is needed because of https://bugs.debian.org/753725
# (if systemd --help fails the system might still be quite broken but
# that seems better than the kernel panic that results if systemd
# cannot reexec itself).
TELINIT=no
if systemd --help >/dev/null 2>/dev/null; then
systemctl daemon-reexec
else
echo "Error: Could not restart systemd, systemd binary not working" >&2
fi
fi
if [ "$TELINIT" = "yes" ]; then
telinit u 2>/dev/null || true ; sleep 1
# Emit triggers to allow depending packages to restart themselves if
# needed. The triggers are called with "--no-await", as packages with the
# triggers-awaited state do not satisfy dependencies.
dpkg-trigger --no-await libc-upgrade
if [ -n "$preversion" ] && dpkg --compare-versions "$preversion" lt DEB_VERSION_UPSTREAM; then
dpkg-trigger --no-await libc-major-upgrade

fi
fi

Expand Down
10 changes: 2 additions & 8 deletions debian/debhelper.in/libc.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@
set -e

if [ "$1" = remove ]; then
# When both the multiarch and the corresponding biarch packages are
# installed, removing the multiarch package will remove the dynamic
# linker. Recreate it in the postinst.
ARCH=${DPKG_MAINTSCRIPT_ARCH}
target=$(dpkg-query -L LIBC-${ARCH} 2>/dev/null | grep -E '/lib.+/(ld\.so|RTLD_SO)$' || true)
if [ -f "$target" ] && ! [ -f RTLDDIR/RTLD_SO ] ; then
ln -sf ${target#RTLDDIR/} RTLDDIR/RTLD_SO
fi
# Remove DEP17 M8 protective diversion
dpkg-divert --quiet --remove --no-rename --divert "RTLDDIR/RTLD_SO.usr-is-merged" "RTLDDIR/RTLD_SO"
fi

if [ "$1" = deconfigure ]; then
Expand Down
34 changes: 34 additions & 0 deletions debian/debhelper.in/libc.preinst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ then
# Only change LC_ALL after loading debconf to ensure the debconf templates
# are properly localized.
export LC_ALL=C
fi

if [ "$type" != abort-upgrade ] && [ -z "$DPKG_ROOT" ]
then
# See if LD_LIBRARY_PATH contains the traditional /lib, but not the
# multiarch path
dirs=$(echo $LD_LIBRARY_PATH | sed 's/:/ /g')
Expand Down Expand Up @@ -295,6 +298,37 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
fi
fi

# begin-remove-after: released:forky
# Add DEP17 M4 protective diversions. These are needed for old base-files and
# for multilib symlinks not included in base-files. Since we want to avoid
# Pre-Depends: base-files (>= trixie) and we add them on behalf of base-files
# when needed. As bookworm's base-files installs bin lib and sbin, the only
# directory we may miss is the one containing the runtime linker when it is not
# /lib.
rtlddir=RTLDDIR
if [ "$1" = install -o "$1" = upgrade ] && [ "$rtlddir" != "/lib" ]; then
if test -d "$DPKG_ROOT$rtlddir" && ! test -h "$DPKG_ROOT$rtlddir"; then
echo
echo "The current installation does not have a merged-/usr layout."
echo "This is unsupported and unpacking #PACKAGE# would break the system."
echo "Refusing to unpack. Please install the usrmerge package and try again."
echo
exit 1
fi
if dpkg --compare-versions "$(dpkg-query -f '${Version}' -W base-files)" le 13 || ! dpkg-query -L base-files | grep -qxF "$rtlddir"; then
dpkg-divert --quiet --add --no-rename --package base-files --divert "/.${rtlddir#/}.usr-is-merged" "$rtlddir"
fi
fi
# end-remove-after

# Add DEP17 M8 protective diversions for the runtime dynamic linker. It is
# installed in both libc (multiarch) and libc-alt (multilib) amounting to a
# move and thus DEP17 P1 problem. This diversion should be removed by forky's
# libc.postinst.
if [ "$1" = install ] || [ "$1" = upgrade ]; then
dpkg-divert --quiet --add --no-rename --divert "RTLDDIR/RTLD_SO.usr-is-merged" "RTLDDIR/RTLD_SO"
fi

#DEBHELPER#

if [ -n "$preversion" ]; then
Expand Down
1 change: 1 addition & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
mvec = no

rtld_so=$(shell awk 'BEGIN {FS="="} /^ld\.so-version/ {print $$2}' $(DEB_BUILDDIR)/soversions.mk)
rtld_target=$(shell readlink $(debian-tmp)$(rtlddir)/$(rtld_so))
libc_so=$(shell awk 'BEGIN {FS="="} /^libc\.so-version/ {print "libc.so"$$2}' $(DEB_BUILDDIR)/soversions.mk)

BASE_CC = gcc
Expand Down
Loading
Loading