Merge ~mfo/ubuntu/+source/xen:lp1956166v2 into ubuntu/+source/xen:ubuntu/focal-devel
Proposed by
Mauricio Faria de Oliveira
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 3dc1816e8b4773401502e20c76d88c16d24ca72a | ||||
Proposed branch: | ~mfo/ubuntu/+source/xen:lp1956166v2 | ||||
Merge into: | ubuntu/+source/xen:ubuntu/focal-devel | ||||
Diff against target: |
80 lines (+58/-0) 3 files modified
debian/changelog (+7/-0) debian/patches/lp1956166-0006-fix-ftbfs-arm-lzo-unaligned.h.patch (+50/-0) debian/patches/series (+1/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Review via email: mp+426503@code.launchpad.net |
Description of the change
This is an incremental fix for LP#1956166, which addresses
a FTBFS on arm64/armhf introduced with the previous MR [1].
[1] https:/
To post a comment you must log in.
The fixup patch does NOT change the generated assembly code
for the 3 functions in xen/common/lzo.c on both amd64/arm64:
- amd64: between the first patch (*ubuntu2.1) and this fixup (*ubuntu2.2), and
- arm64: between the original package (*ubuntu2) and this fixup (*ubuntu2.2).
Details:
$ wget https:/ /launchpad. net/~mfo/ +archive/ ubuntu/ lp1956166/ +files/ xen-hypervisor- 4.11-amd64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 1_amd64. deb /launchpad. net/~mfo/ +archive/ ubuntu/ lp1956166/ +files/ xen-hypervisor- 4.11-amd64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 2_amd64. deb
$ wget https:/
$ https:/ /launchpad. net/ubuntu/ +archive/ primary/ +files/ xen-hypervisor- 4.11-arm64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2_ arm64.deb /launchpad. net/~mfo/ +archive/ ubuntu/ lp1956166/ +files/ xen-hypervisor- 4.11-arm64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 2_arm64. deb
$ wget https:/
$ ls -1 4.11-amd64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 1_amd64. deb 4.11-amd64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 2_amd64. deb 4.11-arm64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2. 2_arm64. deb 4.11-arm64_ 4.11.3+ 24-g14b62ab3e5- 1ubuntu2_ arm64.deb
xen-hypervisor-
xen-hypervisor-
xen-hypervisor-
xen-hypervisor-
$ for ARCH in amd64 arm64; do 24-g14b62ab3e5- 1ubuntu2{ ,.1,.2} ; do
for VERSION in 4.11.3+
DEB= "xen-hypervisor -4.11-$ {ARCH}_ ${VERSION} _${ARCH} .deb"
[ -f "$DEB" ] || continue
DIR= "xen-4. 11-${ARCH} -${VERSION} " "xen-4. 11-${ARCH} -${VERSION} .disass" 'objdump' 'aarch64- linux-gnu- objdump'
DIS=
OBJDUMP=
[ "$ARCH" != 'arm64' ] || OBJDUMP=
dpkg-deb -x $DEB $DIR lib/debug/ xen-syms- 4.11.4- pre.gz lib/debug/ xen-syms- 4.11.4- pre > $DIS
gunzip $DIR/usr/
$OBJDUMP -d $DIR/usr/
for FUNC in lzo1x_1_do_compress lzo1x_1_compress lzo1x_decompres s_safe; do >:/,/^\ $/p" $DIS | cut -d: -f2- > $DIS.func-$FUNC
sed -n "/<${FUNC}
done
done
done
$ md5sum xen-4.11- amd64-* .func-* | sort fd82f7669e2f2aa 65 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 1.disass. func-lzo1x_ 1_compress fd82f7669e2f2aa 65 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ 1_compress c6a33183abe34cc 24 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 1.disass. func-lzo1x_ 1_do_compress c6a33183abe34cc 24 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ 1_do_compress d445056132b4de0 31 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 1.disass. func-lzo1x_ decompress_ safe d445056132b4de0 31 xen-4.11- amd64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ decompress_ safe
163d549302aad6d
163d549302aad6d
de4dc27fc2584ed
de4dc27fc2584ed
e68052e9060777f
e68052e9060777f
$ md5sum xen-4.11- arm64-* .func-* | sort 2449f23f8e2ac0d d1 xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ decompress_ safe 2449f23f8e2ac0d d1 xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. disass. func-lzo1x_ decompress_ safe 7d15021b8ef38be 7e xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ 1_do_compress 7d15021b8ef38be 7e xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. disass. func-lzo1x_ 1_do_compress 71b4d45d1f8fc18 45 xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. 2.disass. func-lzo1x_ 1_compress 71b4d45d1f8fc18 45 xen-4.11- arm64-4. 11.3+24- g14b62ab3e5- 1ubuntu2. disass. ...
4cd4f9d88119084
4cd4f9d88119084
c100e134e208601
c100e134e208601
e3e70b078204d51
e3e70b078204d51