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

Bug#422871: marked as done (dpkg-cross: add support for "cross" -dev packages for non-default libc)

Your message dated Sat, 12 May 2007 11:17:02 +0000
with message-id <E1Hmpaw-0008LQ-5I@ries.debian.org>
and subject line Bug#422871: fixed in dpkg-cross 1.37
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)
--- Begin Message --- 
Package: dpkg-cross
Version: 1.32
Severity: wishlist
Tags: patch

Hello,

the attached patch adds handling for /usr/host-triplet/ paths in the
input package.

The --cross2cross option decides how files and links in these
directories are treated. If the option is unset, the files are not
considered for conversion; if the option is set, the files are taken
over with their path unchanged (symlink destinations are converted if
they point outside of the "cross" prefix).

   Simon

-- System Information:
Debian Release: 4.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-amd64
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)

Versions of packages dpkg-cross depends on:
ii  binutils                     2.17-3      The GNU assembler, linker and bina
ii  dpkg-dev                     1.13.25     package building tools for Debian
ii  file                         4.17-5etch1 Determines file type using "magic"

dpkg-cross recommends no packages.

-- no debconf information

--- /usr/bin/dpkg-cross	2006-10-15 13:18:11.000000000 +0200
+++ dpkg-cross	2007-05-08 16:01:45.000000000 +0200
@@ -68,6 +68,7 @@
 $mode = "";
 $verbose = 1;
 $anyway = 0;
+$cross2cross = 0;
 while( @ARGV ) {
     $_= shift( @ARGV );
     last if m/^--$/;
@@ -126,6 +127,9 @@
 	elsif (/^(-A|--convert-anyway)$/) {
 		$anyway = 1;
 	}
+	elsif (/^(--cross2cross)$/) {
+		$cross2cross = 1;
+	}
 	else {
 		die "$progname: Unknown option $_.\n";
 	}
@@ -529,6 +533,13 @@
 			} else {
 				link_file("$src$_", "$dst$crosslib/$3") or goto fail;
 			}
+		} elsif (/^\/usr\/\w+-\w+(-\w+(-\w+)?)?\/(lib|include)\//) {
+			# regular file under /usr/<host>/lib or include
+			if ($cross2cross) {
+				link_file("$src$_", "$dst$_");
+			} else {
+				next;
+			}
 		} elsif (/^(\/usr(\/X11R6)?)?\/lib64\/([^\/]+\.so[^\/]*)$/) {
 			# regilar .so* file under /lib64, /usr/lib64 or /usr/X11R6/lib64
 			if (is_ldscript("$src$_")) {
@@ -589,6 +600,7 @@
 		s/^$src//;
 		# Ignore any symlinks not under /usr or /lib or /lib64
 		/^\/(usr|lib|lib64)/ or next;
+		next if (/^\/usr\/\w+-\w+(-\w+(-\w+)?)?\// && !$cross2cross);
 		# Find out (absolute) symlink destination
 		my $lv = readlink("$src$_");
 		if ($lv =~ /^[^\/]/) {

--- /usr/share/perl5/dpkg-cross.pl	2006-10-15 13:18:11.000000000 +0200
+++ dpkg-cross.pl	2007-05-08 15:58:25.000000000 +0200
@@ -609,6 +609,8 @@
 		$path = "$crosslib/$'";
 	} elsif ($path =~ /^(\/usr(\/X11R6)?)?\/lib64\//) {
 		$path = "$crosslib64/$'";
+	} elsif ($path =~ /^\/usr\/\w+-\w+(-\w+(-\w+)?)?\//) {
+		# leave alone
 	} else {
 		$path =~ s/^\/usr/$crossdir/;
 	}

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

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_1.37.dsc
  to pool/main/d/dpkg-cross/dpkg-cross_1.37.dsc
dpkg-cross_1.37.tar.gz
  to pool/main/d/dpkg-cross/dpkg-cross_1.37.tar.gz
dpkg-cross_1.37_all.deb
  to pool/main/d/dpkg-cross/dpkg-cross_1.37_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 422871@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.7
Date: Wed, 09 May 2007 12:12:45 +0100
Source: dpkg-cross
Binary: dpkg-cross
Architecture: source all
Version: 1.37
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
Closes: 379004 415522 422871
Changes: 
 dpkg-cross (1.37) unstable; urgency=low
 .
   * add support for "cross" -dev packages for non-default libc
   (Closes: #422871)
   * migrate armel support to unstable.
   * [INTL:nl] Dutch po-debconf translation (Closes: #415522)
   * symlinks in linux-header packages are not converted
   (Closes: #379004)
Files: 
 649f77cfa2c851fbccfab5902b80a168 801 utils extra dpkg-cross_1.37.dsc
 3755af939ad548232a21de863ca426b8 71758 utils extra dpkg-cross_1.37.tar.gz
 2055e386146030997f91438339527d61 66016 utils extra dpkg-cross_1.37_all.deb

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

iD8DBQFGRZ2hiAEJSii8s+MRAtzRAKCJ+aoTeEcmVKUu7of2eu5xVKk8rwCg1N2c
mL5/4+fGguRnA1wiwqAJBJM=
=euG2
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: