[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#309603: marked as done ([DPKG-ARCHITECTURE] Linux thinks it's the Hurd)



Your message dated Thu, 09 Jun 2005 06:24:39 +0100
with message-id <1118294679.8560.124.camel@descent.netsplit.com>
and subject line Fixed in 1.13.5
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 18 May 2005 09:36:34 +0000
>From cjwatson@flatline.org.uk Wed May 18 02:36:34 2005
Return-path: <cjwatson@flatline.org.uk>
Received: from chiark.greenend.org.uk [193.201.200.170] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1DYKyg-0003Ax-00; Wed, 18 May 2005 02:36:34 -0700
Received: from [192.168.124.112] (helo=riva.lab.dotat.at)
	by chiark.greenend.org.uk (Debian Exim 3.35 #1) with esmtp
	(return-path cjwatson@flatline.org.uk)
	id 1DYKyc-0005t0-00
	for submit@bugs.debian.org; Wed, 18 May 2005 10:36:30 +0100
Received: from cjwatson by riva.lab.dotat.at with local (Exim 3.36 #1 (Debian))
	for submit@bugs.debian.org
	id 1DYKyb-0003cu-00; Wed, 18 May 2005 10:36:29 +0100
Date: Wed, 18 May 2005 10:36:29 +0100
From: Colin Watson <cjwatson@debian.org>
To: submit@bugs.debian.org
Subject: dpkg-architecture thinks Linux is the Hurd
Message-ID: <20050518093629.GB11138@riva.ucam.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 

Package: dpkg-dev
Version: 1.13.4
Severity: important
Tags: experimental, patch

We had some fun with dpkg-architecture in Ubuntu this morning ...

09:12  * \sh checks why breezy morphes into hurd
09:12 < \sh> -rw-r--r--  1 shermann shermann  2688 May 18 08:08 libqssl-dev_2.0-1ubuntu1_hurd-i386.deb
09:12 < \sh> -rw-r--r--  1 shermann shermann  2154 May 18 08:08 libqssl2_2.0-1ubuntu1_hurd-i386.deb

09:31 < Kamion> \sh: try 'dpkg-architecture -qDEB_HOST_ARCH'?
09:31 < \sh> hmm
09:31 < \sh> hurd-i386 *g*

Turns out that dpkg-architecture iterates through cputable and ostable
in whatever order the regexes happen to come out of the %cputable_re and
%ostable_re hashes. In practice the first one is always /gnu[^-]*/, and
since the first gcc-4.0 upload to Ubuntu after we synced dpkg_1.13.4
picked up the change to DEB_HOST_GNU_TYPE and started to spit out
*-linux-gnu in 'gcc -dumpmachine', /gnu[^-]*/ always matches on Linux.

I fixed this using the following patch (I can't seem to get to your arch
archive right now):

diff -Nru /tmp/v5aZgEH5oq/dpkg-1.13.4/debian/changelog /tmp/N2URRIKZ1E/dpkg-1.13.4ubuntu1/debian/changelog
--- /tmp/v5aZgEH5oq/dpkg-1.13.4/debian/changelog	2005-03-29 13:36:52.000000000 +0100
+++ /tmp/N2URRIKZ1E/dpkg-1.13.4ubuntu1/debian/changelog	2005-05-18 10:08:38.000000000 +0100
@@ -1,3 +1,11 @@
+dpkg (1.13.4ubuntu1) breezy; urgency=high
+
+  * dpkg-architecture iterates through cputable and ostable config.guess
+    regexes in the order in which they appear in the file, to avoid matching
+    the Hurd on Linux.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 18 May 2005 10:08:36 +0100
+
 dpkg (1.13.4) experimental; urgency=low
   
   The "Or the Wabbit gets it" Release
diff -Nru /tmp/v5aZgEH5oq/dpkg-1.13.4/scripts/dpkg-architecture.pl /tmp/N2URRIKZ1E/dpkg-1.13.4ubuntu1/scripts/dpkg-architecture.pl
--- /tmp/v5aZgEH5oq/dpkg-1.13.4/scripts/dpkg-architecture.pl	2005-03-29 13:29:32.000000000 +0100
+++ /tmp/N2URRIKZ1E/dpkg-1.13.4ubuntu1/scripts/dpkg-architecture.pl	2005-05-18 10:06:33.000000000 +0100
@@ -109,14 +109,14 @@
     local ($a);
 
     local ($gnu_cpu, $gnu_os) = &split_gnu($gnu);
-    foreach $a (keys %cputable_re) {
+    foreach $a (@cpu) {
 	if ($gnu_cpu =~ /^$cputable_re{$a}$/) {
 	    $cpu = $a;
 	    last;
 	}
     }
 
-    foreach $a (keys %ostable_re) {
+    foreach $a (@os) {
 	if ($gnu_os =~ /^(.*-)?$ostable_re{$a}$/) {
 	    $os = $a;
 	    last;

cputable probably didn't need to be changed since it's fully anchored,
unlike ostable which is only partially anchored, but I did it anyway for
symmetry.

However, you should probably also reorder ostable so that the least
specific regexes are last, otherwise this will cause dpkg-architecture
to think that both KFreeBSD and KNetBSD are the Hurd. Moving hurd after
kfreebsd and knetbsd would be sufficient.

Cheers,

-- 
Colin Watson                                       [cjwatson@debian.org]

---------------------------------------
Received: (at 309603-done) by bugs.debian.org; 9 Jun 2005 05:24:42 +0000
>From scott@netsplit.com Wed Jun 08 22:24:42 2005
Return-path: <scott@netsplit.com>
Received: from populous.netsplit.com (mailgate.netsplit.com) [62.49.129.34] (qmailr)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1DgFWz-00077q-00; Wed, 08 Jun 2005 22:24:42 -0700
Received: (qmail 11070 invoked from network); 9 Jun 2005 05:24:39 -0000
Received: from unknown (HELO descent.netsplit.com) (scott@62.49.129.40)
  by populous.netsplit.com with SMTP; 9 Jun 2005 05:24:39 -0000
Subject: Fixed in 1.13.5
From: Scott James Remnant <scott@netsplit.com>
To: 309603-done@bugs.debian.org
Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-SaUmRbVW82UpvEMKuy4a"
Date: Thu, 09 Jun 2005 06:24:39 +0100
Message-Id: <1118294679.8560.124.camel@descent.netsplit.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.1.1 
Delivered-To: 309603-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 


--=-SaUmRbVW82UpvEMKuy4a
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

dpkg (1.13.5) experimental; urgency=3Dlow

  The "Flatulent Elm of West Ruislip" Release.

  * Actions and package states are now logged by default in the
    /var/log/dpkg.log file.  This file is rotated monthly and can be
    disabled by commenting the line in /etc/dpkg/dpkg.cfg.
  * User decisions about conffiles are now logged.
  * dpkg-source no longer complains about Enhances field.  Closes: #159642,
    #159745, #159746.
  * preinst no longer relies on procps being installed.  Closes: #311808.

  * Architecture Support:
    - Change DEB_*_GNU_CPU from i386 to i486, to reflect reality.
      DEB_*_ARCH_CPU remains at i386, you should be checking against that.
      Closes: #310394.
    - Fixed order ostable is read to prevent Linux becoming the Hurd.
      Closes: #309603.
  * Updated Manpage Translations (Christian Perrier):
    - Syntax error corrected in Swedish man page for dpkg-deb.
      Closes: #300980.
    - Syntax error corrected in Spanish man page for dpkg-scanpackages.
      Closes: #300981

 -- Scott James Remnant <scott@netsplit.com>  Mon,  6 Jun 2005 05:34:21 +01=
00

Scott
--=20
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

--=-SaUmRbVW82UpvEMKuy4a
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQBCp9KWIexP3IStZ2wRAsiYAJ0TzX9v4AYYHRnBvAqNpCmysjLxnQCfRaoh
eXghxRL01HZmmbLv22Xyy/c=
=q/nB
-----END PGP SIGNATURE-----

--=-SaUmRbVW82UpvEMKuy4a--



Reply to: