r6077 - in glibc-package/trunk/debian: . patches
Author: sthibault Date: 2014-05-19 07:07:50 + (Mon, 19 May 2014) New Revision: 6077 Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it breaks a bunch of tests. Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2014-05-18 22:30:04 UTC (rev 6076) +++ glibc-package/trunk/debian/changelog2014-05-19 07:07:50 UTC (rev 6077) @@ -7,6 +7,10 @@ failure, it is due to a bug in the test (see BZ #12683). * local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338. + [ Samuel Thibault ] + * patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it +breaks a bunch of tests. + -- Aurelien Jarno aure...@debian.org Wed, 14 May 2014 20:16:16 +0200 eglibc (2.18-6) unstable; urgency=medium Modified: glibc-package/trunk/debian/patches/series === --- glibc-package/trunk/debian/patches/series 2014-05-18 22:30:04 UTC (rev 6076) +++ glibc-package/trunk/debian/patches/series 2014-05-19 07:07:50 UTC (rev 6077) @@ -153,7 +153,7 @@ hurd-i386/tg-tls_thread_leak.diff hurd-i386/tg-mmap_file_prot_none_fix.diff hurd-i386/cvs-munmap-0.diff -hurd-i386/cvs-libpthread_guardsize.diff +#hurd-i386/cvs-libpthread_guardsize.diff i386/local-biarch.diff i386/local-cmov.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmhfq-00061g...@moszumanska.debian.org
Bug#745552: fixed in eglibc 2.18-6
reopen 745552 found 745552 2.13-38 found 745552 2.18-7 tag 745552 + wontfix thanks On Wed, May 14, 2014 at 07:34:38PM +, Aurelien Jarno wrote: Source: eglibc Source-Version: 2.18-6 We believe that the bug you reported is fixed in the latest version of eglibc, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. [snip ] * control.in/*: add conflicts between multiarch libc packages using the same dynamic library loader. Closes: #745552. Unfortunately the infrastructure doesn't support that and it makes some packages unbuildable. I am therefore reverting the changes and reopening the bug. This leaves currently no way to fix the bug, so I am tagging it wontfix until we have a way to fix that. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140519085915.ga19...@volta.rr44.fr
Processed: Re: Bug#745552: fixed in eglibc 2.18-6
Processing commands for cont...@bugs.debian.org:
reopen 745552
Bug #745552 {Done: Aurelien Jarno aure...@debian.org} [src:eglibc] libc6:
undeclared file conflict between libc6:sparc and libc6-i386:amd64
'reopen' may be inappropriate when a bug has been closed with a version;
all fixed versions will be cleared, and you may need to re-add them.
Bug reopened
No longer marked as fixed in versions eglibc/2.18-6.
found 745552 2.13-38
Bug #745552 [src:eglibc] libc6: undeclared file conflict between libc6:sparc
and libc6-i386:amd64
Marked as found in versions eglibc/2.13-38.
found 745552 2.18-7
Bug #745552 [src:eglibc] libc6: undeclared file conflict between libc6:sparc
and libc6-i386:amd64
The source 'eglibc' and version '2.18-7' do not appear to match any binary
packages
Marked as found in versions eglibc/2.18-7.
tag 745552 + wontfix
Bug #745552 [src:eglibc] libc6: undeclared file conflict between libc6:sparc
and libc6-i386:amd64
Added tag(s) wontfix.
thanks
Stopping processing here.
Please contact me if you need assistance.
--
745552: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745552
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
https://lists.debian.org/handler.s.c.140048996117485.transcr...@bugs.debian.org
r6078 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2014-05-19 08:53:35 + (Mon, 19 May 2014)
New Revision: 6078
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/i386
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/control.in/mips64
glibc-package/trunk/debian/control.in/mipsn32
glibc-package/trunk/debian/control.in/powerpc
glibc-package/trunk/debian/control.in/s390
glibc-package/trunk/debian/control.in/sparc
glibc-package/trunk/debian/control.in/sparc64
Log:
control.in/*: remove conflicts between multiarch libc packages using the same
dynamic library loader. This was introduced in 2.18-6, but sadly the
infrastructure is not ready for that, leaving now way to fix the problem.
Reopens: #745552.
Modified: glibc-package/trunk/debian/changelog
===
--- glibc-package/trunk/debian/changelog2014-05-19 07:07:50 UTC (rev
6077)
+++ glibc-package/trunk/debian/changelog2014-05-19 08:53:35 UTC (rev
6078)
@@ -6,6 +6,10 @@
* testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out
failure, it is due to a bug in the test (see BZ #12683).
* local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338.
+ * control.in/*: remove conflicts between multiarch libc packages using the
same
+dynamic library loader. This was introduced in 2.18-6, but sadly the
+infrastructure is not ready for that, leaving now way to fix the problem.
+Reopens: #745552.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it
Modified: glibc-package/trunk/debian/control
===
--- glibc-package/trunk/debian/control 2014-05-19 07:07:50 UTC (rev 6077)
+++ glibc-package/trunk/debian/control 2014-05-19 08:53:35 UTC (rev 6078)
@@ -144,8 +144,6 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips
mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel
[alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390],
libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd ( 2.18), locales ( 2.18), locales-all ( 2.18), lsb-core (=
3.2-27) [amd64 ppc64 sparc64], libx11-6 ( 1.1.4-2) [hurd-i386],
libpthread-stubs0 ( 0.3-4) [hurd-i386], hurd ( 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -236,8 +234,6 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips
mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel
[alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390],
libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd ( 2.18), locales ( 2.18), locales-all ( 2.18), lsb-core (=
3.2-27) [amd64 ppc64 sparc64], libx11-6 ( 1.1.4-2) [hurd-i386],
libpthread-stubs0 ( 0.3-4) [hurd-i386], hurd ( 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -328,8 +324,6 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips
mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel
[alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390],
libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd ( 2.18), locales ( 2.18), locales-all ( 2.18), lsb-core (=
3.2-27) [amd64 ppc64 sparc64], libx11-6 ( 1.1.4-2) [hurd-i386],
libpthread-stubs0 ( 0.3-4) [hurd-i386], hurd ( 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -420,8 +414,6 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386
r6079 - glibc-package/trunk/debian
Author: aurel32 Date: 2014-05-19 09:49:47 + (Mon, 19 May 2014) New Revision: 6079 Modified: glibc-package/trunk/debian/changelog Log: Fix too long line in changelog Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2014-05-19 08:53:35 UTC (rev 6078) +++ glibc-package/trunk/debian/changelog2014-05-19 09:49:47 UTC (rev 6079) @@ -6,8 +6,8 @@ * testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out failure, it is due to a bug in the test (see BZ #12683). * local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338. - * control.in/*: remove conflicts between multiarch libc packages using the same -dynamic library loader. This was introduced in 2.18-6, but sadly the + * control.in/*: remove conflicts between multiarch libc packages using the +same dynamic library loader. This was introduced in 2.18-6, but sadly the infrastructure is not ready for that, leaving now way to fix the problem. Reopens: #745552. -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmkcz-0008ey...@moszumanska.debian.org
cross-architecture conflicts or equivalent for libc packages
Hi all,
We currently have a problem with the libc{0.1,0.3,6,6.1} packages, which
are marked as Multiarch:same, but are in practice not co-installable due
to the ELF interpreter path being the same on various architectures. For
example libc6:i386 and libc6:sparc are not co-installable, causing dpkg
to exit complaining onifile overwrite.
Here is the list of the different ELF interpreters for the various
architectures we have in Debian or floating around:
alpha /lib/ld-linux-aarch64.so.1
amd64 /lib64/ld-linux-x86-64.so.2
arm64 /lib/ld-linux.so.2
armel /lib/ld-linux.so.3
armhf /lib/ld-linux-armhf.so.3
hurd-i386 /lib/ld.so
i386/lib/ld-linux.so.2
hppa/lib/ld.so.1
ia64/lib/ld-linux-ia64.so.2
kfreebsd-amd64 /lib/ld-kfreebsd-x86-64.so.1
kfreebsd-i386 /lib/ld.so.1
m68k/lib/ld.so.1
mips/lib/ld.so.1
mipsn32 /lib32/ld.so.1
mips64 /lib64/ld.so.1
mipsel /lib/ld.so.1
mipsn32el /lib32/ld.so.1
mips64el/lib64/ld.so.1
powerpc /lib/ld.so.1
powerpcspe /lib/ld.so.1
ppc64 /lib64/ld64.so.1
ppc64el /lib64/ld64.so.2
s390/lib/ld.so.1
s390x /lib/ld64.so.1
sh4 /lib/ld-linux.so.2
sparc /lib/ld-linux.so.2
sparc64 /lib64/ld-linux.so.2
x32 /libx32/ld-linux-x32.so.2
As you can see even if there is some diversity, we also have a lot
of cases where the ELF interpreter is the same. We therefore have to
find a way to avoid such packages to get installed at the same time on
the systems. We first tried with a list of cross-architecture Conflicts,
but at the end, it is not fully supported by apt and breaks wanna-build
through dose3. Last but not least a package is allowed to Conflicts with
itself, so changing that would probably breaks plenty of things.
In addition to that we have to support multilib packages (also called
bi/triarch) and allow for example libc6:i386 to be coinstallable with
libc6-i386:amd64 even if they both provide the same symlink to the ELF
interpreter (but pointing to a different location). This is necessary
for example to be able to install gcc-multilib:amd64 and a few :i386
libraries on an amd64 systems to build i386 libraries. This is currently
done by a Replaces: and by recreating the symlink in the postrm when the
package is removed. This is already quite fragile, and in addition
ldconfig also play a role there by recreating some symlinks pointing to
the wrong version. It is actually possible to break a wheezy system with
just two apt-get commands. This is fixed in jessie/sid except for a few
corner cases and we have to backports the changes to wheezy, but it shows
how dealing with the ELF interpreter symlinks can easily break things.
We also would like to disallow the possibility to install
libc6-amd64:i386 on an amd64 system (this happens for example if you
just run apt-get install gdb64 on an amd64 system with a foreign i386
architecture). This currently works again in sid, but it is quite
fragile, though from the number of bug reports we got, it seems to not
be a that uncommon situation among users.
We are therefore asking for ideas how to prevent packages which
conflicts to be installed at the same time on a system, without using
cross-architecture Conflicts and without moving the ELF interpreter to
additional packages. Help is really welcomed there, as it is currently
a whole mess breaking systems.
Thanks,
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140519102507.ga25...@hall.aurel32.net
Bug#748338: marked as done (libc-bin: please add 655(tinc) to bindresvport.blacklist)
Your message dated Mon, 19 May 2014 10:49:56 + with message-id e1wml8m-00066z...@franck.debian.org and subject line Bug#748338: fixed in eglibc 2.18-7 has caused the Debian Bug report #748338, regarding libc-bin: please add 655(tinc) to bindresvport.blacklist to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 748338: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748338 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: libc-bin Version: 2.18-6 Severity: important Dear Maintainer, After booting my machine today, my vpn didn't come up and thus i couldn't connect to my irc bouncer, bummer. Turns out that rpcbind, took over tinc VPN port 655 (registered with IANA, and present in netbase package). Adding 655 to bindresvport.blacklist appears to have resolved the conflict. Please add tinc entry to the default blacklist configuration file: -- Configuration Files: /etc/bindresvport.blacklist changed: 631 # cups 636 # ldaps 655 # tinc 774 # rpasswd 783 # spamd 873 # rsync 921 # lwresd 993 # imaps 995 # pops -- no debconf information Regards, Dimitri. ---End Message--- ---BeginMessage--- Source: eglibc Source-Version: 2.18-7 We believe that the bug you reported is fixed in the latest version of eglibc, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 748...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Aurelien Jarno aure...@debian.org (supplier of updated eglibc package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Mon, 19 May 2014 11:49:49 +0200 Source: eglibc Binary: libc-bin libc-dev-bin glibc-doc eglibc-source locales locales-all nscd multiarch-support libc6 libc6-dev libc6-dbg libc6-prof libc6-pic libc6-udeb libc6.1 libc6.1-dev libc6.1-dbg libc6.1-prof libc6.1-pic libc6.1-udeb libc0.3 libc0.3-dev libc0.3-dbg libc0.3-prof libc0.3-pic libc0.3-udeb libc0.1 libc0.1-dev libc0.1-dbg libc0.1-prof libc0.1-pic libc0.1-udeb libc6-i386 libc6-dev-i386 libc6-sparc libc6-dev-sparc libc6-sparc64 libc6-dev-sparc64 libc6-s390 libc6-dev-s390 libc6-amd64 libc6-dev-amd64 libc6-powerpc libc6-dev-powerpc libc6-ppc64 libc6-dev-ppc64 libc6-mipsn32 libc6-dev-mipsn32 libc6-mips64 libc6-dev-mips64 libc6-armhf libc6-dev-armhf libc6-armel libc6-dev-armel libc0.1-i386 libc0.1-dev-i386 libc6-x32 libc6-dev-x32 libc6-i686 libc6-xen libc0.1-i686 libc0.3-i686 libc0.3-xen libc6.1-alphaev67 libc6-loongson2f libnss-dns-udeb libnss-files-udeb Architecture: source all amd64 Version: 2.18-7 Distribution: unstable Urgency: medium Maintainer: Aurelien Jarno aure...@debian.org Changed-By: Aurelien Jarno aure...@debian.org Description: eglibc-source - Embedded GNU C Library: sources glibc-doc - Embedded GNU C Library: Documentation libc-bin - Embedded GNU C Library: Binaries libc-dev-bin - Embedded GNU C Library: Development binaries libc0.1- Embedded GNU C Library: Shared libraries libc0.1-dbg - Embedded GNU C Library: detached debugging symbols libc0.1-dev - Embedded GNU C Library: Development Libraries and Header Files libc0.1-dev-i386 - Embedded GNU C Library: 32bit development libraries for AMD64 libc0.1-i386 - Embedded GNU C Library: 32bit shared libraries for AMD64 libc0.1-i686 - Embedded GNU C Library: Shared libraries [i686 optimized] libc0.1-pic - Embedded GNU C Library: PIC archive library libc0.1-prof - Embedded GNU C Library: Profiling Libraries libc0.1-udeb - Embedded GNU C Library: Shared libraries - udeb (udeb) libc0.3- Embedded GNU C Library: Shared libraries libc0.3-dbg - Embedded GNU C Library: detached debugging symbols libc0.3-dev - Embedded GNU C Library: Development Libraries and Header Files libc0.3-i686 - Embedded GNU C Library: Shared libraries [i686 optimized] libc0.3-pic - Embedded GNU C Library: PIC archive library libc0.3-prof - Embedded GNU C Library: Profiling Libraries libc0.3-udeb - Embedded GNU C Library: Shared libraries - udeb (udeb) libc0.3-xen - Embedded GNU C Library: Shared libraries [Xen version] libc6 - Embedded GNU C Library: Shared libraries libc6-amd64 - Embedded GNU C Library: 64bit Shared
r6081 - glibc-package/tags
Author: aurel32 Date: 2014-05-19 10:35:11 + (Mon, 19 May 2014) New Revision: 6081 Added: glibc-package/tags/2.18-7/ Log: tagging package eglibc version 2.18-7 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmkuw-0007oo...@moszumanska.debian.org
r6082 - glibc-package/trunk/debian
Author: aurel32 Date: 2014-05-19 10:36:16 + (Mon, 19 May 2014) New Revision: 6082 Modified: glibc-package/trunk/debian/changelog Log: New changelog entry Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2014-05-19 10:35:11 UTC (rev 6081) +++ glibc-package/trunk/debian/changelog2014-05-19 10:36:16 UTC (rev 6082) @@ -1,3 +1,11 @@ +eglibc (2.18-8) UNRELEASED; urgency=medium + + !!! PLEASE MOVE ALL MAJOR DEVELOPMENT TO THE 2.19 BRANCH OR UPSTREAM !!! + + * + + -- Aurelien Jarno aure...@debian.org Mon, 19 May 2014 12:35:58 +0200 + eglibc (2.18-7) unstable; urgency=medium [ Aurelien Jarno ] -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmkvy-0007u5...@moszumanska.debian.org
r6080 - glibc-package/trunk/debian
Author: aurel32 Date: 2014-05-19 10:35:09 + (Mon, 19 May 2014) New Revision: 6080 Modified: glibc-package/trunk/debian/changelog Log: releasing package eglibc version 2.18-7 Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2014-05-19 09:49:47 UTC (rev 6079) +++ glibc-package/trunk/debian/changelog2014-05-19 10:35:09 UTC (rev 6080) @@ -1,7 +1,5 @@ -eglibc (2.18-7) UNRELEASED; urgency=medium +eglibc (2.18-7) unstable; urgency=medium - !!! PLEASE MOVE ALL MAJOR DEVELOPMENT TO THE 2.19 BRANCH OR UPSTREAM !!! - [ Aurelien Jarno ] * testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out failure, it is due to a bug in the test (see BZ #12683). @@ -15,7 +13,7 @@ * patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it breaks a bunch of tests. - -- Aurelien Jarno aure...@debian.org Wed, 14 May 2014 20:16:16 +0200 + -- Aurelien Jarno aure...@debian.org Mon, 19 May 2014 11:49:49 +0200 eglibc (2.18-6) unstable; urgency=medium -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmkut-0007nv...@moszumanska.debian.org
Re: [Multiarch-devel] cross-architecture conflicts or equivalent for libc packages
* Aurelien Jarno aurel...@aurel32.net, 2014-05-19, 12:25:
We currently have a problem with the libc{0.1,0.3,6,6.1} packages,
which are marked as Multiarch:same, but are in practice not
co-installable due to the ELF interpreter path being the same on
various architectures. For example libc6:i386 and libc6:sparc are not
co-installable, causing dpkg to exit complaining onifile overwrite.
Sounds like a job for Provides+Conflicts+Replaces.
Here is the list of the different ELF interpreters for the various
architectures we have in Debian or floating around:
i386/lib/ld-linux.so.2
Provides: lib-ld-linux-so-2
Conflicts: lib-ld-linux-so-2
Replaces: lib-ld-linux-so-2
hppa/lib/ld.so.1
m68k/lib/ld.so.1
mips/lib/ld.so.1
s390/lib/ld.so.1
Provides: lib-ld-so-1
Conflicts: lib-ld-so-1
Replaces: lib-ld-so-1
amd64 /lib64/ld-linux-x86-64.so.2
Provides: lib64-ld-linux-x86-64-so-2
Conflicts: lib64-ld-linux-x86-64-so-2
Replaces: lib64-ld-linux-x86-64-so-2
... and so on.
--
Jakub Wilk
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140519111636.gb8...@jwilk.net
Re: [Multiarch-devel] cross-architecture conflicts or equivalent for libc packages
On Mon, May 19, 2014 at 01:16:36PM +0200, Jakub Wilk wrote:
* Aurelien Jarno aurel...@aurel32.net, 2014-05-19, 12:25:
We currently have a problem with the libc{0.1,0.3,6,6.1} packages,
which are marked as Multiarch:same, but are in practice not
co-installable due to the ELF interpreter path being the same on
various architectures. For example libc6:i386 and libc6:sparc are
not co-installable, causing dpkg to exit complaining onifile
overwrite.
Sounds like a job for Provides+Conflicts+Replaces.
Here is the list of the different ELF interpreters for the various
architectures we have in Debian or floating around:
i386/lib/ld-linux.so.2
Provides: lib-ld-linux-so-2
Conflicts: lib-ld-linux-so-2
Replaces: lib-ld-linux-so-2
So following your way, it would be exactly the same for libc6:sparc.
libc6-i386 also provides /lib/ld-linux.so.2. It should be co-installable
with libc6:i386, but libc6:sparc should not be co-installable with
libc6:i386 or libc6-i386.
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140519112813.gd5...@hall.aurel32.net
Re: [Multiarch-devel] cross-architecture conflicts or equivalent for libc packages
* Aurelien Jarno aurel...@aurel32.net, 2014-05-19, 13:28: i386/lib/ld-linux.so.2 Provides: lib-ld-linux-so-2 Conflicts: lib-ld-linux-so-2 Replaces: lib-ld-linux-so-2 So following your way, it would be exactly the same for libc6:sparc. libc6-i386 also provides /lib/ld-linux.so.2. It should be co-installable with libc6:i386, but libc6:sparc should not be co-installable with libc6:i386 or libc6-i386. Oh, right. Couldn't the biarch packages die already? :) If they can't, I suppose you can implement cross-architecture conflicts with plain conflicts against virtual packages: Package: libc6 Architecture: i386 Provides: libc6-on-i386 Conflicts: libc6-on-sparc, ... Package: libc6-i386 Architecture: amd64 Conflicts: libc6-on-sparc, ... Package: libc6 Architecture: sparc Provides: libc6-on-sparc Conflicts: libc6-on-i386, libc6-i386, ... -- Jakub Wilk -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140519120115.ga2...@jwilk.net
r6083 - in glibc-package/branches/eglibc-2.19/debian: . patches
Author: sthibault Date: 2014-05-19 12:04:04 + (Mon, 19 May 2014) New Revision: 6083 Modified: glibc-package/branches/eglibc-2.19/debian/changelog glibc-package/branches/eglibc-2.19/debian/patches/series Log: port r6077 from trunk: patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it breaks a bunch of tests. Modified: glibc-package/branches/eglibc-2.19/debian/changelog === --- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 10:36:16 UTC (rev 6082) +++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:04:04 UTC (rev 6083) @@ -98,6 +98,10 @@ failure, it is due to a bug in the test (see BZ #12683). * local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338. + [ Samuel Thibault ] + * patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it +breaks a bunch of tests. + -- Aurelien Jarno aure...@debian.org Wed, 14 May 2014 20:16:16 +0200 eglibc (2.18-6) unstable; urgency=medium Modified: glibc-package/branches/eglibc-2.19/debian/patches/series === --- glibc-package/branches/eglibc-2.19/debian/patches/series2014-05-19 10:36:16 UTC (rev 6082) +++ glibc-package/branches/eglibc-2.19/debian/patches/series2014-05-19 12:04:04 UTC (rev 6083) @@ -137,7 +137,7 @@ hurd-i386/tg-tls_thread_leak.diff hurd-i386/tg-mmap_file_prot_none_fix.diff hurd-i386/cvs-munmap-0.diff -hurd-i386/cvs-libpthread_guardsize.diff +#hurd-i386/cvs-libpthread_guardsize.diff i386/local-biarch.diff i386/local-cmov.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wmmiw-k4...@moszumanska.debian.org
r6084 - in glibc-package/branches/eglibc-2.19/debian: . control.in
Author: aurel32
Date: 2014-05-19 12:18:05 + (Mon, 19 May 2014)
New Revision: 6084
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/control
glibc-package/branches/eglibc-2.19/debian/control.in/i386
glibc-package/branches/eglibc-2.19/debian/control.in/libc
glibc-package/branches/eglibc-2.19/debian/control.in/mips64
glibc-package/branches/eglibc-2.19/debian/control.in/mipsn32
glibc-package/branches/eglibc-2.19/debian/control.in/powerpc
glibc-package/branches/eglibc-2.19/debian/control.in/s390
glibc-package/branches/eglibc-2.19/debian/control.in/sparc
glibc-package/branches/eglibc-2.19/debian/control.in/sparc64
Log:
Merge from trunk
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:04:04 UTC
(rev 6083)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:18:05 UTC
(rev 6084)
@@ -91,18 +91,22 @@
-- Adam Conrad adcon...@0c3.net Sun, 09 Feb 2014 09:46:13 -0700
-eglibc (2.18-7) UNRELEASED; urgency=medium
+eglibc (2.18-7) unstable; urgency=medium
[ Aurelien Jarno ]
* testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out
failure, it is due to a bug in the test (see BZ #12683).
* local/etc/bindresvport.blacklist: add port 655 (tinc). Closes: #748338.
+ * control.in/*: remove conflicts between multiarch libc packages using the
+same dynamic library loader. This was introduced in 2.18-6, but sadly the
+infrastructure is not ready for that, leaving now way to fix the problem.
+Reopens: #745552.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread_guardsize.diff: Disable for now, it
breaks a bunch of tests.
- -- Aurelien Jarno aure...@debian.org Wed, 14 May 2014 20:16:16 +0200
+ -- Aurelien Jarno aure...@debian.org Mon, 19 May 2014 11:49:49 +0200
eglibc (2.18-6) unstable; urgency=medium
Modified: glibc-package/branches/eglibc-2.19/debian/control
===
--- glibc-package/branches/eglibc-2.19/debian/control 2014-05-19 12:04:04 UTC
(rev 6083)
+++ glibc-package/branches/eglibc-2.19/debian/control 2014-05-19 12:18:05 UTC
(rev 6084)
@@ -143,9 +143,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686
[hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips
mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel
[alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390],
libc6:s390 [alpha m68k mips mipsel powerpc],
+Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1)
Breaks: nscd ( 2.19), locales ( 2.19), locales-all ( 2.19), lsb-core (=
3.2-27) [amd64 ppc64 sparc64], libx11-6 ( 1.1.4-2) [hurd-i386],
libpthread-stubs0 ( 0.3-4) [hurd-i386], hurd ( 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -235,9 +233,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686
[hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips
mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel
[alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390],
libc6:s390 [alpha m68k mips mipsel powerpc],
+Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1)
Breaks: nscd ( 2.19), locales ( 2.19), locales-all ( 2.19), lsb-core (=
3.2-27) [amd64 ppc64 sparc64], libx11-6 ( 1.1.4-2) [hurd-i386],
libpthread-stubs0 ( 0.3-4) [hurd-i386], hurd ( 1:0.5.git20140203-1)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -327,9 +323,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686
[hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata ( 2007k-1), prelink (= 0.0.20090311-1),
- libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc],
libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
- libc6:hppa [m68k mips mipsel powerpc s390],
r6085 - in glibc-package/branches/eglibc-2.19/debian: . control.in rules.d sysdeps
Author: aurel32
Date: 2014-05-19 12:19:26 + (Mon, 19 May 2014)
New Revision: 6085
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/control
glibc-package/branches/eglibc-2.19/debian/control.in/main
glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk
Log:
debian/control.in/main: build-depends on systemtap-sdt-dev on linux-any.
debian/rules.d/build.mk: enable systemtap support. Closes: #700760.
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:18:05 UTC
(rev 6084)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:19:26 UTC
(rev 6085)
@@ -69,6 +69,8 @@
* sysdeps/{amd64.mk,i386.mk,x32.mk}: enable lock elision.
* expected-results-arm-linux-gnueabi-{armel,libc}: ignore basic-test.out
test, as it is due to GCC bug #748616.
+ * debian/control.in/main: build-depends on systemtap-sdt-dev on linux-any.
+debian/rules.d/build.mk: enable systemtap support. Closes: #700760.
[ Samuel Thibault ]
* Hurd fixes for new upstream
Modified: glibc-package/branches/eglibc-2.19/debian/control
===
--- glibc-package/branches/eglibc-2.19/debian/control 2014-05-19 12:18:05 UTC
(rev 6084)
+++ glibc-package/branches/eglibc-2.19/debian/control 2014-05-19 12:19:26 UTC
(rev 6085)
@@ -4,7 +4,7 @@
Build-Depends: gettext, dpkg-dev (= 1.16.0), bzip2, xz-utils, file, quilt,
autoconf, gawk, debhelper (= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (= 3.2.1) [linux-any], linux-libc-dev (= 3.4) [amd64 i386
x32],
- libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
systemtap-sdt-dev [linux-any],
mig (= 1.3-2) [hurd-i386], hurd-dev (= 1:0.5.git20140320~) [hurd-i386],
gnumach-dev (= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (= 2.21),
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/main
===
--- glibc-package/branches/eglibc-2.19/debian/control.in/main 2014-05-19
12:18:05 UTC (rev 6084)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/main 2014-05-19
12:19:26 UTC (rev 6085)
@@ -4,7 +4,7 @@
Build-Depends: gettext, dpkg-dev (= 1.16.0), bzip2, xz-utils, file, quilt,
autoconf, gawk, debhelper (= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (= 3.2.1) [linux-any], linux-libc-dev (= 3.4) [amd64 i386
x32],
- libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
systemtap-sdt-dev [linux-any],
mig (= 1.3-2) [hurd-i386], hurd-dev (= 1:0.5.git20140320~) [hurd-i386],
gnumach-dev (= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (= 2.21),
Modified: glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk
===
--- glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk 2014-05-19
12:18:05 UTC (rev 6084)
+++ glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk 2014-05-19
12:19:26 UTC (rev 6085)
@@ -88,6 +88,7 @@
--without-selinux \
--enable-stackguard-randomization \
--enable-obsolete-rpc \
+ --enable-systemtap \
--with-pkgversion=Debian EGLIBC $(DEB_VERSION) \
--with-bugurl=http://www.debian.org/Bugs/; \
$(if $(filter $(pt_chown),yes),--enable-pt_chown) \
Modified: glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk
===
--- glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk 2014-05-19
12:18:05 UTC (rev 6084)
+++ glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk 2014-05-19
12:19:26 UTC (rev 6085)
@@ -44,7 +44,7 @@
ln -s $(LINUX_HEADERS)/linux debian/include
# Library headers
- for h in libaudit.h selinux sys/capability.h ; do \
+ for h in libaudit.h selinux sys/capability.h sys/sdt.h ; do \
mkdir -p debian/include/$$(dirname $$h) ; \
if [ -d /usr/include/$(DEB_HOST_MULTIARCH)/$$h ]; then \
ln -s /usr/include/$(DEB_HOST_MULTIARCH)/$$h debian/include/$$h
; \
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wmmxo-0004tj...@moszumanska.debian.org
Re: [Multiarch-devel] cross-architecture conflicts or equivalent for libc packages
On Mon, May 19, 2014 at 02:01:15PM +0200, Jakub Wilk wrote: * Aurelien Jarno aurel...@aurel32.net, 2014-05-19, 13:28: i386/lib/ld-linux.so.2 Provides: lib-ld-linux-so-2 Conflicts: lib-ld-linux-so-2 Replaces: lib-ld-linux-so-2 So following your way, it would be exactly the same for libc6:sparc. libc6-i386 also provides /lib/ld-linux.so.2. It should be co-installable with libc6:i386, but libc6:sparc should not be co-installable with libc6:i386 or libc6-i386. Oh, right. Couldn't the biarch packages die already? :) Unfortunately, as long as we keep GCC, we will need them, even if they are a pain. If they can't, I suppose you can implement cross-architecture conflicts with plain conflicts against virtual packages: Package: libc6 Architecture: i386 Provides: libc6-on-i386 Conflicts: libc6-on-sparc, ... Package: libc6-i386 Architecture: amd64 Conflicts: libc6-on-sparc, ... Package: libc6 Architecture: sparc Provides: libc6-on-sparc Conflicts: libc6-on-i386, libc6-i386, ... Indeed we can encode the architecture in the Provides:. I guess we'll have script that... As a subsidiary question, do you know how to prevent libc6-amd64:i386 to be installed on a native amd64 system, but allow it on an i386 system, even with libc6:amd64 already installed? -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140519135614.ge5...@hall.aurel32.net
r6086 - in glibc-package/branches/eglibc-2.19/debian: . rules.d sysdeps
Author: aurel32
Date: 2014-05-19 14:55:07 + (Mon, 19 May 2014)
New Revision: 6086
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk
Log:
Move --enable-systemtap from rules.d/build.mk to sysdeps/linux.mk
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 12:19:26 UTC
(rev 6085)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-19 14:55:07 UTC
(rev 6086)
@@ -70,7 +70,7 @@
* expected-results-arm-linux-gnueabi-{armel,libc}: ignore basic-test.out
test, as it is due to GCC bug #748616.
* debian/control.in/main: build-depends on systemtap-sdt-dev on linux-any.
-debian/rules.d/build.mk: enable systemtap support. Closes: #700760.
+debian/sysdeps/linux.mk: enable systemtap support. Closes: #700760.
[ Samuel Thibault ]
* Hurd fixes for new upstream
Modified: glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk
===
--- glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk 2014-05-19
12:19:26 UTC (rev 6085)
+++ glibc-package/branches/eglibc-2.19/debian/rules.d/build.mk 2014-05-19
14:55:07 UTC (rev 6086)
@@ -88,7 +88,6 @@
--without-selinux \
--enable-stackguard-randomization \
--enable-obsolete-rpc \
- --enable-systemtap \
--with-pkgversion=Debian EGLIBC $(DEB_VERSION) \
--with-bugurl=http://www.debian.org/Bugs/; \
$(if $(filter $(pt_chown),yes),--enable-pt_chown) \
Modified: glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk
===
--- glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk 2014-05-19
12:19:26 UTC (rev 6085)
+++ glibc-package/branches/eglibc-2.19/debian/sysdeps/linux.mk 2014-05-19
14:55:07 UTC (rev 6086)
@@ -12,7 +12,7 @@
ifeq ($(DEB_BUILD_PROFILE),bootstrap)
libc_extra_config_options = $(extra_config_options)
else
- libc_extra_config_options = --with-selinux $(extra_config_options)
+ libc_extra_config_options = --with-selinux --enable-systemtap
$(extra_config_options)
endif
ifndef LINUX_SOURCE
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wmoy3-0007ot...@moszumanska.debian.org
Re: [Multiarch-devel] cross-architecture conflicts or equivalent for libc packages
Aurelien Jarno wrote: As a subsidiary question, do you know how to prevent libc6-amd64:i386 to be installed on a native amd64 system, but allow it on an i386 system, even with libc6:amd64 already installed? Use Conflicts against dpkg:amd64, maybe. :( -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140519190928.go12...@google.com
Bug#731082: Processed: severity of 731082 is normal
Aurelien Jarno wrote... The GNU libc has never been designed to work in a multiarch situation, hence this kind of bugs (and I am sure there are been plenty more). We can't therefore consider that kind of bug as important or critical. Thanks for your time to write down that explanation. I understand now, and although it's not so good news, I have to agree with your point. In short we will work on this bug if we have been able to fix all the other important bugs. That said, if someone interested by multiarch can provide us a patch, we will included happily (of course provided it is not too hackish). Sounds challenging but unfortunately I already got way to many other things on my list. In case I cannot resist the temptation to hack on this: Can you think of a reason why different architectures would ever want to share ld.so.cache as they do right now? Since I cannot, the solution seems to qualify that file with triple, teach the so loader to pick the appropriate one, and hack ldconfig to do the right thing. Could it be that (relatively) simple? Christoph signature.asc Description: Digital signature
Bug#715038: add mips64(el) mipsn32(el) support to eglibc
I refreshed this patch with 2.18-6. On Thu, May 8, 2014 at 10:53 AM, Yunqiang Su wzss...@gmail.com wrote: On Wed, May 7, 2014 at 11:02 PM, Aurelien Jarno aurel...@aurel32.net wrote: On Fri, Apr 25, 2014 at 10:25:55PM +0800, Yunqiang Su wrote: On Fri, Apr 25, 2014 at 10:25 PM, Yunqiang Su wzss...@gmail.com wrote: I refresh this patch with 2.18-4, and let libc6 breaks: libc6-mips64 [mips64 mips64el], libc6-mipsn32 [mipsn32 mipsn32el], libc6-mips32 [mips mipsel], On Thu, Feb 27, 2014 at 9:20 AM, Yunqiang Su wzss...@gmail.com wrote: I refresh this patch with 2.18-3 On Mon, Oct 7, 2013 at 9:50 AM, YunQiang Su wzss...@gmail.com wrote: I refresh the patches with 2.17-93. It's time to consider to merge it. Now we have about 7000 packages build successfully already. This architecture may be in debian-ports in near future. Please find my comments about this patch below. [ snip ] diff -urN a/debian/rules.d/build.mk b/debian/rules.d/build.mk --- a/debian/rules.d/build.mk 2014-03-02 15:01:31.0 + +++ b/debian/rules.d/build.mk 2014-04-25 14:14:27.708058521 + @@ -233,7 +233,7 @@ # the multiarch ld.so doesn't look at the (non-standard) /lib32, so we # need path compatibility when biarch and multiarch packages are both # installed. - case $(call xx,slibdir) in /lib32 | /lib64 | /libx32) \ + case $(call xx,slibdir) in /lib32 | /lib64 | /libx32 | /lib) \ mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \ conffile=debian/tmp-$(curpass)/etc/ld.so.conf.d/zz_$(curpass)-biarch-compat.conf; \ echo # Legacy biarch compatibility support $$conffile; \ Why do you need this change? This will create a ld.so.conf entry even for /lib, while ld.so should always be configured to look for /lib and /lib/$(DEB_HOST_ARCH_MULTIARCH) without even an ld.so.conf entry. Moreover, with this change such a file would be created for all architectures, not only mips64. Please look why ld.so doesn't look to /lib by default. It looks /lib. I dropped this snip. diff -urN a/debian/rules.d/build.mk.orig b/debian/rules.d/build.mk.orig --- a/debian/rules.d/build.mk.orig1970-01-01 00:00:00.0 + +++ b/debian/rules.d/build.mk.orig2014-04-25 14:14:27.708058521 + [ snip ] Please don't include such an orig file in your patch. [ snip ] diff -urN a/debian/rules.d/control.mk.orig b/debian/rules.d/control.mk.orig --- a/debian/rules.d/control.mk.orig 1970-01-01 00:00:00.0 + +++ b/debian/rules.d/control.mk.orig 2014-04-25 14:14:27.708058521 + Same here [ snip ] diff -urN a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk --- a/debian/rules.d/debhelper.mk 2014-03-02 15:01:31.0 + +++ b/debian/rules.d/debhelper.mk 2014-04-25 14:14:27.708058521 + @@ -223,7 +223,7 @@ pass= \ suffix= \ ;; \ - *:/lib32 | *:/lib64 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \ + *:/lib32 | *:/lib64 | *:/libx32 | *:/lib | *:/lib/arm-linux-gnueabi*) \ I guess it's because the multilib o32 version is installed in /lib, right? But see below. Yes templates=libc libc-dev \ pass=-alt \ suffix=-$(curpass) \ @@ -240,6 +240,9 @@ if [ $$s != $$t ] ; then \ cp $$s $$t ; \ fi ; \ + if [ $$suffix = -mips32 ] ; then \ +sed -e '/ld.so.conf.d /etc/d' -i $$t; \ + fi ; \ What is that supposed to do? This is used to avoid installing zz_mips32-biarch-compat.conf for /lib and /usr/lib . $$t is debian/libc6-mips32.install here. sed -e s#TMPDIR#debian/tmp-$$curpass#g -i $$t; \ sed -e s#RTLDDIR#$$rtlddir#g -i $$t; \ sed -e s#SLIBDIR#$$slibdir#g -i $$t; \ [ snip ] diff -urN a/debian/sysdeps/mips64el.mk b/debian/sysdeps/mips64el.mk --- a/debian/sysdeps/mips64el.mk 1970-01-01 00:00:00.0 + +++ b/debian/sysdeps/mips64el.mk 2014-04-25 14:14:27.712058556 + @@ -0,0 +1,54 @@ +libc_add-ons = ports nptl $(add-ons) +libc_rtlddir = /lib64 + +# build 32-bit (n32) alternative library +EGLIBC_PASSES += mipsn32 +DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32 +mipsn32_add-ons = ports nptl $(add-ons) +mipsn32_configure_target = mips64el-linux-gnuabin32 +mipsn32_CC = $(CC) -mabi=n32 -mno-plt +mipsn32_CXX = $(CXX) -mabi=n32 -mno-plt +libc6-mipsn32_shlib_dep = libc6-mipsn32 (= $(shlib_dep_ver)) +mipsn32_rtlddir = /lib32 +mipsn32_slibdir = /lib32 +mipsn32_libdir = /usr/lib32 +mipsn32_extra_config_options := $(extra_config_options) --disable-profile + +# build 32-bit (o32) alternative library +EGLIBC_PASSES += mips32 +DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32 +mips32_add-ons = ports nptl $(add-ons) +mips32_configure_target = mipsel-linux-gnu +mips32_CC = $(CC) -mabi=32 -mno-plt +mips32_CXX = $(CXX)
