Resolve uprev conflict
Change-Id: Id7baf2977ca6009d467baba6bb29843baef1b0b7
diff --git a/chromeos-base/quipper/quipper-0.0.1-r2668.ebuild b/chromeos-base/quipper/quipper-0.0.1-r2669.ebuild
similarity index 96%
rename from chromeos-base/quipper/quipper-0.0.1-r2668.ebuild
rename to chromeos-base/quipper/quipper-0.0.1-r2669.ebuild
index 94bf95a..7adaf97 100644
--- a/chromeos-base/quipper/quipper-0.0.1-r2668.ebuild
+++ b/chromeos-base/quipper/quipper-0.0.1-r2669.ebuild
@@ -4,7 +4,7 @@
# Don't use Makefile.external here as it fetches from the network.
EAPI=7
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
+CROS_WORKON_COMMIT="44f59350093e5229cb968ea17bf86ae52dca9ac3"
CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/rmad/rmad-0.0.1-r47.ebuild b/chromeos-base/rmad/rmad-0.0.1-r48.ebuild
similarity index 88%
rename from chromeos-base/rmad/rmad-0.0.1-r47.ebuild
rename to chromeos-base/rmad/rmad-0.0.1-r48.ebuild
index 623b0f5b..bcc929a 100644
--- a/chromeos-base/rmad/rmad-0.0.1-r47.ebuild
+++ b/chromeos-base/rmad/rmad-0.0.1-r48.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="1af5e10724a3a74cd6fb7fae4e802f044d458f8d"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "069e7472b1f00905e40fd993c640a99153aa5af8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="44f59350093e5229cb968ea17bf86ae52dca9ac3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "d9d4216e3d5d879c0a267457ed2f8372639a734a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
CROS_WORKON_INCREMENTAL_BUILD=1
CROS_WORKON_LOCALNAME="platform2"
CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/system_api/system_api-0.0.1-r4367.ebuild b/chromeos-base/system_api/system_api-0.0.1-r4368.ebuild
similarity index 92%
rename from chromeos-base/system_api/system_api-0.0.1-r4367.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r4368.ebuild
index 455b98f..7616710 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r4367.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r4368.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="0f309d00c4a64c0cfc5eeb6c1a045ef1153b09a0"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "5b36c99ae88a7b27388c988a27a969d03fcd74e2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="44f59350093e5229cb968ea17bf86ae52dca9ac3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b8c0aa3f235164b0c00a3785c498a1f7d80c363b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
CROS_GO_PACKAGES=(
"chromiumos/system_api/..."
)
diff --git a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r1152.ebuild b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r1153.ebuild
similarity index 91%
rename from chromeos-base/tast-cmd/tast-cmd-0.0.1-r1152.ebuild
rename to chromeos-base/tast-cmd/tast-cmd-0.0.1-r1153.ebuild
index 72f0f2f..f4e18c3 100644
--- a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r1152.ebuild
+++ b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r1153.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="4527403fcdf7416eae625fa39718b6c8f9842987"
-CROS_WORKON_TREE="7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4"
+CROS_WORKON_COMMIT="1b38ee2d8ec3355f1082bd2a2dda3dabf021d448"
+CROS_WORKON_TREE="894e3aa51bf49b4f79516223aaa7f043b0466739"
CROS_WORKON_PROJECT="chromiumos/platform/tast"
CROS_WORKON_LOCALNAME="platform/tast"
diff --git a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1103.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1104.ebuild
similarity index 88%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1103.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1104.ebuild
index 234f485..d9322f2 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1103.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r1104.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="4527403fcdf7416eae625fa39718b6c8f9842987"
-CROS_WORKON_TREE="7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4"
+CROS_WORKON_COMMIT="1b38ee2d8ec3355f1082bd2a2dda3dabf021d448"
+CROS_WORKON_TREE="894e3aa51bf49b4f79516223aaa7f043b0466739"
CROS_WORKON_PROJECT="chromiumos/platform/tast"
CROS_WORKON_LOCALNAME="platform/tast"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6651.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6652.ebuild
similarity index 90%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6651.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6652.ebuild
index cb3b442..46d3b85 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6651.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6652.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT=("3eb04d5e7d5bcdcd94c49a6142b252f7b4c43e32" "4527403fcdf7416eae625fa39718b6c8f9842987")
-CROS_WORKON_TREE=("9d92d1df0ccd719e1c8fe71a112b4244880e9d01" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4")
+CROS_WORKON_COMMIT=("3eb04d5e7d5bcdcd94c49a6142b252f7b4c43e32" "1b38ee2d8ec3355f1082bd2a2dda3dabf021d448")
+CROS_WORKON_TREE=("9d92d1df0ccd719e1c8fe71a112b4244880e9d01" "894e3aa51bf49b4f79516223aaa7f043b0466739")
CROS_WORKON_PROJECT=(
"chromiumos/platform/tast-tests"
"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-proto/tast-proto-0.0.1-r18.ebuild b/chromeos-base/tast-proto/tast-proto-0.0.1-r19.ebuild
similarity index 83%
rename from chromeos-base/tast-proto/tast-proto-0.0.1-r18.ebuild
rename to chromeos-base/tast-proto/tast-proto-0.0.1-r19.ebuild
index 3eef575..cd72724 100644
--- a/chromeos-base/tast-proto/tast-proto-0.0.1-r18.ebuild
+++ b/chromeos-base/tast-proto/tast-proto-0.0.1-r19.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="4527403fcdf7416eae625fa39718b6c8f9842987"
-CROS_WORKON_TREE="7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4"
+CROS_WORKON_COMMIT="1b38ee2d8ec3355f1082bd2a2dda3dabf021d448"
+CROS_WORKON_TREE="894e3aa51bf49b4f79516223aaa7f043b0466739"
CROS_WORKON_PROJECT="chromiumos/platform/tast"
CROS_WORKON_LOCALNAME="platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6700.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6701.ebuild
similarity index 86%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6700.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6701.ebuild
index 77d348a..e0cfa40 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6700.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6701.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT=("3eb04d5e7d5bcdcd94c49a6142b252f7b4c43e32" "4527403fcdf7416eae625fa39718b6c8f9842987" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
-CROS_WORKON_TREE=("9d92d1df0ccd719e1c8fe71a112b4244880e9d01" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
+CROS_WORKON_COMMIT=("3eb04d5e7d5bcdcd94c49a6142b252f7b4c43e32" "1b38ee2d8ec3355f1082bd2a2dda3dabf021d448" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
+CROS_WORKON_TREE=("9d92d1df0ccd719e1c8fe71a112b4244880e9d01" "894e3aa51bf49b4f79516223aaa7f043b0466739" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
CROS_WORKON_PROJECT=(
"chromiumos/platform/tast-tests"
"chromiumos/platform/tast"
diff --git a/dev-rust/io_uring/io_uring-0.1.0-r5.ebuild b/dev-rust/io_uring/io_uring-0.1.0-r6.ebuild
similarity index 68%
rename from dev-rust/io_uring/io_uring-0.1.0-r5.ebuild
rename to dev-rust/io_uring/io_uring-0.1.0-r6.ebuild
index 40da93e..b076316e 100644
--- a/dev-rust/io_uring/io_uring-0.1.0-r5.ebuild
+++ b/dev-rust/io_uring/io_uring-0.1.0-r6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-CROS_WORKON_COMMIT="c54cf6c8e9cb9f496d8295efde4ed1f27195461d"
+CROS_WORKON_COMMIT="113ae363f9783edddc4447749fbb9d99a9866c73"
CROS_WORKON_TREE="3964a781d4aac3a0649b24bcce48011fda8c459a"
CROS_WORKON_LOCALNAME="../platform/crosvm"
CROS_WORKON_PROJECT="chromiumos/platform/crosvm"
@@ -29,3 +29,14 @@
dev-rust/tempfile:=
"
RDEPEND="${DEPEND}"
+
+src_test() {
+ # The io_uring implementation on kernels older than 5.10 was buggy so skip
+ # them if we're running on one of those kernels.
+ local cut_version="$(ver_cut 1-2 "$(uname -r)")"
+ if ver_test "${cut_version}" -lt 5.10; then
+ einfo "Skipping io_uring tests on kernel version < 5.10"
+ else
+ cros-rust_src_test
+ fi
+}
diff --git a/dev-rust/system_api/system_api-0.24.53-r184.ebuild b/dev-rust/system_api/system_api-0.24.53-r185.ebuild
similarity index 89%
rename from dev-rust/system_api/system_api-0.24.53-r184.ebuild
rename to dev-rust/system_api/system_api-0.24.53-r185.ebuild
index 0b26ea4..a89d56a 100644
--- a/dev-rust/system_api/system_api-0.24.53-r184.ebuild
+++ b/dev-rust/system_api/system_api-0.24.53-r185.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="0f309d00c4a64c0cfc5eeb6c1a045ef1153b09a0"
-CROS_WORKON_TREE=("5b36c99ae88a7b27388c988a27a969d03fcd74e2" "a0d8550678a1ed2a4ab62782049032a024bf40df" "c3e1fc5061dcbd62acb501f21d7a3794f41b2160" "2c7ac844cf2db48eca0465be0c5ada91c108f177" "3b632cb1cbc6da698a355e078bfc220f0461deee")
+CROS_WORKON_COMMIT="44f59350093e5229cb968ea17bf86ae52dca9ac3"
+CROS_WORKON_TREE=("b8c0aa3f235164b0c00a3785c498a1f7d80c363b" "a0d8550678a1ed2a4ab62782049032a024bf40df" "c3e1fc5061dcbd62acb501f21d7a3794f41b2160" "2c7ac844cf2db48eca0465be0c5ada91c108f177" "3b632cb1cbc6da698a355e078bfc220f0461deee")
CROS_RUST_SUBDIR="system_api"
CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r471.ebuild b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r472.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r471.ebuild
rename to sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r472.ebuild
index 2c1ac6d..762bedf 100644
--- a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r471.ebuild
+++ b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r472.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="6d100bcc7a69f8821a508b5314602c221fd0536b"
-CROS_WORKON_TREE="a6ac7fa02dbb1bb577fb59c153319d3525a2b5fc"
+CROS_WORKON_COMMIT="342e5f967e6c9ab099026bed507ff0338a214944"
+CROS_WORKON_TREE="e254b944a7122cfab2e78ee5882f5c8e5ddb3f13"
CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.10"
CROS_WORKON_EGIT_BRANCH="chromeos-5.10"
