diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/changelog xen-4.14.2+25-gb6a8c4f72d/debian/changelog --- xen-4.14.2+25-gb6a8c4f72d/debian/changelog 2021-07-30 14:57:52.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/changelog 2021-08-10 17:09:40.000000000 +0000 @@ -1,3 +1,16 @@ +xen (4.14.2+25-gb6a8c4f72d-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4.4.1-9+rpi1 by Peter Michael Green at Sun, 30 Aug 2015 15:43:16 +0000] + * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 + + [changes introduced in 4.6.0-1+rpi1 by Peter Michael Green] + * Use kernel 3.18 for now as I haven't dealt with 4.x yet. + + [changes introduced in 4.11.1+26-g87f51bf366-3+rpi1 by Peter Michael Green] + * Do not fail on files that are not installed. + + -- Raspbian forward porter Tue, 10 Aug 2021 17:09:40 +0000 + xen (4.14.2+25-gb6a8c4f72d-2) unstable; urgency=medium * Add README.Debian.security containing a note about the end of upstream diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/control.md5sum xen-4.14.2+25-gb6a8c4f72d/debian/control.md5sum --- xen-4.14.2+25-gb6a8c4f72d/debian/control.md5sum 2021-07-30 14:57:52.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/control.md5sum 2021-08-10 17:09:40.000000000 +0000 @@ -1,13 +1,29 @@ +<<<<<<< HEAD +fd4431defc3dba21534e5c87b6a54a0e debian/changelog +||||||| merged common ancestors +414390ca652da67ac85ebd905500eb66 debian/changelog +======= 90846bd8cd1227c290d02071e1f3b141 debian/changelog +>>>>>>> debpsuedomerge dc7b5d9f0538e3180af4e9aff9b0bd57 debian/bin/gencontrol.py 9e089bdfb9c848da38da7f50e37a5502 debian/templates/control.main.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in 28356e01cce3f5f226bacec4c49a7f1e debian/templates/control.system.latest.in 03f63e67cf2d915bfbb535f8c9d9e2e4 debian/templates/xen-utils.postinst.in 63ad8a975156f7bf2327f0e1dc7fc9e2 debian/templates/control.source.in +<<<<<<< HEAD +a4fad0ec66d977759a362165bf8aa31d debian/templates/control.hypervisor.in +22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in +df5a318ff90cd0ca3ac7f1a8976bae39 debian/templates/control.utils.in +||||||| merged common ancestors +22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in +a4fad0ec66d977759a362165bf8aa31d debian/templates/control.hypervisor.in +df5a318ff90cd0ca3ac7f1a8976bae39 debian/templates/control.utils.in +======= 22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in 02ec00ee85d07ab4eb277a91df014e0c debian/templates/control.hypervisor.in 4974334083116945da78ec656b4371f5 debian/templates/control.utils.in +>>>>>>> debpsuedomerge dcabf82578122540e0534f72750698d5 debian/templates/xen-utils.lintian-overrides.in b6acd21c3924e6ec6f9c547afbbc7d9e debian/templates/xen-utils.prerm.in 9851cdcecfae45a8c4f95ef676e26973 debian/arch/defines diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/.gitignore xen-4.14.2+25-gb6a8c4f72d/debian/.gitignore --- xen-4.14.2+25-gb6a8c4f72d/debian/.gitignore 2021-07-30 14:57:52.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -.debhelper -*.debhelper.* -*.preinst.debhelper -*.postinst.debhelper -*.prerm.debhelper -*.postrm.debhelper -*.substvars -*.stamp -tmp -*-[0-9]*.bug-control -*-[0-9]*.postinst -*-[0-9]*.postrm -*.tmp -files -xen-doc -xen-hypervisor-common -xen-system-amd64 -xen-system-armhf -xen-system-arm64 -xen-hypervisor-[0-9]*[0-9] -xen-hypervisor-[0-9]*[0-9].install -xen-hypervisor-[0-9]*[0-9].lintian-overrides -xen-utils-[0-9]*[0-9] -xen-utils-[0-9]*[0-9].install -xen-utils-[0-9]*[0-9].NEWS -xen-utils-[0-9]*[0-9].README.Debian -xen-utils-[0-9]*[0-9].lintian-overrides -xen-utils-[0-9]*[0-9].prerm -libxenmisc[0-9]*[0-9].lintian-overrides -libxenmisc[0-9]*[0-9] -libxenmisc[0-9]*[0-9].install -libxenmisc[0-9]*[0-9].lintian-overrides -libxen-dev -libxen*[0-9] -xen-utils-common -xenstore-utils -autoreconf.before -autoreconf.after -debhelper-build-stamp diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/patches/armv6.diff xen-4.14.2+25-gb6a8c4f72d/debian/patches/armv6.diff --- xen-4.14.2+25-gb6a8c4f72d/debian/patches/armv6.diff 1970-01-01 00:00:00.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/patches/armv6.diff 2021-08-10 17:09:40.000000000 +0000 @@ -0,0 +1,20 @@ +Description: replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 +Author: Peter Michael Green + +Index: xen-4.6.0/tools/libxc/include/xenctrl.h +=================================================================== +--- xen-4.6.0.orig/tools/libxc/include/xenctrl.h ++++ xen-4.6.0/tools/libxc/include/xenctrl.h +@@ -78,9 +78,9 @@ + #define xen_rmb() xen_barrier() + #define xen_wmb() xen_barrier() + #elif defined(__arm__) +-#define xen_mb() asm volatile ("dmb" : : : "memory") +-#define xen_rmb() asm volatile ("dmb" : : : "memory") +-#define xen_wmb() asm volatile ("dmb" : : : "memory") ++#define xen_mb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define xen_rmb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define xen_wmb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") + #elif defined(__aarch64__) + #define xen_mb() asm volatile ("dmb sy" : : : "memory") + #define xen_rmb() asm volatile ("dmb sy" : : : "memory") diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/patches/series xen-4.14.2+25-gb6a8c4f72d/debian/patches/series --- xen-4.14.2+25-gb6a8c4f72d/debian/patches/series 2021-07-30 14:57:52.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/patches/series 2021-08-10 17:09:40.000000000 +0000 @@ -38,3 +38,4 @@ 0038-x86-EFI-don-t-insert-timestamp-when-SOURCE_DATE_EPOC.patch 0039-docs-use-predictable-ordering-in-generated-documenta.patch 0040-docs-set-date-to-SOURCE_DATE_EPOCH-if-available.patch +armv6.diff diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/rules xen-4.14.2+25-gb6a8c4f72d/debian/rules --- xen-4.14.2+25-gb6a8c4f72d/debian/rules 2021-07-30 14:57:52.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/rules 2021-08-10 17:09:40.000000000 +0000 @@ -331,8 +331,8 @@ # By default, files in debian/tmp which are not handled by anything # in rules are ignored. This makes them into errors. -override_dh_missing: - dh_missing --fail-missing +#override_dh_missing: +# dh_missing --fail-missing # We are dropping the config file /etc/default/xen which appeared in diff -Nru xen-4.14.2+25-gb6a8c4f72d/debian/rules.defs xen-4.14.2+25-gb6a8c4f72d/debian/rules.defs --- xen-4.14.2+25-gb6a8c4f72d/debian/rules.defs 1970-01-01 00:00:00.000000000 +0000 +++ xen-4.14.2+25-gb6a8c4f72d/debian/rules.defs 2021-08-10 17:09:40.000000000 +0000 @@ -0,0 +1,4 @@ +KERNELVERSION := 3.18.0-trunk +BUILD_DIR = debian/build +STAMPS_DIR = debian/stamps +TEMPLATES_DIR = debian/templates