| commit | a143539b365c746c588777807493283f66e5d97c | [log] [tgz] |
|---|---|---|
| author | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | Wed Jun 24 10:06:04 2020 +0000 |
| committer | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | Wed Jun 24 10:06:04 2020 +0000 |
| tree | 67e33956f97ec9490a18bdb5acdce2768ed29469 | |
| parent | 63aacd79f1fa888fa9a22187658d6841da26916e [diff] | |
| parent | 35ee71f43210dcef61d2cd79cd5c218479a5f7ed [diff] |
Snap for 6622772 from 35ee71f43210dcef61d2cd79cd5c218479a5f7ed to r-keystone-qcom-release Change-Id: I272a43eee9558475d7db2a4c43c263efb894ef17
diff --git a/arm64/5.4/kernel-qemu2 b/arm64/5.4/kernel-qemu2 index 833f8dc..76f329a 100644 --- a/arm64/5.4/kernel-qemu2 +++ b/arm64/5.4/kernel-qemu2 Binary files differ
diff --git a/arm64/5.4/ko/dummy-cpufreq.ko b/arm64/5.4/ko/dummy-cpufreq.ko index c964a3e..053ce6a 100644 --- a/arm64/5.4/ko/dummy-cpufreq.ko +++ b/arm64/5.4/ko/dummy-cpufreq.ko Binary files differ
diff --git a/arm64/5.4/ko/dummy_hcd.ko b/arm64/5.4/ko/dummy_hcd.ko deleted file mode 100644 index ba7e038..0000000 --- a/arm64/5.4/ko/dummy_hcd.ko +++ /dev/null Binary files differ
diff --git a/arm64/5.4/ko/failover.ko b/arm64/5.4/ko/failover.ko index 89fb059..e8fb3ec 100644 --- a/arm64/5.4/ko/failover.ko +++ b/arm64/5.4/ko/failover.ko Binary files differ
diff --git a/arm64/5.4/ko/goldfish_address_space.ko b/arm64/5.4/ko/goldfish_address_space.ko index 8769a46..8e927bf 100644 --- a/arm64/5.4/ko/goldfish_address_space.ko +++ b/arm64/5.4/ko/goldfish_address_space.ko Binary files differ
diff --git a/arm64/5.4/ko/goldfish_battery.ko b/arm64/5.4/ko/goldfish_battery.ko index 0300a18..1190c05 100644 --- a/arm64/5.4/ko/goldfish_battery.ko +++ b/arm64/5.4/ko/goldfish_battery.ko Binary files differ
diff --git a/arm64/5.4/ko/goldfish_pipe.ko b/arm64/5.4/ko/goldfish_pipe.ko index 917ee5e..c3e7a89 100644 --- a/arm64/5.4/ko/goldfish_pipe.ko +++ b/arm64/5.4/ko/goldfish_pipe.ko Binary files differ
diff --git a/arm64/5.4/ko/goldfish_sync.ko b/arm64/5.4/ko/goldfish_sync.ko index cc18934..f262b93 100644 --- a/arm64/5.4/ko/goldfish_sync.ko +++ b/arm64/5.4/ko/goldfish_sync.ko Binary files differ
diff --git a/arm64/5.4/ko/mac80211_hwsim.ko b/arm64/5.4/ko/mac80211_hwsim.ko index 92a8bcc..db1c725 100644 --- a/arm64/5.4/ko/mac80211_hwsim.ko +++ b/arm64/5.4/ko/mac80211_hwsim.ko Binary files differ
diff --git a/arm64/5.4/ko/md-mod.ko b/arm64/5.4/ko/md-mod.ko index f9477ab..547f1a9 100644 --- a/arm64/5.4/ko/md-mod.ko +++ b/arm64/5.4/ko/md-mod.ko Binary files differ
diff --git a/arm64/5.4/ko/nd_virtio.ko b/arm64/5.4/ko/nd_virtio.ko index 18a03c5..0075de8 100644 --- a/arm64/5.4/ko/nd_virtio.ko +++ b/arm64/5.4/ko/nd_virtio.ko Binary files differ
diff --git a/arm64/5.4/ko/net_failover.ko b/arm64/5.4/ko/net_failover.ko index 51229c6..7b55683 100644 --- a/arm64/5.4/ko/net_failover.ko +++ b/arm64/5.4/ko/net_failover.ko Binary files differ
diff --git a/arm64/5.4/ko/rtc-test.ko b/arm64/5.4/ko/rtc-test.ko index 79b2425..6e8066a 100644 --- a/arm64/5.4/ko/rtc-test.ko +++ b/arm64/5.4/ko/rtc-test.ko Binary files differ
diff --git a/arm64/5.4/ko/snd-hda-codec-generic.ko b/arm64/5.4/ko/snd-hda-codec-generic.ko index d395370..199d587 100644 --- a/arm64/5.4/ko/snd-hda-codec-generic.ko +++ b/arm64/5.4/ko/snd-hda-codec-generic.ko Binary files differ
diff --git a/arm64/5.4/ko/snd-hda-codec-realtek.ko b/arm64/5.4/ko/snd-hda-codec-realtek.ko index 107de94..acf8b24 100644 --- a/arm64/5.4/ko/snd-hda-codec-realtek.ko +++ b/arm64/5.4/ko/snd-hda-codec-realtek.ko Binary files differ
diff --git a/arm64/5.4/ko/snd-hda-codec.ko b/arm64/5.4/ko/snd-hda-codec.ko index 2b46b38..3b5a41b 100644 --- a/arm64/5.4/ko/snd-hda-codec.ko +++ b/arm64/5.4/ko/snd-hda-codec.ko Binary files differ
diff --git a/arm64/5.4/ko/snd-hda-core.ko b/arm64/5.4/ko/snd-hda-core.ko index 74347f2..7852e57 100644 --- a/arm64/5.4/ko/snd-hda-core.ko +++ b/arm64/5.4/ko/snd-hda-core.ko Binary files differ
diff --git a/arm64/5.4/ko/snd-hda-intel.ko b/arm64/5.4/ko/snd-hda-intel.ko index 7d4c6c0..abe0588 100644 --- a/arm64/5.4/ko/snd-hda-intel.ko +++ b/arm64/5.4/ko/snd-hda-intel.ko Binary files differ
diff --git a/arm64/5.4/ko/test_meminit.ko b/arm64/5.4/ko/test_meminit.ko index 069ef6b..4ad556f 100644 --- a/arm64/5.4/ko/test_meminit.ko +++ b/arm64/5.4/ko/test_meminit.ko Binary files differ
diff --git a/arm64/5.4/ko/test_stackinit.ko b/arm64/5.4/ko/test_stackinit.ko index 9a1c350..cbf15e0 100644 --- a/arm64/5.4/ko/test_stackinit.ko +++ b/arm64/5.4/ko/test_stackinit.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio-gpu.ko b/arm64/5.4/ko/virtio-gpu.ko index 77bfebf..4619e7b 100644 --- a/arm64/5.4/ko/virtio-gpu.ko +++ b/arm64/5.4/ko/virtio-gpu.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio-rng.ko b/arm64/5.4/ko/virtio-rng.ko index e169407..85eb9a7 100644 --- a/arm64/5.4/ko/virtio-rng.ko +++ b/arm64/5.4/ko/virtio-rng.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_blk.ko b/arm64/5.4/ko/virtio_blk.ko index 3743fc5..9e7f67f 100644 --- a/arm64/5.4/ko/virtio_blk.ko +++ b/arm64/5.4/ko/virtio_blk.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_console.ko b/arm64/5.4/ko/virtio_console.ko index ad3b91f..f26e210 100644 --- a/arm64/5.4/ko/virtio_console.ko +++ b/arm64/5.4/ko/virtio_console.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_input.ko b/arm64/5.4/ko/virtio_input.ko index ce8451f..91351de 100644 --- a/arm64/5.4/ko/virtio_input.ko +++ b/arm64/5.4/ko/virtio_input.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_mmio.ko b/arm64/5.4/ko/virtio_mmio.ko index 246fcbf..dfb01a0 100644 --- a/arm64/5.4/ko/virtio_mmio.ko +++ b/arm64/5.4/ko/virtio_mmio.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_net.ko b/arm64/5.4/ko/virtio_net.ko index 63b0a4c..4a32a87 100644 --- a/arm64/5.4/ko/virtio_net.ko +++ b/arm64/5.4/ko/virtio_net.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_pci.ko b/arm64/5.4/ko/virtio_pci.ko index 4bc2302..e709a12 100644 --- a/arm64/5.4/ko/virtio_pci.ko +++ b/arm64/5.4/ko/virtio_pci.ko Binary files differ
diff --git a/arm64/5.4/ko/virtio_pmem.ko b/arm64/5.4/ko/virtio_pmem.ko index 3709b6a..5bcebc9 100644 --- a/arm64/5.4/ko/virtio_pmem.ko +++ b/arm64/5.4/ko/virtio_pmem.ko Binary files differ
diff --git a/update_54_kernel.sh b/update_54_kernel.sh index 4b2bbd8..ead8c0c 100755 --- a/update_54_kernel.sh +++ b/update_54_kernel.sh
@@ -19,6 +19,7 @@ DEFINE_string update "both" "Select which prebuilts to update, (kernel|modules|both)" DEFINE_string kernel "common" "Select which kernel to fetch, (common|goldfish)" DEFINE_string branch "${DEFAULT_BRANCH}" "Branch for fetch_artifact" +DEFINE_string change_id "" "AOSP/master Change-Id" fetch_arch() { scratch_dir="${1}" @@ -85,13 +86,15 @@ git add "${arm_dst_dir}" git commit -a -m "$( - echo DO NOT MERGE: Update kernel prebuilts to ${FLAGS_branch}/${FLAGS_bid} + echo Update kernel prebuilts to ${FLAGS_branch}/${FLAGS_bid} echo echo kernel: ${FLAGS_kernel} echo update: ${FLAGS_update} echo echo Test: TreeHugger echo Bug: ${FLAGS_bug} + echo Change-Id: ${FLAGS_change_id} + echo Merged-In: ${FLAGS_change_id} )" git commit --amend -s @@ -110,6 +113,11 @@ fail=1 fi + if [[ -z "${FLAGS_change_id}" ]]; then + echo "Must specify --change_id, use Change-Id from your AOSP change" 1>&2 + fail=1 + fi + do_fetch_kernel=0 do_fetch_modules=0 case "${FLAGS_update}" in
diff --git a/x86_64/5.4/kernel-qemu2 b/x86_64/5.4/kernel-qemu2 index f5e187d..72570a6 100644 --- a/x86_64/5.4/kernel-qemu2 +++ b/x86_64/5.4/kernel-qemu2 Binary files differ
diff --git a/x86_64/5.4/ko/dummy-cpufreq.ko b/x86_64/5.4/ko/dummy-cpufreq.ko index 60a4901..de81f8d 100644 --- a/x86_64/5.4/ko/dummy-cpufreq.ko +++ b/x86_64/5.4/ko/dummy-cpufreq.ko Binary files differ
diff --git a/x86_64/5.4/ko/dummy_hcd.ko b/x86_64/5.4/ko/dummy_hcd.ko deleted file mode 100644 index 6b6a9d3..0000000 --- a/x86_64/5.4/ko/dummy_hcd.ko +++ /dev/null Binary files differ
diff --git a/x86_64/5.4/ko/failover.ko b/x86_64/5.4/ko/failover.ko index 86c46a4..4014027 100644 --- a/x86_64/5.4/ko/failover.ko +++ b/x86_64/5.4/ko/failover.ko Binary files differ
diff --git a/x86_64/5.4/ko/goldfish_address_space.ko b/x86_64/5.4/ko/goldfish_address_space.ko index 1116141..bbb4bfd 100644 --- a/x86_64/5.4/ko/goldfish_address_space.ko +++ b/x86_64/5.4/ko/goldfish_address_space.ko Binary files differ
diff --git a/x86_64/5.4/ko/goldfish_battery.ko b/x86_64/5.4/ko/goldfish_battery.ko index d8a1c71..d8a15f7 100644 --- a/x86_64/5.4/ko/goldfish_battery.ko +++ b/x86_64/5.4/ko/goldfish_battery.ko Binary files differ
diff --git a/x86_64/5.4/ko/goldfish_pipe.ko b/x86_64/5.4/ko/goldfish_pipe.ko index b95a2d7..4bb770b 100644 --- a/x86_64/5.4/ko/goldfish_pipe.ko +++ b/x86_64/5.4/ko/goldfish_pipe.ko Binary files differ
diff --git a/x86_64/5.4/ko/goldfish_sync.ko b/x86_64/5.4/ko/goldfish_sync.ko index 5ed97c5..0550472 100644 --- a/x86_64/5.4/ko/goldfish_sync.ko +++ b/x86_64/5.4/ko/goldfish_sync.ko Binary files differ
diff --git a/x86_64/5.4/ko/mac80211_hwsim.ko b/x86_64/5.4/ko/mac80211_hwsim.ko index 941f2db..9f9fa41 100644 --- a/x86_64/5.4/ko/mac80211_hwsim.ko +++ b/x86_64/5.4/ko/mac80211_hwsim.ko Binary files differ
diff --git a/x86_64/5.4/ko/md-mod.ko b/x86_64/5.4/ko/md-mod.ko index 367c391..93354c2 100644 --- a/x86_64/5.4/ko/md-mod.ko +++ b/x86_64/5.4/ko/md-mod.ko Binary files differ
diff --git a/x86_64/5.4/ko/nd_virtio.ko b/x86_64/5.4/ko/nd_virtio.ko index 671a200..e995551 100644 --- a/x86_64/5.4/ko/nd_virtio.ko +++ b/x86_64/5.4/ko/nd_virtio.ko Binary files differ
diff --git a/x86_64/5.4/ko/net_failover.ko b/x86_64/5.4/ko/net_failover.ko index aa7153f..d6b2bc7 100644 --- a/x86_64/5.4/ko/net_failover.ko +++ b/x86_64/5.4/ko/net_failover.ko Binary files differ
diff --git a/x86_64/5.4/ko/rtc-test.ko b/x86_64/5.4/ko/rtc-test.ko index e9b11b4..3a7d54f 100644 --- a/x86_64/5.4/ko/rtc-test.ko +++ b/x86_64/5.4/ko/rtc-test.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-hda-codec-generic.ko b/x86_64/5.4/ko/snd-hda-codec-generic.ko index c09d06a..91a68ea 100644 --- a/x86_64/5.4/ko/snd-hda-codec-generic.ko +++ b/x86_64/5.4/ko/snd-hda-codec-generic.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-hda-codec-realtek.ko b/x86_64/5.4/ko/snd-hda-codec-realtek.ko index 2b25202..2d0a07e 100644 --- a/x86_64/5.4/ko/snd-hda-codec-realtek.ko +++ b/x86_64/5.4/ko/snd-hda-codec-realtek.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-hda-codec.ko b/x86_64/5.4/ko/snd-hda-codec.ko index 28ffa9a..2d4c50a 100644 --- a/x86_64/5.4/ko/snd-hda-codec.ko +++ b/x86_64/5.4/ko/snd-hda-codec.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-hda-core.ko b/x86_64/5.4/ko/snd-hda-core.ko index 0fc0914..7c04f64 100644 --- a/x86_64/5.4/ko/snd-hda-core.ko +++ b/x86_64/5.4/ko/snd-hda-core.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-hda-intel.ko b/x86_64/5.4/ko/snd-hda-intel.ko index 1e92cf6..e105754 100644 --- a/x86_64/5.4/ko/snd-hda-intel.ko +++ b/x86_64/5.4/ko/snd-hda-intel.ko Binary files differ
diff --git a/x86_64/5.4/ko/snd-intel-nhlt.ko b/x86_64/5.4/ko/snd-intel-nhlt.ko index 47b4e39..06c9393 100644 --- a/x86_64/5.4/ko/snd-intel-nhlt.ko +++ b/x86_64/5.4/ko/snd-intel-nhlt.ko Binary files differ
diff --git a/x86_64/5.4/ko/test_meminit.ko b/x86_64/5.4/ko/test_meminit.ko index 036842b..8d3af41 100644 --- a/x86_64/5.4/ko/test_meminit.ko +++ b/x86_64/5.4/ko/test_meminit.ko Binary files differ
diff --git a/x86_64/5.4/ko/test_stackinit.ko b/x86_64/5.4/ko/test_stackinit.ko index 8d93d3b..b5e8b40 100644 --- a/x86_64/5.4/ko/test_stackinit.ko +++ b/x86_64/5.4/ko/test_stackinit.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio-gpu.ko b/x86_64/5.4/ko/virtio-gpu.ko index f832832..1a9a8d7 100644 --- a/x86_64/5.4/ko/virtio-gpu.ko +++ b/x86_64/5.4/ko/virtio-gpu.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio-rng.ko b/x86_64/5.4/ko/virtio-rng.ko index c82352b..60ee5e2 100644 --- a/x86_64/5.4/ko/virtio-rng.ko +++ b/x86_64/5.4/ko/virtio-rng.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_blk.ko b/x86_64/5.4/ko/virtio_blk.ko index 611ffc2..4994278 100644 --- a/x86_64/5.4/ko/virtio_blk.ko +++ b/x86_64/5.4/ko/virtio_blk.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_console.ko b/x86_64/5.4/ko/virtio_console.ko index 914bac4..95c2227 100644 --- a/x86_64/5.4/ko/virtio_console.ko +++ b/x86_64/5.4/ko/virtio_console.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_input.ko b/x86_64/5.4/ko/virtio_input.ko index 8be9d0c..c21f7e4 100644 --- a/x86_64/5.4/ko/virtio_input.ko +++ b/x86_64/5.4/ko/virtio_input.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_mmio.ko b/x86_64/5.4/ko/virtio_mmio.ko index 97550de..2a3a479 100644 --- a/x86_64/5.4/ko/virtio_mmio.ko +++ b/x86_64/5.4/ko/virtio_mmio.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_net.ko b/x86_64/5.4/ko/virtio_net.ko index c1de86c..da5ba37 100644 --- a/x86_64/5.4/ko/virtio_net.ko +++ b/x86_64/5.4/ko/virtio_net.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_pci.ko b/x86_64/5.4/ko/virtio_pci.ko index f8f417b..7de1ab0 100644 --- a/x86_64/5.4/ko/virtio_pci.ko +++ b/x86_64/5.4/ko/virtio_pci.ko Binary files differ
diff --git a/x86_64/5.4/ko/virtio_pmem.ko b/x86_64/5.4/ko/virtio_pmem.ko index 5468122..cf6c8ed 100644 --- a/x86_64/5.4/ko/virtio_pmem.ko +++ b/x86_64/5.4/ko/virtio_pmem.ko Binary files differ