Merge lp:~dannf/ubuntu/trusty/cpu-checker/arm64 into lp:ubuntu/trusty/cpu-checker

Proposed by dann frazier on 2014-02-20
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/cpu-checker/arm64
Merge into: lp:ubuntu/trusty/cpu-checker
Diff against target: 40 lines (+10/-1)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
kvm-ok (+3/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/cpu-checker/arm64
Reviewer Review Type Date Requested Status
Ubuntu branches 2014-02-20 Pending
Review via email: mp+207331@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-09-18 13:53:45 +0000
+++ debian/changelog 2014-02-20 00:56:00 +0000
@@ -1,3 +1,9 @@
1cpu-checker (0.7-0ubuntu4) UNRELEASED; urgency=medium
2
3 * Add support for arm64
4
5 -- dann frazier <dann.frazier@canonical.com> Wed, 19 Feb 2014 17:42:24 -0700
6
1cpu-checker (0.7-0ubuntu3) saucy; urgency=low7cpu-checker (0.7-0ubuntu3) saucy; urgency=low
28
3 * d/p/arm: add support for ARM Cortex-A15 systems (LP: #1194632). Thanks to9 * d/p/arm: add support for ARM Cortex-A15 systems (LP: #1194632). Thanks to
410
=== modified file 'debian/control'
--- debian/control 2013-09-18 13:53:45 +0000
+++ debian/control 2014-02-20 00:56:00 +0000
@@ -9,7 +9,7 @@
9Vcs-Bzr: lp:~cpu-checker-dev/cpu-checker/trunk9Vcs-Bzr: lp:~cpu-checker-dev/cpu-checker/trunk
1010
11Package: cpu-checker11Package: cpu-checker
12Architecture: amd64 armhf i38612Architecture: amd64 arm64 armhf i386
13Depends: msr-tools [amd64 i386], ${shlibs:Depends}, ${misc:Depends}13Depends: msr-tools [amd64 i386], ${shlibs:Depends}, ${misc:Depends}
14Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)14Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)
15Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)15Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)
1616
=== modified file 'kvm-ok'
--- kvm-ok 2013-09-18 13:53:45 +0000
+++ kvm-ok 2014-02-20 00:56:00 +0000
@@ -48,6 +48,9 @@
48 virt="ARM"48 virt="ARM"
49 kvm_mod="kvm"49 kvm_mod="kvm"
50 fi50 fi
51elif [ "$(uname -m)" = "aarch64" ]; then
52 virt="ARM"
53 kvm_mod="kvm"
51else54else
52 virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true55 virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
53 [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"56 [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"

Subscribers

People subscribed via source and target branches

to all changes: