summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
12ef823)
Now we don't always take the corresponding distribution, though this is
the default.
i386_QEMUHOST = $(32BIT_QEMUHOST)
amd64_QEMUHOST = $(64BIT_QEMUHOST)
i386_QEMUHOST = $(32BIT_QEMUHOST)
amd64_QEMUHOST = $(64BIT_QEMUHOST)
+## Which distribution of Qemu to use.
+CONFIG_VARS += $(foreach d,$(DISTS),$d_QEMUDIST)
+
## Qemu architecture names. These tell us which Qemu binary to use for a
## particular Debian architecture.
CONFIG_VARS += $(foreach a,$(FOREIGN_ARCHS),$a_QEMUARCH)
## Qemu architecture names. These tell us which Qemu binary to use for a
## particular Debian architecture.
CONFIG_VARS += $(foreach a,$(FOREIGN_ARCHS),$a_QEMUARCH)
"*_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)
}
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)
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]