From e74e88d18fa7b83cc8617fe1f8b094fc192a60e7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 11:07:53 -0600 Subject: [PATCH 01/11] Update urls to submodules --- .gitmodules | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitmodules b/.gitmodules index 252262d..ea89854 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,24 @@ [submodule "bootloader"] path = bootloader - url = https://github.com/redox-os/bootloader.git -[submodule "cookbook"] - path = cookbook - url = https://github.com/redox-os/cookbook.git -[submodule "installer"] - path = installer - url = https://github.com/redox-os/installer.git -[submodule "isolinux"] - path = isolinux - url = https://github.com/redox-os/isolinux.git -[submodule "kernel"] - path = kernel - url = https://github.com/redox-os/kernel.git -[submodule "rust"] - path = rust - url = https://github.com/redox-os/rust.git -[submodule "redoxfs"] - path = redoxfs - url = https://github.com/redox-os/redoxfs.git + url = https://gitlab.redox-os.org/redox-os/bootloader.git [submodule "bootloader-efi"] path = bootloader-efi - url = https://github.com/redox-os/bootloader-efi.git + url = https://gitlab.redox-os.org/redox-os/bootloader-efi.git +[submodule "cookbook"] + path = cookbook + url = https://gitlab.redox-os.org/redox-os/cookbook.git +[submodule "installer"] + path = installer + url = https://gitlab.redox-os.org/redox-os/installer.git +[submodule "isolinux"] + path = isolinux + url = https://gitlab.redox-os.org/redox-os/isolinux.git +[submodule "kernel"] + path = kernel + url = https://gitlab.redox-os.org/redox-os/kernel.git +[submodule "rust"] + path = rust + url = https://gitlab.redox-os.org/redox-os/rust.git +[submodule "redoxfs"] + path = redoxfs + url = https://gitlab.redox-os.org/redox-os/redoxfs.git From dac27750b4a74bc6ee46b7a99719fe812574a29d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 11:29:32 -0600 Subject: [PATCH 02/11] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 215b60d..5d46330 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 215b60d3588c628f39d99c6925ca4549c60ca5b9 +Subproject commit 5d46330729710afba8a3ef9d70e5fd0dba153bb3 From 7ae8c9d21f79faa5e47bc02858b99efef6feafd2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 11:54:21 -0600 Subject: [PATCH 03/11] Ensure rust-src is present for bootloader-efi toolchain --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91a61fc..bdf4c37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,4 +32,7 @@ img: rustup update && rustup component add rust-src && cargo install cargo-config xargo && + pushd bootloader-efi && + rustup component add rust-src && + popd && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME From e2c81211da0f47975640ef546fdc76248b47cfa2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 12:01:23 -0600 Subject: [PATCH 04/11] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 5d46330..79e8d44 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 5d46330729710afba8a3ef9d70e5fd0dba153bb3 +Subproject commit 79e8d44a2e65acb0e74170209d7d551a1b997048 From b73bbbc14a488cd69efdc515ccf44406a21c4aee Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 12:03:51 -0600 Subject: [PATCH 05/11] Fix missing directory --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdf4c37..bfb07bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ img: rustup component add rust-src && cargo install cargo-config xargo && pushd bootloader-efi && + rustup update && + mkdir -p "$HOME/.rustup/toolchains/nightly-*-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" rustup component add rust-src && popd && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME From 3ad076b6a0e8c2f5d3e3de0db0675971bffaea1d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 12:04:15 -0600 Subject: [PATCH 06/11] Fix missing ampersand --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb07bc..6243c4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ img: cargo install cargo-config xargo && pushd bootloader-efi && rustup update && - mkdir -p "$HOME/.rustup/toolchains/nightly-*-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" + mkdir -p "$HOME/.rustup/toolchains/nightly-*-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" && rustup component add rust-src && popd && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME From 56d264946a0fb88cd8b8c987a1a0fca495aeb855 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 12:52:20 -0600 Subject: [PATCH 07/11] Do not use wildcard for missing toolchain dir --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6243c4c..0a9ad3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ img: cargo install cargo-config xargo && pushd bootloader-efi && rustup update && - mkdir -p "$HOME/.rustup/toolchains/nightly-*-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" && rustup component add rust-src && + mkdir -p "$HOME/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" && popd && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME From a872d544b66fa2af14929fdcb795e5e889f090a4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 14:36:45 -0600 Subject: [PATCH 08/11] Add wget --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a9ad3b..3603c01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,8 @@ before_script: nasm \ pkg-config \ software-properties-common \ - syslinux && + syslinux \ + wget && apt-key adv -q --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F && add-apt-repository 'deb https://static.redox-os.org/toolchain/apt ./' && apt-get update -qq && From 58e050ac0f852e7d6debbb685d888524e7f7515c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 17:01:32 -0600 Subject: [PATCH 09/11] Add dosfstools --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3603c01..b18a17c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ before_script: apt-get install -qq \ build-essential \ curl \ + dosfstools \ fuse \ genisoimage \ git \ From 7b4589992473d08c120dfcb3540d3dc49132919e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 17:23:43 -0600 Subject: [PATCH 10/11] Add isohybrid --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b18a17c..6c1fcee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ before_script: pkg-config \ software-properties-common \ syslinux \ + syslinux-utils \ wget && apt-key adv -q --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F && add-apt-repository 'deb https://static.redox-os.org/toolchain/apt ./' && From 2af632aa0f08e0ef836906b694379dd0d1010af1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 10 Jun 2018 18:56:53 -0600 Subject: [PATCH 11/11] Add artifacts --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c1fcee..696f29f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,3 +41,7 @@ img: mkdir -p "$HOME/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" && popd && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME + artifacts: + paths: + - build/img/ + expire_in: 1 week