This repository has been archived by the owner on May 12, 2021. It is now read-only.
qemu: does not use --disable-static for qemu 2.11 #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
egernst
approved these changes
Mar 28, 2018
devimc
suggested changes
Mar 28, 2018
There was a problem hiding this comment.
# Always strip binaries
# needed if qemu version is less than 2.7
if [ ${qemu_version_major} -eq 2 ] && [ ${qemu_version_minor} -lt 7 ]; then
qemu_options+=(--enable-strip)
fi
https://github.com/kata-containers/qemu/blob/stable-2.11/configure.sh#L135-L139
Qemu 2.11 does not support --disable-static flag and --enable-strip flag, this patch adds a condition to only use it for qemu 2.7 or older. Fixes: kata-containers#11. Signed-off-by: Salvador Fuentes <[email protected]>
chavafg
force-pushed
the
topic/remove-static-option
branch
from
bae9ff3 to
fb59a2b
Compare
|
Fixed @devimc, thanks |
jodh-intel
added a commit
to jodh-intel/packaging-1
that referenced
this pull request
Apr 3, 2018
PR kata-containers#12 inadvertently removed the required tags for two of the qemu config options. Partially fixes kata-containers#13. Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel
added a commit
to jodh-intel/packaging-1
that referenced
this pull request
Apr 3, 2018
PR kata-containers#12 inadvertently removed the required tags for two of the qemu config options. Fixes kata-containers#13. Signed-off-by: James O. D. Hunt <[email protected]>
This was referenced Jan 3, 2019
bergwolf
added a commit
that referenced
this pull request
Jan 3, 2019
Reverts #269 The added kernel patch doesn't apply and is causing all CI to fail. FYI, the current guest kernel version is 4.14.67. Please rebase and re-submit your PR cleanly @Pennyzct. e.g., http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-PR/995/console NFO: Applying patch /tmp/jenkins/workspace/kata-containers-runtime-centos-7-4-PR/go/src/github.com/kata-containers/packaging/kernel/patches/0003-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-support.patch patching file arch/arm/include/asm/kvm_arm.h patching file arch/arm/include/asm/kvm_host.h Hunk #1 succeeded at 266 (offset -7 lines). Hunk #2 succeeded at 314 with fuzz 2 (offset -40 lines). patching file arch/arm/include/asm/kvm_mmu.h Hunk #1 FAILED at 35. Hunk #2 succeeded at 47 with fuzz 2 (offset -5 lines). Hunk #3 succeeded at 266 with fuzz 2 (offset -96 lines). 1 out of 3 hunks FAILED -- saving rejects to file arch/arm/include/asm/kvm_mmu.h.rej patching file arch/arm/include/asm/stage2_pgtable.h patching file arch/arm64/include/asm/cpufeature.h Hunk #1 FAILED at 262. Hunk #2 succeeded at 284 (offset -246 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/cpufeature.h.rej patching file arch/arm64/include/asm/kvm_arm.h Hunk #1 succeeded at 102 (offset -5 lines). Hunk #2 succeeded at 116 (offset -5 lines). Hunk #3 succeeded at 305 (offset -7 lines). patching file arch/arm64/include/asm/kvm_asm.h Hunk #1 succeeded at 27 (offset -3 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_asm.h.rej patching file arch/arm64/include/asm/kvm_host.h Hunk #1 succeeded at 48 (offset -5 lines). Hunk #2 FAILED at 61. Hunk #3 succeeded at 399 with fuzz 2 (offset -41 lines). Hunk #4 FAILED at 503. 2 out of 4 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_host.h.rej patching file arch/arm64/include/asm/kvm_hyp.h patching file arch/arm64/include/asm/kvm_mmu.h Hunk #1 succeeded at 154 (offset 13 lines). Hunk #2 succeeded at 229 with fuzz 1 (offset -17 lines). Hunk #3 succeeded at 409 with fuzz 2 (offset -110 lines). patching file arch/arm64/include/asm/stage2_pgtable-nopmd.h patching file arch/arm64/include/asm/stage2_pgtable-nopud.h patching file arch/arm64/include/asm/stage2_pgtable.h patching file arch/arm64/kvm/guest.c Hunk #1 succeeded at 305 (offset -86 lines). patching file arch/arm64/kvm/hyp-init.S Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/kvm/hyp-init.S.rej patching file arch/arm64/kvm/hyp/Makefile Hunk #1 succeeded at 18 (offset -1 lines). patching file arch/arm64/kvm/hyp/s2-setup.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file arch/arm64/kvm/hyp/s2-setup.c.rej patching file arch/arm64/kvm/hyp/switch.c Hunk #1 FAILED at 198. Hunk #2 succeeded at 226 (offset -37 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/kvm/hyp/switch.c.rej patching file arch/arm64/kvm/hyp/tlb.c Hunk #1 succeeded at 29 (offset -1 lines). Hunk #2 succeeded at 38 (offset -1 lines). patching file arch/arm64/kvm/reset.c Hunk #4 FAILED at 86. Hunk #5 succeeded at 133 (offset -4 lines). 1 out of 5 hunks FAILED -- saving rejects to file arch/arm64/kvm/reset.c.rej patching file include/linux/irqchip/arm-gic-v3.h Hunk #1 succeeded at 374 (offset -14 lines). patching file include/uapi/linux/kvm.h Hunk #1 succeeded at 739 (offset -11 lines). Hunk #2 FAILED at 962. 1 out of 2 hunks FAILED -- saving rejects to file include/uapi/linux/kvm.h.rej patching file virt/kvm/arm/arm.c Hunk #1 succeeded at 115 (offset -5 lines). Hunk #2 succeeded at 207 (offset -6 lines). Hunk #3 succeeded at 236 (offset -6 lines). Hunk #4 succeeded at 463 (offset -35 lines). Hunk #5 FAILED at 546. Hunk #6 succeeded at 1164 with fuzz 2 (offset -145 lines). Hunk #7 succeeded at 1261 (offset -147 lines). 1 out of 7 hunks FAILED -- saving rejects to file virt/kvm/arm/arm.c.rej patching file virt/kvm/arm/mmu.c Hunk #1 succeeded at 43 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 147 (offset -2 lines). Hunk #3 succeeded at 216 (offset -35 lines). Hunk #4 succeeded at 226 (offset -35 lines). Hunk #5 succeeded at 245 (offset -35 lines). Hunk #6 succeeded at 255 (offset -35 lines). Hunk #7 succeeded at 272 (offset -35 lines). Hunk #8 succeeded at 371 with fuzz 2 (offset 40 lines). Hunk #9 FAILED at 340. Hunk #10 FAILED at 370. Hunk #11 FAILED at 388. Hunk #12 FAILED at 408. Hunk #13 succeeded at 753 (offset -143 lines). Hunk #14 succeeded at 842 (offset -143 lines). Hunk #15 succeeded at 850 (offset -143 lines). Hunk #16 succeeded at 859 (offset -143 lines). Hunk #17 succeeded at 881 (offset -143 lines). Hunk #18 succeeded at 1024 (offset -182 lines). Hunk #19 succeeded at 1114 (offset -188 lines). Hunk #20 succeeded at 1148 (offset -188 lines). Hunk #21 succeeded at 1176 (offset -188 lines). Hunk #22 succeeded at 1190 (offset -188 lines). Hunk #23 succeeded at 1333 (offset -196 lines). Hunk #24 succeeded at 1552 (offset -220 lines). Hunk #25 succeeded at 1852 (offset -219 lines). 4 out of 25 hunks FAILED -- saving rejects to file virt/kvm/arm/mmu.c.rej patching file virt/kvm/arm/vgic/vgic-its.c Hunk #1 succeeded at 233 (offset -8 lines). Hunk #2 succeeded at 696 (offset -56 lines). Hunk #3 succeeded at 721 (offset -56 lines). Hunk #4 succeeded at 736 (offset -56 lines). Hunk #5 succeeded at 746 (offset -56 lines). Hunk #6 succeeded at 1214 (offset -80 lines). Hunk #7 succeeded at 1232 (offset -80 lines). Hunk #8 succeeded at 1279 (offset -80 lines). Hunk #9 succeeded at 2135 (offset -82 lines). Hunk #10 succeeded at 2207 (offset -82 lines). Hunk #11 succeeded at 2256 (offset -82 lines). patching file virt/kvm/arm/vgic/vgic-mmio-v3.c Hunk #1 succeeded at 326 (offset -38 lines). Hunk #2 succeeded at 343 (offset -38 lines). Build step 'Execute shell' marked build as failure Performing Post build task... Match found for :.* : True Logical operation result is TRUE Running script : #!/bin/bash Fixes: #296 Signed-off-by: Peng Tao <[email protected]>
bergwolf
added a commit
that referenced
this pull request
Jan 4, 2019
Reverts #269 The added kernel patch doesn't apply and is causing all CI to fail. FYI, the current guest kernel version is 4.14.67. Please rebase and re-submit your PR cleanly @Pennyzct. e.g., http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-PR/995/console NFO: Applying patch /tmp/jenkins/workspace/kata-containers-runtime-centos-7-4-PR/go/src/github.com/kata-containers/packaging/kernel/patches/0003-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-support.patch patching file arch/arm/include/asm/kvm_arm.h patching file arch/arm/include/asm/kvm_host.h Hunk #1 succeeded at 266 (offset -7 lines). Hunk #2 succeeded at 314 with fuzz 2 (offset -40 lines). patching file arch/arm/include/asm/kvm_mmu.h Hunk #1 FAILED at 35. Hunk #2 succeeded at 47 with fuzz 2 (offset -5 lines). Hunk #3 succeeded at 266 with fuzz 2 (offset -96 lines). 1 out of 3 hunks FAILED -- saving rejects to file arch/arm/include/asm/kvm_mmu.h.rej patching file arch/arm/include/asm/stage2_pgtable.h patching file arch/arm64/include/asm/cpufeature.h Hunk #1 FAILED at 262. Hunk #2 succeeded at 284 (offset -246 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/cpufeature.h.rej patching file arch/arm64/include/asm/kvm_arm.h Hunk #1 succeeded at 102 (offset -5 lines). Hunk #2 succeeded at 116 (offset -5 lines). Hunk #3 succeeded at 305 (offset -7 lines). patching file arch/arm64/include/asm/kvm_asm.h Hunk #1 succeeded at 27 (offset -3 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_asm.h.rej patching file arch/arm64/include/asm/kvm_host.h Hunk #1 succeeded at 48 (offset -5 lines). Hunk #2 FAILED at 61. Hunk #3 succeeded at 399 with fuzz 2 (offset -41 lines). Hunk #4 FAILED at 503. 2 out of 4 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_host.h.rej patching file arch/arm64/include/asm/kvm_hyp.h patching file arch/arm64/include/asm/kvm_mmu.h Hunk #1 succeeded at 154 (offset 13 lines). Hunk #2 succeeded at 229 with fuzz 1 (offset -17 lines). Hunk #3 succeeded at 409 with fuzz 2 (offset -110 lines). patching file arch/arm64/include/asm/stage2_pgtable-nopmd.h patching file arch/arm64/include/asm/stage2_pgtable-nopud.h patching file arch/arm64/include/asm/stage2_pgtable.h patching file arch/arm64/kvm/guest.c Hunk #1 succeeded at 305 (offset -86 lines). patching file arch/arm64/kvm/hyp-init.S Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/kvm/hyp-init.S.rej patching file arch/arm64/kvm/hyp/Makefile Hunk #1 succeeded at 18 (offset -1 lines). patching file arch/arm64/kvm/hyp/s2-setup.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file arch/arm64/kvm/hyp/s2-setup.c.rej patching file arch/arm64/kvm/hyp/switch.c Hunk #1 FAILED at 198. Hunk #2 succeeded at 226 (offset -37 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/kvm/hyp/switch.c.rej patching file arch/arm64/kvm/hyp/tlb.c Hunk #1 succeeded at 29 (offset -1 lines). Hunk #2 succeeded at 38 (offset -1 lines). patching file arch/arm64/kvm/reset.c Hunk #4 FAILED at 86. Hunk #5 succeeded at 133 (offset -4 lines). 1 out of 5 hunks FAILED -- saving rejects to file arch/arm64/kvm/reset.c.rej patching file include/linux/irqchip/arm-gic-v3.h Hunk #1 succeeded at 374 (offset -14 lines). patching file include/uapi/linux/kvm.h Hunk #1 succeeded at 739 (offset -11 lines). Hunk #2 FAILED at 962. 1 out of 2 hunks FAILED -- saving rejects to file include/uapi/linux/kvm.h.rej patching file virt/kvm/arm/arm.c Hunk #1 succeeded at 115 (offset -5 lines). Hunk #2 succeeded at 207 (offset -6 lines). Hunk #3 succeeded at 236 (offset -6 lines). Hunk #4 succeeded at 463 (offset -35 lines). Hunk #5 FAILED at 546. Hunk #6 succeeded at 1164 with fuzz 2 (offset -145 lines). Hunk #7 succeeded at 1261 (offset -147 lines). 1 out of 7 hunks FAILED -- saving rejects to file virt/kvm/arm/arm.c.rej patching file virt/kvm/arm/mmu.c Hunk #1 succeeded at 43 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 147 (offset -2 lines). Hunk #3 succeeded at 216 (offset -35 lines). Hunk #4 succeeded at 226 (offset -35 lines). Hunk #5 succeeded at 245 (offset -35 lines). Hunk #6 succeeded at 255 (offset -35 lines). Hunk #7 succeeded at 272 (offset -35 lines). Hunk #8 succeeded at 371 with fuzz 2 (offset 40 lines). Hunk #9 FAILED at 340. Hunk #10 FAILED at 370. Hunk #11 FAILED at 388. Hunk #12 FAILED at 408. Hunk #13 succeeded at 753 (offset -143 lines). Hunk #14 succeeded at 842 (offset -143 lines). Hunk #15 succeeded at 850 (offset -143 lines). Hunk #16 succeeded at 859 (offset -143 lines). Hunk #17 succeeded at 881 (offset -143 lines). Hunk #18 succeeded at 1024 (offset -182 lines). Hunk #19 succeeded at 1114 (offset -188 lines). Hunk #20 succeeded at 1148 (offset -188 lines). Hunk #21 succeeded at 1176 (offset -188 lines). Hunk #22 succeeded at 1190 (offset -188 lines). Hunk #23 succeeded at 1333 (offset -196 lines). Hunk #24 succeeded at 1552 (offset -220 lines). Hunk #25 succeeded at 1852 (offset -219 lines). 4 out of 25 hunks FAILED -- saving rejects to file virt/kvm/arm/mmu.c.rej patching file virt/kvm/arm/vgic/vgic-its.c Hunk #1 succeeded at 233 (offset -8 lines). Hunk #2 succeeded at 696 (offset -56 lines). Hunk #3 succeeded at 721 (offset -56 lines). Hunk #4 succeeded at 736 (offset -56 lines). Hunk #5 succeeded at 746 (offset -56 lines). Hunk #6 succeeded at 1214 (offset -80 lines). Hunk #7 succeeded at 1232 (offset -80 lines). Hunk #8 succeeded at 1279 (offset -80 lines). Hunk #9 succeeded at 2135 (offset -82 lines). Hunk #10 succeeded at 2207 (offset -82 lines). Hunk #11 succeeded at 2256 (offset -82 lines). patching file virt/kvm/arm/vgic/vgic-mmio-v3.c Hunk #1 succeeded at 326 (offset -38 lines). Hunk #2 succeeded at 343 (offset -38 lines). Build step 'Execute shell' marked build as failure Performing Post build task... Match found for :.* : True Logical operation result is TRUE Running script : #!/bin/bash Fixes: #296 Signed-off-by: Peng Tao <[email protected]>
jcvenegas
pushed a commit
that referenced
this pull request
Jul 2, 2019
Require all PRs to contain a "Fixes #XXX" comment and a "Signed-off-by:" comment by running the central static checks script. Note that the static checks script will detect if the repository contains golang code and only run those checks if it does. Fixes #12. Signed-off-by: James O. D. Hunt <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Qemu 2.11 does not support --disable-static flag, add a condition
to only use it for qemu 2.7 or older.
Fixes: #11.
Signed-off-by: Salvador Fuentes [email protected]