Package: xen / 4.11.1+92-g6c33308a8d-2

Metadata

Package Version Patches format
xen 4.11.1+92-g6c33308a8d-2 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
0001 docs man Fix two typos detected by the Debian lintia.patch | (download)

docs/man/xenstore.pod.1 | 2 1 + 1 - 0 !
docs/man/xl.pod.1.in | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 docs/man: fix two typos detected by the debian lintian tool

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0002 tools xentrace xenalyze Fix typos detected by lintia.patch | (download)

tools/xentrace/xenalyze.c | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 tools/xentrace/xenalyze: fix typos detected by lintian

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0003 Various Fix typos unkown retreive detected by lintia.patch | (download)

tools/hotplug/Linux/block-drbd-probe | 2 1 + 1 - 0 !
tools/libxc/xc_dom_elfloader.c | 2 1 + 1 - 0 !
tools/libxl/libxl_dm.c | 2 1 + 1 - 0 !
tools/libxl/libxl_event.h | 2 1 + 1 - 0 !
tools/libxl/libxl_qmp.c | 2 1 + 1 - 0 !
xen/include/xen/libfdt/libfdt.h | 2 1 + 1 - 0 !
6 files changed, 6 insertions(+), 6 deletions(-)

 various: fix typos `unkown', `retreive' (detected by lintian)

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0004 Various Fix typo occured.patch | (download)

tools/xl/xl_flask.c | 2 1 + 1 - 0 !
xen/arch/arm/arm64/lib/memcmp.S | 2 1 + 1 - 0 !
xen/arch/x86/hvm/hvm.c | 2 1 + 1 - 0 !
xen/arch/x86/hvm/svm/intr.c | 2 1 + 1 - 0 !
xen/drivers/passthrough/arm/smmu.c | 2 1 + 1 - 0 !
xen/include/efi/efiprot.h | 2 1 + 1 - 0 !
xen/include/public/xen.h | 2 1 + 1 - 0 !
xen/include/xen/sched.h | 2 1 + 1 - 0 !
8 files changed, 8 insertions(+), 8 deletions(-)

 various: fix typo `occured'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0005 Various Fix typo reseting.patch | (download)

tools/misc/xenlockprof.c | 2 1 + 1 - 0 !
tools/misc/xenperf.c | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 various: fix typo `reseting'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0006 tools python xen lowlevel Fix typo sucess.patch | (download)

tools/python/xen/lowlevel/xc/xc.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/python/xen/lowlevel: fix typo `sucess'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0007 Various Fix typo infomation.patch | (download)

tools/libxl/libxl_internal.h | 2 1 + 1 - 0 !
tools/python/xen/lowlevel/xc/xc.c | 2 1 + 1 - 0 !
tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 1 + 1 - 0 !
xen/common/sched_rt.c | 2 1 + 1 - 0 !
xen/drivers/acpi/apei/erst.c | 2 1 + 1 - 0 !
xen/include/public/domctl.h | 2 1 + 1 - 0 !
6 files changed, 6 insertions(+), 6 deletions(-)

 various: fix typo `infomation'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0008 Various Fix typo mappping.patch | (download)

tools/python/xen/lowlevel/xc/xc.c | 2 1 + 1 - 0 !
xen/drivers/passthrough/vtd/iommu.h | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 various: fix typo `mappping'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

misc/tools xentop replace use of deprecated vwprintw.patch | (download)

tools/xenstat/xentop/xentop.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/xentop : replace use of deprecated vwprintw

gcc-8.1 complains:

| xentop.c: In function 'print':
| xentop.c:304:4: error: 'vwprintw' is deprecated [-Werror=deprecated-declarations]
|     vwprintw(stdscr, (curses_str_t)fmt, args);
|     ^~~~~~~~

vw_printw (note the underscore) is a non-deprecated alternative.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>

0010 tools Rules.mk Honour PREPEND_LDFLAGS_XEN_TOOLS.patch | (download)

tools/Rules.mk | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 tools/rules.mk: honour prepend_ldflags_xen_tools

This allows the caller to provide some LDFLAGS to the Xen build
system.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0011 INSTALL Mention kconfig.patch | (download)

INSTALL | 20 20 + 0 - 0 !
1 file changed, 20 insertions(+)

 install: mention kconfig

Firstly, add a reference to the documentation for the kconfig system.

Secondly, warn the user about the XEN_CONFIG_EXPERT problem.

CC: Doug Goldstein <cardoe@cardoe.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0012 docs man Provide properly formatted NAME sections.patch | (download)

docs/man/xen-pci-device-reservations.pod.7 | 4 4 + 0 - 0 !
docs/man/xen-pv-channel.pod.7 | 2 1 + 1 - 0 !
docs/man/xen-tscmode.pod.7 | 4 4 + 0 - 0 !
docs/man/xen-vtpm.pod.7 | 6 6 + 0 - 0 !
docs/man/xen-vtpmmgr.pod.7 | 4 4 + 0 - 0 !
docs/man/xl-numa-placement.pod.7 | 2 1 + 1 - 0 !
6 files changed, 20 insertions(+), 2 deletions(-)

 docs/man: provide properly-formatted name sections

A manpage `foo.7.pod' must start with

  =head NAME

  foo - some summary of what foo is or what this manpage is

because otherwise manpage catalogue systems cannot generate a proper
`whatis' entry.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0013 docs man xen pv channel.pod.7 Remove a spurious blan.patch | (download)

docs/man/xen-pv-channel.pod.7 | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 docs/man/xen-pv-channel.pod.7: remove a spurious blank line

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0014 tools xenstat Fix shared library version.patch | (download)

tools/xenstat/libxenstat/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/xenstat: fix shared library version

libxenstat does not have a stable ABI.  Set its version to the current
Xen release version.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0015 gdbsx Honour LDFLAGS when linking.patch | (download)

tools/debugger/gdbsx/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gdbsx: honour ldflags when linking

This command does the link, so it needs LDFLAGS.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0016 libfsimage Honour general LDFLAGS.patch | (download)

tools/libfsimage/common/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 libfsimage: honour general ldflags

Do not reset LDFLAGS to empty.  Instead, append the fsimage-special
LDFLAGS.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0017 pygrub fsimage.so Honour LDFLAGS when building.patch | (download)

tools/pygrub/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 pygrub fsimage.so: honour ldflags when building

This seems to have been simply omitted.  Obviously this is needed when
building and not just when installing.  Passing only when installing
is ineffective.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0018 xenmon Install as xenmon not xenmon.py.patch | (download)

tools/xenmon/Makefile | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 xenmon: install as xenmon, not xenmon.py

Adding the implementation language as a suffix to a program name is
poor practice.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0019 tools debugger kdd Install as xen kdd not just kdd.patch | (download)

tools/debugger/kdd/Makefile | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 tools/debugger/kdd: install as `xen-kdd', not just `kdd'

`kdd' is an unfortunate namespace landgrab.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

xenstore/tools fake xs restrict.patch | (download)

tools/xenstore/include/xenstore.h | 5 5 + 0 - 0 !
tools/xenstore/xs.c | 6 6 + 0 - 0 !
2 files changed, 11 insertions(+)

 tools-fake-xs-restrict


xenstore/tools xenstore compatibility.diff | (download)

tools/xenstore/include/xenstore.h | 1 1 + 0 - 0 !
tools/xenstore/xenstore_client.c | 2 1 + 1 - 0 !
tools/xenstore/xs.c | 4 3 + 1 - 0 !
3 files changed, 5 insertions(+), 2 deletions(-)

 tools-xenstore-compatibility.diff

0022 Delete config.sub and config.guess.patch | (download)

config.guess | 1530 0 + 1530 - 0 !
config.sub | 1782 0 + 1782 - 0 !
2 files changed, 3312 deletions(-)

 delete config.sub and config.guess

dh_autoreconf will provide these back.

If this patch does not apply when rebasing, you can simply delete the
files again.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0023 Delete configure output.patch | (download)

configure | 3618 0 + 3618 - 0 !
docs/configure | 3484 0 + 3484 - 0 !
tools/configure | 11044 0 + 11044 - 0 !
3 files changed, 18146 deletions(-)

 delete configure output

These autogenerated files are not useful in Debian; dh_autoreconf will
regenerate them.

If this patch does not apply when rebasing, you can simply delete the
files again.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0024 xenpmd make 32 bit gcc 8.1 non debug build work.patch | (download)

tools/xenpmd/xenpmd.c | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 xenpmd: make 32 bit gcc 8.1 non-debug build work

32 bit gcc 8.1 non-debug build yields:

xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=]
     snprintf(val, 3, "%02x",
                       ^~~~
xenpmd.c:354:22: note: directive argument in the range [40, 2147483778]
     snprintf(val, 3, "%02x",
                      ^~~~~~
xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3
     snprintf(val, 3, "%02x",
     ^~~~~~~~~~~~~~~~~~~~~~~~
              (unsigned int)(9*4 +
              ~~~~~~~~~~~~~~~~~~~~
                             strlen(info->model_number) +
                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                             strlen(info->serial_number) +
                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                             strlen(info->battery_type) +
                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                             strlen(info->oem_info) + 4));
                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

All info->* used in calculation are 32 bytes long, and the parsing
code makes sure they are null-terminated, so the end result of the
expression won't exceed 255, which should be able to be fit into 3
bytes in hexadecimal format.

Add an assertion to make gcc happy.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
0025 tools Move ARRAY_SIZE into xen tools libs.h.patch | (download)

tools/include/xen-tools/libs.h | 4 4 + 0 - 0 !
tools/libxc/xc_private.h | 7 2 + 5 - 0 !
tools/libxl/libxl_internal.h | 4 2 + 2 - 0 !
tools/misc/xen-cpuid.c | 3 2 + 1 - 0 !
tools/misc/xen-diag.c | 2 0 + 2 - 0 !
tools/misc/xen-hptool.c | 3 0 + 3 - 0 !
tools/misc/xen-livepatch.c | 2 0 + 2 - 0 !
tools/misc/xen-mfndump.c | 3 0 + 3 - 0 !
tools/misc/xenpm.c | 4 2 + 2 - 0 !
tools/python/xen/lowlevel/xc/xc.c | 2 1 + 1 - 0 !
tools/tests/vhpet/emul.h | 6 2 + 4 - 0 !
tools/tests/x86_emulator/x86-emulate.h | 14 2 + 12 - 0 !
tools/tests/xen-access/xen-access.c | 6 2 + 4 - 0 !
tools/tests/xenstore/xs-test.c | 3 2 + 1 - 0 !
tools/xenstore/utils.h | 6 2 + 4 - 0 !
tools/xentrace/analyze.h | 2 1 + 1 - 0 !
16 files changed, 24 insertions(+), 47 deletions(-)

 tools: move array_size() into xen-tools/libs.h

xen-tools/libs.h currently contains a shared BUILD_BUG_ON() implementation and
is used by some tools.  Extend this to include ARRAY_SIZE and clean up all the
opencoding.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
0026 libxl arm Fix build on arm64 acpi w gcc 8.2.patch | (download)

tools/libxl/libxl_arm_acpi.c | 10 7 + 3 - 0 !
1 file changed, 7 insertions(+), 3 deletions(-)

 libxl/arm: fix build on arm64 + acpi w/ gcc 8.2

Add zero-padding to #defined ACPI table strings that are copied.
Provides sufficient characters to satisfy the length required to
fully populate the destination and prevent array-bounds warnings.
Add BUILD_BUG_ON sizeof checks for compile-time length checking.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
0027 tools kdd mute spurious gcc warning.patch | (download)

tools/debugger/kdd/kdd.c | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 tools/kdd: mute spurious gcc warning
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

gcc-8 complains:

    kdd.c:698:13: error: 'memcpy' offset [-204, -717] is out of the bounds [0, 216] of object 'ctrl' with type 'kdd_ctrl' {aka 'union <anonymous>'} [-Werror=array-bounds]
                 memcpy(buf, ((uint8_t *)&ctrl.c32) + offset, len);
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    kdd.c: In function 'kdd_select_callback':
    kdd.c:642:14: note: 'ctrl' declared here
         kdd_ctrl ctrl;
                  ^~~~

But this is impossible - 'offset' is unsigned and correctly validated
few lines before.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
misc/version.diff | (download)

xen/Makefile | 8 5 + 3 - 0 !
xen/common/kernel.c | 4 2 + 2 - 0 !
xen/common/version.c | 22 11 + 11 - 0 !
xen/drivers/char/console.c | 9 3 + 6 - 0 !
xen/include/xen/compile.h.in | 8 4 + 4 - 0 !
xen/include/xen/version.h | 7 4 + 3 - 0 !
6 files changed, 29 insertions(+), 29 deletions(-)

 version

prefix abiname/config prefix.diff | (download)

Config.mk | 2 1 + 1 - 0 !
config/Paths.mk.in | 1 1 + 0 - 0 !
2 files changed, 2 insertions(+), 1 deletion(-)

 config-prefix.diff

0030 Do not ship COPYING into usr include.patch | (download)

tools/include/Makefile | 2 0 + 2 - 0 !
1 file changed, 2 deletions(-)

 do not ship copying into /usr/include

This is not wanted in Debian.  COPYING ends up in
/usr/share/doc/xen-*copyright.

misc/tools xenmon install.diff | (download)

tools/xenmon/Makefile | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 tools-xenmon-install.diff

misc/tools pygrub remove static solaris support | (download)

tools/pygrub/src/pygrub | 51 1 + 50 - 0 !
1 file changed, 1 insertion(+), 50 deletions(-)

 remove static solaris support from pygrub

Patch-Name: tools-pygrub-remove-static-solaris-support

misc/toolstestsx86_emulator pass no pie fno.patch | (download)

tools/tests/x86_emulator/Makefile | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 tools/tests/x86_emulator: pass -no-pie -fno-pic to gcc on x86_32

The current build fails with GCC6 on Debian sid i386 (unstable):

 /tmp/ccqjaueF.s: Assembler messages:
 /tmp/ccqjaueF.s:3713: Error: missing or invalid displacement expression `vmovd_to_reg_len@GOT'

This is due to the combination of GCC6, and Debian's decision to
enable some hardening flags by default (to try to make runtime
addresses less predictable):
  https://wiki.debian.org/Hardening/PIEByDefaultTransition

This is of no benefit for the x86 instruction emulator test, which is
a rebuild of the emulator code for testing purposes only.  So pass
options to disable this.

These options will be no-ops if they are the same as the compiler
default.

0034 Do not build the instruction emulator.patch | (download)

tools/fuzz/Makefile | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 do not build the instruction emulator

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

prefix abiname/tools libfsimage abiname.diff | (download)

tools/libfsimage/common/Makefile | 20 4 + 16 - 0 !
1 file changed, 4 insertions(+), 16 deletions(-)

 tools-libfsimage-abiname.diff

prefix abiname/tools libfsimage prefix.diff | (download)

tools/Rules.mk | 2 2 + 0 - 0 !
tools/libfsimage/Rules.mk | 3 2 + 1 - 0 !
tools/libfsimage/common/Makefile | 8 5 + 3 - 0 !
3 files changed, 9 insertions(+), 4 deletions(-)

 tools-libfsimage-prefix.diff

0037 autoconf Provide libexec_libdir_suffix.patch | (download)

m4/paths.m4 | 9 8 + 1 - 0 !
1 file changed, 8 insertions(+), 1 deletion(-)

 autoconf: provide libexec_libdir_suffix

This is going to be used to put libfsimage.so into a path containing
the multiarch triplet.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0038 .gitignore Add configure output which we always dele.patch | (download)

.gitignore | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 .gitignore: add configure output which we always delete and
 regenerate

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0039 tools firmware Makfile Respect caller s CONFIG_PV_SH.patch | (download)

tools/firmware/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/firmware/makfile: respect caller's config_pv_shim

This makes it easier to disable the shim build.  (In Debian we need to
0040 shim Provide separate install shim target.patch | (download)

tools/firmware/Makefile | 11 7 + 4 - 0 !
1 file changed, 7 insertions(+), 4 deletions(-)

 shim: provide separate install-shim target

When building on a 32-bit userland, the user wants to build 32-bit
tools and a 64-bit hypervisor.  This involves setting XEN_TARGET_ARCH
0041 tools firmware Makefile CONFIG_PV_SHIM enable only o.patch | (download)

tools/firmware/Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/firmware/makefile: config_pv_shim: enable only on x86_64

Previously this was *dis*abled for x86_*32*.  But if someone should
run some of this Makefile on ARM, say, it ought not to be built
either.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

0042 docs man xen vbd interface.7 Provide properly format.patch | (download)

docs/man/xen-vbd-interface.markdown.7 | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 docs/man/xen-vbd-interface.7: provide properly-formatted name
 section

This manpage was omitted from
   docs/man: Provide properly-formatted NAME sections
because I was previously building with markdown not installed.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0043 Revert tools xenstore compatibility.diff.patch | (download)

tools/xenstore/include/xenstore.h | 1 0 + 1 - 0 !
tools/xenstore/xenstore_client.c | 2 1 + 1 - 0 !
tools/xenstore/xs.c | 4 1 + 3 - 0 !
3 files changed, 2 insertions(+), 5 deletions(-)

 revert "tools-xenstore-compatibility.diff"

Following recent discussion in pkg-xen-devel and xen-devel,
  https://lists.xenproject.org/archives/html/xen-devel/2018-10/msg00838.html
I am dropping this patch.

For now I revert it.  When we next debrebase, we can (if we like)
throw away both the original patch, and this revert.

This reverts commit 5047884c76849b67e364bc525d1b3b55e781cf16.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0044 Fix empty fields in first hypervisor log line.patch | (download)

xen/Makefile | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 fix empty fields in first hypervisor log line

Instead of:

    (XEN) Xen version 4.11.1 (Debian )
    (@)
    (gcc (Debian 8.2.0-13) 8.2.0) debug=n
    Thu Jan  3 19:08:37 UTC 2019

I'd like to see:

    (XEN) Xen version 4.11.1 (Debian 4.11.1-1~)
    (pkg-xen-devel@lists.alioth.debian.org)
    (gcc (Debian 8.2.0-13) 8.2.0) debug=n
    Thu Jan  3 22:44:00 CET 2019

The substitution was broken since the great packaging refactoring,
because the directory in which the build is done changed.

Also, use the Maintainer address from debian/control instead of the most
recent changelog entry. If someone wants to use the address to ask a
question, they will end up at the team mailing list, which is better
than an individual person.

0045 vif common disable handle_iptable.patch | (download)

tools/hotplug/Linux/vif-common.sh | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 vif-common: disable handle_iptable

Also see Debian bug #894013. The current attempt at providing
anti-spoofing rules results in a situation that does not have any
effect. Also note that forwarding bridged traffic to iptables is not
enabled by default, and that for openvswitch users it does not make any
sense.

So, stop cluttering the live iptables ruleset.

This functionality seems to be introduced before 2004 and since then it
has never got some additional love.

It would be nice to have a proper discussion upstream about how Xen
could provide some anti mac/ip spoofing in the dom0. It does not seem to
be a trivial thing to do, since it requires having quite some knowledge
about what the domU is allowed to do or not (e.g. a domU can be a
router...).

0046 sysconfig.xencommons.in Strip and debianize.patch | (download)

tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 73 3 + 70 - 0 !
1 file changed, 3 insertions(+), 70 deletions(-)

 sysconfig.xencommons.in: strip and debianize

Strip all options that are for stuff we don't ship, which is 1)
xenstored as stubdom and 2) xenbackendd, which seems to be dead code
anyway. [1]

It seems useful to give the user the option to revert to xenstored
instead of the default oxenstored if they really want.

[1] https://lists.xen.org/archives/html/xen-devel/2015-07/msg04427.html

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>
0047 hotplug common Do not adjust LD_LIBRARY_PATH.patch | (download)

tools/hotplug/Linux/xen-hotplug-common.sh.in | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 hotplug-common: do not adjust ld_library_path

This is in the upstream script because on non-Debian systems, the
default install locations in /usr/local/lib might not be on the linker
path, and as a result the hotplug scripts would break.

A reason we might need it in Debian is our multiple version
coinstallation scheme.  However, the hotplug scripts all call the
utilities via the wrappers, and the binaries are configured to load
from the right place anyway.

This setting is an annoyance because it requires libdir, which is an
arch-specific path but comes from a file we want to put in
xen-utils-common, an arch:all package.

So drop this setting.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0048 pygrub Set sys.path.patch | (download)

tools/pygrub/src/pygrub | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 pygrub: set sys.path

We install libfsimage in a non-standard path for Reasons.
(See debian/rules.)

0049 pygrub Specify rpath LIBEXEC_LIB when building fsima.patch | (download)

tools/pygrub/Makefile | 5 3 + 2 - 0 !
tools/pygrub/setup.py | 5 5 + 0 - 0 !
2 files changed, 8 insertions(+), 2 deletions(-)

 pygrub: specify -rpath libexec_lib when building fsimage.so

If LIBEXEC_LIB is not on the default linker search path, the python
fsimage.so module fails to find libfsimage.so.

Add the relevant directory to the rpath explicitly.

(This situation occurs in the Debian package, where
--with-libexec-libdir is used to put each Xen version's libraries and
utilities in their own directory, to allow them to be coinstalled.)

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

0050 tools xl bash completion also complete xen.patch | (download)

tools/xl/bash-completion | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 tools/xl/bash-completion: also complete 'xen'

We have the `xen` alias for xl in Debian, since in the past it was a
command that could execute either xl or xm.

Now, it always does xl, so, complete the same stuff for it as we have
for xl.

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>

[git-debrebase split: mixed commit: upstream part]