aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/bits
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-12-09 13:32:05 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-12-10 10:53:37 +0100
commit65bf6714291e01565be9116eea2e7b54fb7c51b7 (patch)
tree1c28f14c615256ab7bbcd2f615654d8c64f6035b /dashboard/config/linux/bits
parent0ff24c1f55a620d444f9f15244d360a008fda824 (diff)
dashboard/config/linux: enable more ChromeOS/Android configs
Diffstat (limited to 'dashboard/config/linux/bits')
-rw-r--r--dashboard/config/linux/bits/android-5.4.yml3
-rw-r--r--dashboard/config/linux/bits/chromeos-5.4.yml2
-rw-r--r--dashboard/config/linux/bits/chromeos.yml7
3 files changed, 10 insertions, 2 deletions
diff --git a/dashboard/config/linux/bits/android-5.4.yml b/dashboard/config/linux/bits/android-5.4.yml
index ab3f972c9..550cba5c7 100644
--- a/dashboard/config/linux/bits/android-5.4.yml
+++ b/dashboard/config/linux/bits/android-5.4.yml
@@ -6,7 +6,7 @@
kernel:
repo: https://android.googlesource.com/kernel/common
- tag: ASB-2020-10-05_12-5.4
+ tag: d7ec680881a1
shell:
- make gki_defconfig
@@ -15,3 +15,4 @@ config:
# gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed,
# and the package lz4 is not available on the syzbot distros.
- KERNEL_GZIP
+ - INCREMENTAL_FS: [baseline]
diff --git a/dashboard/config/linux/bits/chromeos-5.4.yml b/dashboard/config/linux/bits/chromeos-5.4.yml
index 0526f055d..ccd9c098f 100644
--- a/dashboard/config/linux/bits/chromeos-5.4.yml
+++ b/dashboard/config/linux/bits/chromeos-5.4.yml
@@ -3,7 +3,7 @@
kernel:
repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
- tag: 742f2aee74fe4
+ tag: 3a36438201f3
shell:
- chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config
diff --git a/dashboard/config/linux/bits/chromeos.yml b/dashboard/config/linux/bits/chromeos.yml
index d809c5edc..db5603ab8 100644
--- a/dashboard/config/linux/bits/chromeos.yml
+++ b/dashboard/config/linux/bits/chromeos.yml
@@ -6,3 +6,10 @@ config:
- SECURITY_CHROMIUMOS_NO_UNPRIVILEGED_UNSAFE_MOUNTS: n
# These were used historically, their origins are lost.
- CMDLINE: [append, "noresume noswap dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=1 i915.modeset=1 cros_efi"]
+ # These are not enabled in prepareconfig, but have lots of backports or completely ChromeOS-specific.
+ - PKGLIST: [baseline]
+ - PKGLIST_USE_CONFIGFS: [baseline]
+ - ESD_FS: [baseline]
+ - INCREMENTAL_FS: [baseline]
+ - VIRTIO_FS: [baseline]
+ - VIRTIO_WL: [baseline]