Changeset 151 for trunk

Timestamp:

06/11/10 14:25:18 (14 years ago)

Author:

kdeugau

Message:

/trunk

Update Debian release version mappings
Tweak the Debian version autodetection
Add another kernel-innards "library" to the list to ignore

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -131 +131 @@
         "3.1"   => "sarge",
         "4"     => "etch",
-        "4.0"   => "lenny",
-        "4.0.0" => "sid");
+        "5"     => "lenny",
+        "5.0.0" => "squeeze",
+        "99"    => "sid");
 # Enh.  There doesn't seem to be any better way to do this...  :(
 {
-  my $basever = qx { dpkg-query --showformat '\${version}' -W base-files };
-  if ($basever =~ /^\d\.\d\.(\d)$/) {
-    $basever =~ s/\.\d$// if $1 ne '0';
-  }
-# want to do something with this...   erm, what was I going to do?  O_o
-  my $releasever = qx { cat /etc/debian_version };
-  chomp $releasever;
+# could theoretically also do something with this...  it's about as stable as "dpkg-query ..." below...  :(
+#  my $releasever = qx { cat /etc/debian_version };
+#  chomp $releasever;
+  my $basever;
+
+  if ( ! -e '/usr/bin/dpkg-query' ) {
+    # call it woody, since sarge and newer have dpkg-query, and we don't much care about obsolete^n releases
+    $basever = "3.0";
+  } else {
+
+    # for the lazy copy-paster:  dpkg-query --showformat '${version}\n' -W base-files
+    # avoid shellisms
+    if (open BASEGETTER, "-|", "dpkg-query", "--showformat", '${version}', "-W", "base-files") {
+      $basever = <BASEGETTER>;
+      close BASEGETTER;
+
+      if ($basever =~ /^\d\.\d\.\d$/) {
+        # sarge, possibly squeeze O_o  (5.0.0 as of 2010/02/03)
+        $basever =~ s/\.\d$//;
+      }
+      $basever = 5 if ($basever =~ /lenny/);
+    }
+
+  } # got dpkg-query?
 
   $specglobals{"debdist"} = $distmap{$basever};
-  $specglobals{"debver"} = $basever;    # this may have trouble with Ubuntu versions?
-}
+  $specglobals{"debver"} = $basever;   # this may have trouble with Ubuntu versions?
+
+} # done trying to set debian dist/version
 
 # Package data
@@ -1441 +1460 @@
     next if m|/lib(?:64)?/ld-linux|;    # Hack! Hack!  PTHBTT!  (libc suxx0rz)
     next if /linux-gate.so/;            # Kernel hackery for teh W1n!!1!1eleventy-one!1  (Don't ask.  Feh.)
+    next if /linux-vdso.so/;            # More kernel hackery.  Whee!
 
     my ($req) = (m|=\>\s+([a-z0-9._/-]+)|); # dig out the actual library (so)name.