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

Bug#545464: marked as done (dpkg-cross: multiarch support)

Your message dated Sat, 27 Feb 2010 21:37:47 +0000
with message-id <E1NlUM7-0001RT-GA@ries.debian.org>
and subject line Bug#545464: fixed in dpkg-cross 2.5.6
has caused the Debian Bug report #545464,
regarding dpkg-cross: multiarch support
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 owner@bugs.debian.org
immediately.)


-- 
545464: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545464
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: dpkg-cross
Version: 2.5.3+adhoc
Severity: normal
Tags: patch

Hi,

this patch implements basic multiarch support by simply copying files in
/usr/{include,lib}/$DEB_HOST_GNU_ARCH to the destination package.

I am not 100% sure this will be sufficient for all packages to work,
although I think that packages that would expect us to do some
transformation here would also fail when Debian switches to multiarch.

Severity "normal" since this is urgent to get into Debian before eglibc
switches.

The patch might apply at an offset, as I built it on top of the ad-hoc
architecture definition patch.

   Simon

-- Package-specific info:

-- (/etc/dpkg-cross/cross-compile not submitted) --


-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dpkg-cross depends on:
ii  binutils-multiarch 2.19.51.20090827-1    Binary utilities that support mult
ii  debconf [debconf-2 1.5.27                Debian configuration management sy
ii  dpkg-dev           1.15.3.1+adhoc        Debian package development tools
ii  libdebian-dpkgcros 2.5.3+adhoc+multiarch functions to aid cross-compiling D
ii  perl               5.10.0-25             Larry Wall's Practical Extraction 

Versions of packages dpkg-cross recommends:
ii  fakeroot                      1.13       Gives a fake root environment

dpkg-cross suggests no packages.

-- debconf information:
* dpkg-cross/default-arch: None

diff -Nru dpkg-cross-2.5.3+adhoc/Debian/DpkgCross.pm dpkg-cross-2.5.3+adhoc+multiarch/Debian/DpkgCross.pm
--- dpkg-cross-2.5.3+adhoc/Debian/DpkgCross.pm	2009-09-04 16:43:39.000000000 +0200
+++ dpkg-cross-2.5.3+adhoc+multiarch/Debian/DpkgCross.pm	2009-09-07 12:52:54.000000000 +0200
@@ -404,6 +404,7 @@
 
 	$crosslib64 ||= $crosslib . "64";
 	$crosslib32 ||= $crosslib . "32";
+	$config{'crosstype'} = $deb_host_gnu_type;
 	$config{'crossbase'} = $crossbase;
 	$config{'crossprefix'} = $crossprefix;
 	$config{'crossdir'} = $crossdir;
diff -Nru dpkg-cross-2.5.3+adhoc/debian/changelog dpkg-cross-2.5.3+adhoc+multiarch/debian/changelog
--- dpkg-cross-2.5.3+adhoc/debian/changelog	2009-09-04 16:40:09.000000000 +0200
+++ dpkg-cross-2.5.3+adhoc+multiarch/debian/changelog	2009-09-07 12:29:12.000000000 +0200
@@ -1,3 +1,9 @@
+dpkg-cross (2.5.3+adhoc+multiarch) unstable; urgency=low
+
+  * Add multiarch support patch
+
+ -- Simon Richter <sjr@debian.org>  Mon, 07 Sep 2009 12:28:55 +0200
+
 dpkg-cross (2.5.3+adhoc) unstable; urgency=low
 
   * Add ad-hoc arch definition patch
diff -Nru dpkg-cross-2.5.3+adhoc/dpkg-cross dpkg-cross-2.5.3+adhoc+multiarch/dpkg-cross
--- dpkg-cross-2.5.3+adhoc/dpkg-cross	2009-09-04 16:41:18.000000000 +0200
+++ dpkg-cross-2.5.3+adhoc+multiarch/dpkg-cross	2009-09-07 12:52:02.000000000 +0200
@@ -215,7 +215,7 @@
 @keepdeps $dpkg_statfile $progname $debname $anyway $cross2cross
 $crossdir $crosslib $crosslib64 $crosslib32 $crossinc $data $len
 $retval $dpkg_cmd $mode $pkg @exlist $conffile $removedeps $keepdeps
-$DPKGCROSSVERSION $keep_temp $gnuarch);
+$DPKGCROSSVERSION $keep_temp $gnuarch $crosstype);
 
 $dpkg_statfile = "/var/lib/dpkg/status";
 &read_config;
@@ -721,6 +721,7 @@
 		return 1;
 	}
 	my $config = &get_config;
+	$crosstype = $$config{'crosstype'};
 	$crossinc = $$config{'crossinc'};
 	$crossdir = $$config{'crossdir'};
 	$crosslib = $$config{'crosslib'};
@@ -765,6 +766,10 @@
 			}
 			close(FROM);
 			close(TO);
+		} elsif (m:^/usr/include/$crosstype/:) {
+			link_file("$src$_", "$dst$_") or goto fail;
+		} elsif (m:^/usr/lib/$crosstype/:) {
+			link_file("$src$_", "$dst$_") or goto fail;
 		} elsif (m:^/usr(/X11R6)?/include/:) {
 			# regular file under /usr/include or /usr/X11R6/include
 			link_file("$src$_", "$dst$crossinc/$'") or goto fail;

--- End Message ---
--- Begin Message --- 
Source: dpkg-cross
Source-Version: 2.5.6

We believe that the bug you reported is fixed in the latest version of
dpkg-cross, which is due to be installed in the Debian FTP archive:

dpkg-cross_2.5.6.dsc
  to main/d/dpkg-cross/dpkg-cross_2.5.6.dsc
dpkg-cross_2.5.6.tar.gz
  to main/d/dpkg-cross/dpkg-cross_2.5.6.tar.gz
dpkg-cross_2.5.6_all.deb
  to main/d/dpkg-cross/dpkg-cross_2.5.6_all.deb
libdebian-dpkgcross-perl_2.5.6_all.deb
  to main/d/dpkg-cross/libdebian-dpkgcross-perl_2.5.6_all.deb



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 545464@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Neil Williams <codehelp@debian.org> (supplier of updated dpkg-cross 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 ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 09 Feb 2010 20:55:35 +0000
Source: dpkg-cross
Binary: dpkg-cross libdebian-dpkgcross-perl
Architecture: source all
Version: 2.5.6
Distribution: unstable
Urgency: low
Maintainer: Debian Embedded Group <debian-embedded@lists.debian.org>
Changed-By: Neil Williams <codehelp@debian.org>
Description: 
 dpkg-cross - tools for cross compiling Debian packages
 libdebian-dpkgcross-perl - functions to aid cross-compiling Debian packages
Closes: 545464 566744
Changes: 
 dpkg-cross (2.5.6) unstable; urgency=low
 .
   * Implement transitionary support for Multi-Arch (Closes: #545464)
   * Allow for apt-cross to not be installed when checking list of
     multiarch packages (Closes: #566744)
Checksums-Sha1: 
 1db653b47725c8fe0662bc56c711d76a5238d042 1209 dpkg-cross_2.5.6.dsc
 0612428e0c2c61c887f8e38030e6f87ccf52dd5e 72328 dpkg-cross_2.5.6.tar.gz
 45327b833107c6ac5561777a89d899d13427705a 52656 dpkg-cross_2.5.6_all.deb
 741e8692be635ab111c5d113ffbe255bac759e61 28844 libdebian-dpkgcross-perl_2.5.6_all.deb
Checksums-Sha256: 
 25219636161a95da629311793b3a2b523e548c01e49d298cd85bc66dee94f9e1 1209 dpkg-cross_2.5.6.dsc
 a29a2638d22b6357da2e5eb542436dc7a03acb0ebb4a80c71ef5a81d076dc489 72328 dpkg-cross_2.5.6.tar.gz
 6fca1145792f8abb7027c2f12c2d924ade7aea8a2a9451a1b009f7b5d380725d 52656 dpkg-cross_2.5.6_all.deb
 0888a55f6255cff34c075efada6fa318262791b54852ee3c5512d2b1336c2750 28844 libdebian-dpkgcross-perl_2.5.6_all.deb
Files: 
 5eccbb08bfa40939b9683ec0a1132118 1209 utils extra dpkg-cross_2.5.6.dsc
 31f756a3e3c846a7c7a1ce7a77c450a6 72328 utils extra dpkg-cross_2.5.6.tar.gz
 5a36d5bef5f631fbe578a0e8f19f8d22 52656 utils extra dpkg-cross_2.5.6_all.deb
 10c5e64fa2fc73679384841dae57500e 28844 perl extra libdebian-dpkgcross-perl_2.5.6_all.deb

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

iEYEARECAAYFAkuJd0UACgkQiAEJSii8s+PeawCgqKpf2ARqzzcTcJzohq6PG6hr
OhoAoOYxBfVbVOLJiw0yr2I2Sxr1EKi5
=IM2c
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: