From 905fe11a6e711012fc09717293f23747f02c729d Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Tue, 8 Mar 2022 15:35:42 -0800 Subject: [PATCH] Re-introduce `OS` for `rootfs_url` --- pipelines/main/platforms/build_linux.arches | 14 +++++++------- pipelines/main/platforms/test_linux.arches | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pipelines/main/platforms/build_linux.arches b/pipelines/main/platforms/build_linux.arches index 421adf387..851bd17fa 100644 --- a/pipelines/main/platforms/build_linux.arches +++ b/pipelines/main/platforms/build_linux.arches @@ -1,10 +1,10 @@ -# TRIPLET ALLOW_FAIL ARCH_ROOTFS MAKE_FLAGS TIMEOUT ROOTFS_TAG ROOTFS_HASH -# i686-linux-gnu . i686 . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 - x86_64-linux-gnu . x86_64 . . v5.1 f689ba6acab6c13a3da4ff62e3445dd61c3b5ab0 -# aarch64-linux-gnu . aarch64 . . ---- ---------------------------------------- -# armv7l-linux-gnueabihf . armv7l . . ---- ---------------------------------------- -# powerpc64le-linux-gnu . powerpc64le . . ---- ---------------------------------------- -# x86_64-linux-musl . x86_64 . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 +# OS TRIPLET ALLOW_FAIL ARCH_ROOTFS MAKE_FLAGS TIMEOUT ROOTFS_TAG ROOTFS_HASH +# linux i686-linux-gnu . i686 . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 +linux x86_64-linux-gnu . x86_64 . . v5.1 f689ba6acab6c13a3da4ff62e3445dd61c3b5ab0 +# linux aarch64-linux-gnu . aarch64 . . ---- ---------------------------------------- +# linux armv7l-linux-gnueabihf . armv7l . . ---- ---------------------------------------- +# linux powerpc64le-linux-gnu . powerpc64le . . ---- ---------------------------------------- +# musl x86_64-linux-musl . x86_64 . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 # These special lines allow us to embed default values for the columns above. diff --git a/pipelines/main/platforms/test_linux.arches b/pipelines/main/platforms/test_linux.arches index bc71c58af..6975716e2 100644 --- a/pipelines/main/platforms/test_linux.arches +++ b/pipelines/main/platforms/test_linux.arches @@ -1,13 +1,13 @@ -# TRIPLET ALLOW_FAIL ARCH_ROOTFS TIMEOUT USE_RR ROOTFS_TAG ROOTFS_HASH -# 686-linux-gnu . i686 . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 - x86_64-linux-gnu . x86_64 . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a - x86_64-linux-gnu . x86_64 120 rr v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +# OS TRIPLET ALLOW_FAIL ARCH_ROOTFS TIMEOUT USE_RR ROOTFS_TAG ROOTFS_HASH +# linux 686-linux-gnu . i686 . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 +linux x86_64-linux-gnu . x86_64 . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux x86_64-linux-gnu . x86_64 120 rr v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -# aarch64-linux-gnu true aarch64 . . ---- ---------------------------------------- -# armv7l-linux-gnueabihf true armv7l . . ---- ---------------------------------------- -# powerpc64le-linux-gnu true powerpc64le . . ---- ---------------------------------------- +# linux aarch64-linux-gnu true aarch64 . . ---- ---------------------------------------- +# linux armv7l-linux-gnueabihf true armv7l . . ---- ---------------------------------------- +# linux powerpc64le-linux-gnu true powerpc64le . . ---- ---------------------------------------- -# x86_64-linux-musl true x86_64 . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 +# musl x86_64-linux-musl true x86_64 . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 # These special lines allow us to embed default values for the columns above.