Makefile, bin/chroot-maint: Allow source distribution selection for Qemu.

[distorted-chroot] / bin / chroot-maint

diff --git a/bin/chroot-maint b/bin/chroot-maint
index ba51ec5ed209c15a6e8b136cab63cde9eea173f3..34dec2e68e55715d03082dd15b59ad5c18bc7130 100755 (executable)
--- a/bin/chroot-maint
+++ b/bin/chroot-maint
@@ -1431,6 +1431,7 @@ class Config (object):
     "*_DEPS": ("PKGDEPS", _conv_list),
     "*_QEMUHOST": ("QEMUHOST", _conv_str),
     "*_QEMUARCH": ("QEMUARCH", _conv_str),
     "*_DEPS": ("PKGDEPS", _conv_list),
     "*_QEMUHOST": ("QEMUHOST", _conv_str),
     "*_QEMUARCH": ("QEMUARCH", _conv_str),

+    "*_QEMUDIST": ("QEMUDIST", _conv_str),

     "*_ALIASES": ("DISTALIAS", _conv_str)
   }
 
     "*_ALIASES": ("DISTALIAS", _conv_str)
   }
 


@@ -1858,7 +1859,8 @@ class ChrootJob (BaseJob):
       me._tools_chroot = CrossToolsJob.ensure\
         ("%s-%s" % (me._dist, C.TOOLSARCH), FRESH)
       me._qemu_chroot = CrossToolsJob.ensure\
       me._tools_chroot = CrossToolsJob.ensure\
         ("%s-%s" % (me._dist, C.TOOLSARCH), FRESH)
       me._qemu_chroot = CrossToolsJob.ensure\

-        ("%s-%s" % (me._dist, C.QEMUHOST[me._arch]), FRESH)
+        ("%s-%s" % (C.QEMUDIST.get(me._dist, me._dist),
+                    C.QEMUHOST[me._arch]), FRESH)

       me.await(me._tools_chroot)
       me.await(me._qemu_chroot)
 
       me.await(me._tools_chroot)
       me.await(me._qemu_chroot)
 


@@ -1895,9 +1897,10 @@ class ChrootJob (BaseJob):
       crossdir = OS.path.join(C.LOCAL, "cross",
                               "%s-%s" % (dist, C.TOOLSARCH))
 
       crossdir = OS.path.join(C.LOCAL, "cross",
                               "%s-%s" % (dist, C.TOOLSARCH))
 

-      qarch, qhost = C.QEMUARCH[arch], C.QEMUHOST[arch]
+      qarch, qhost, qdist = \
+        C.QEMUARCH[arch], C.QEMUHOST[arch], C.QEMUDIST.get(dist, dist)

       qemudir = OS.path.join(C.LOCAL, "cross",
       qemudir = OS.path.join(C.LOCAL, "cross",

-                             "%s-%s" % (dist, qhost), "QEMU")
+                             "%s-%s" % (qdist, qhost), "QEMU")

 
       ## Acquire lockfiles in a canonical order to prevent deadlocks.
       donors = [C.TOOLSARCH]
 
       ## Acquire lockfiles in a canonical order to prevent deadlocks.
       donors = [C.TOOLSARCH]