X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Lib.pm;h=28a90f7bdad16b37900c7021d9b055f2d8f6388b;hb=fdf8b4a8b4b4f50c39b6e4266773539bc13d6e56;hp=a11c36a37ce7b5bfd8a900ccd307a516d6e78e07;hpb=64cd63ff797a52da5222024a966d6fdb495af6b5;p=debhelper.git

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index a11c36a..28a90f7 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -15,7 +15,8 @@ use vars qw(@ISA @EXPORT %dh);
 	    &filedoublearray &getpackages &basename &dirname &xargs %dh
 	    &compat &addsubstvar &delsubstvar &excludefile &package_arch
 	    &is_udeb &udeb_filename &debhelper_script_subst &escape_shell
-	    &inhibit_log);
+	    &inhibit_log &load_log &write_log &dpkg_architecture_value
+	    &sourcepackage);
 
 my $max_compat=7;
 
@@ -74,9 +75,6 @@ sub init {
 	# Check if packages to build have been specified, if not, fall back to
 	# the default, doing them all.
 	if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
-		if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
-			error("You asked that all arch in(dep) packages be built, but there are none of that type.");
-		}
 		push @{$dh{DOPACKAGES}},@allpackages;
 	}
 
@@ -105,7 +103,22 @@ sub END {
 	if ($? == 0 && $write_log) {
 		write_log(basename($0), @{$dh{DOPACKAGES}});
 	}
-}	
+}
+
+sub load_log {
+	my ($package, $db)=@_;
+	my $ext=pkgext($package);
+
+	my @log;
+	open(LOG, "<", "debian/${ext}debhelper.log") || return;
+	while (<LOG>) {
+		chomp;
+		push @log, $_;
+		$db->{$package}{$_}=1 if defined $db;
+	}
+	close LOG;
+	return @log;
+}
 
 sub write_log {
 	my $cmd=shift;
@@ -288,6 +301,7 @@ sub dirname {
 				# Try the file..
 				open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
 				my $l=<COMPAT_IN>;
+				close COMPAT_IN;
 				if (! defined $l || ! length $l) {
 					warning("debian/compat is empty, assuming level $c");
 				}
@@ -299,7 +313,7 @@ sub dirname {
 		}
 
 		if ($c < 4 && ! $warned_compat) {
-			warning("Compatibility levels before 4 are deprecated.");
+			warning("Compatibility levels before 5 are deprecated.");
 			$warned_compat=1;
 		}
 	
@@ -333,12 +347,15 @@ sub tmpdir {
 #
 # It tries several filenames:
 #   * debian/package.filename.buildarch
+#   * debian/package.filename.buildos
 #   * debian/package.filename
-#   * debian/file (if the package is the main package)
-# If --name was specified then tonly the first two are tried, and they must
-# have the name after the pacage name:
+#   * debian/filename (if the package is the main package)
+# If --name was specified then the files
+# must have the name after the package name:
 #   * debian/package.name.filename.buildarch
+#   * debian/package.name.filename.buildos
 #   * debian/package.name.filename
+#   * debian/name.filename (if the package is the main package)
 sub pkgfile {
 	my $package=shift;
 	my $filename=shift;
@@ -348,6 +365,7 @@ sub pkgfile {
 	}
 	
 	my @try=("debian/$package.$filename.".buildarch(),
+		 "debian/$package.$filename.".buildos(),
 		 "debian/$package.$filename");
 	if ($package eq $dh{MAINPACKAGE}) {
 		push @try, "debian/$filename";
@@ -588,19 +606,38 @@ sub excludefile {
         return 0;
 }
 
+sub dpkg_architecture_value {
+	my $var = shift;
+	my $value=`dpkg-architecture -q$var 2>/dev/null` || error("dpkg-architecture failed");
+	chomp $value;
+	return $value;
+}
+
 # Returns the build architecture. (Memoized)
 {
 	my $arch;
 	
 	sub buildarch {
-  		return $arch if defined $arch;
-
-		$arch=`dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null` || error("dpkg-architecture failed");
-		chomp $arch;
+		if (!defined $arch) {
+		    $arch=dpkg_architecture_value('DEB_HOST_ARCH');
+		}
 		return $arch;
 	}
 }
 
+# Returns the build OS. (Memoized)
+{
+	my $os;
+
+	sub buildos {
+		return $os if defined $os;
+
+		$os=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null` || error("dpkg-architecture failed");
+		chomp $os;
+		return $os;
+	}
+}
+
 # Passed an arch and a list of arches to match against, returns true if matched
 sub samearch {
 	my $arch=shift;
@@ -613,6 +650,23 @@ sub samearch {
 	return 0;
 }
 
+# Returns source package name
+sub sourcepackage {
+	open (CONTROL, 'debian/control') ||
+	    error("cannot read debian/control: $!\n");
+	while (<CONTROL>) {
+		chomp;
+		s/\s+$//;
+		if (/^Source:\s*(.*)/) {
+			close CONTROL;
+			return $1;
+		}
+	}
+
+	close CONTROL;
+	error("could not find Source: line in control file.");
+}
+
 # Returns a list of packages in the control file.
 # Must pass "arch" or "indep" or "same" to specify arch-dependant or
 # -independant or same arch packages. If nothing is specified, returns all