.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "ubuntu:20.04"
+image: "ubuntu:18.04"
 
 variables:
   GIT_STRATEGY: "pull"
@@ -7,7 +7,6 @@ variables:
 
 before_script:
  - |
-    export DEBIAN_FRONTEND=noninteractive
     apt-get update -qq &&
     apt-get install -qq \
         bison \
@@ -21,7 +20,6 @@ before_script:
         gnupg \
         libfuse-dev \
         nasm \
-        parted \
         pkg-config \
         software-properties-common \
         syslinux \

Makefile

@@ -67,12 +67,14 @@ include mk/virtualbox.mk
 # CI image target
 ci-img: FORCE
 	$(MAKE) INSTALLER_FLAGS= \
+		build/coreboot.elf.gz \
 		build/harddrive.bin.gz \
 		build/livedisk.iso.gz \
 		build/harddrive-efi.bin.gz \
 		build/livedisk-efi.iso.gz
 	rm -rf build/img
 	mkdir -p build/img
+	cp "build/coreboot.elf.gz" "build/img/redox_$(IMG_TAG)_coreboot.elf.gz"
 	cp "build/harddrive.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive.bin.gz"
 	cp "build/livedisk.iso.gz" "build/img/redox_$(IMG_TAG)_livedisk.iso.gz"
 	cp "build/harddrive-efi.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive-efi.bin.gz"

bootloader-efi

@@ -1 +1 @@
-Subproject commit e147b413eeb9eb7d01c85cfe1b6b6eea39c47a57
+Subproject commit 97bd2f68464b5a266e50cadfc30405ce3802127f

bootstrap.sh

@@ -187,7 +187,7 @@ freebsd()
 archLinux()
 {
 	echo "Detected Arch Linux"
-	packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a"
+	packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex"
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
@@ -286,7 +286,7 @@ fedora()
 		fi
 	fi
 	# Use rpm -q <package> to check if it's already installed
-	PKGS=$(for pkg in gcc gcc-c++ glibc-devel.i686 nasm make fuse-devel cmake texinfo gettext-devel bison flex perl-HTML-Parser po4a; do rpm -q $pkg > /dev/null || echo $pkg; done)
+	PKGS=$(for pkg in gcc gcc-c++ glibc-devel.i686 nasm make fuse-devel cmake texinfo gettext-devel bison flex perl-HTML-Parser; do rpm -q $pkg > /dev/null || echo $pkg; done)
 	# If the list of packages is not empty, install missing
 	COUNT=$(echo $PKGS | wc -w)
 	if [ $COUNT -ne 0 ]; then
@@ -422,10 +422,10 @@ usage()
 # Looks for and installs a cargo-managed binary or subcommand
 #############################################################
 cargoInstall() {
-	if [[ "`cargo install --list`" != *"$1 v$2"* ]]; then
+	if [[ "`cargo install --list`" != *"$1"* ]]; then
-		cargo install --force --version "$2" "$1"
+		cargo install $1
 	else
-		echo "You have $1 version $2 installed already!"
+		echo "You have $1 installed already!"
 	fi
 }
 
@@ -449,6 +449,8 @@ rustInstall() {
 			echo "Please manually uninstall multirust and any other versions of rust, then re-run bootstrap."
 			exit
 		fi
+	else
+		echo "Old multirust not installed, you are good to go."
 	fi
 	# If rustup is not installed we should offer to install it for them
 	if [ -z "$(which rustup)" ]; then
@@ -465,6 +467,7 @@ rustInstall() {
 			echo "export PATH=\"\$HOME/.cargo/bin:\$PATH\"" >> ~/.bashrc
 			# source the variables so that we can execute rustup commands in the current shell
 			source ~/.cargo/env
+			rustup default nightly
 		else
 			echo "Rustup will not be installed!"
 		fi
@@ -476,8 +479,22 @@ rustInstall() {
 		echo "or install rustc nightly manually (not recommended) via:"
 		echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
 		exit
+	fi
+	# If the system has rustup installed then update rustc to the latest nightly
+	if hash 2>/dev/null rustup; then
+		rustup update nightly
+		rustup default nightly
+	fi
+	# Check to make sure that the default rustc is the nightly
+	if echo "$(rustc --version)" | grep -viq "nightly" ;then
+		echo "It appears that you have rust installed, but it"
+		echo "is not the nightly version, please either install"
+		echo "the nightly manually (not recommended) or run this"
+		echo "script again, accepting the rustup install"
+		echo
 	else
 		echo "Your rust install looks good!"
+		echo
 	fi
 }
 
@@ -521,6 +538,9 @@ boot()
 {
 	echo "Cloning gitlab repo..."
 	git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
+	rustInstall
+	cargoInstall cargo-config
+	cargoInstall xargo
 	echo "Cleaning up..."
 	rm bootstrap.sh
 	echo
@@ -572,12 +592,6 @@ do
 	esac
 done
 
-banner
-
-rustInstall
-cargoInstall cargo-config 0.1.1
-cargoInstall xargo 0.3.20
-
 if [ "$update" == "true" ]; then
 	git pull upstream master
 	git submodule update --recursive --init
@@ -585,6 +599,7 @@ if [ "$update" == "true" ]; then
 	exit
 fi
 
+banner
 if [ "Darwin" == "$(uname -s)" ]; then
 	osx "$emulator"
 else
@@ -620,5 +635,3 @@ fi
 if [ "$dependenciesonly" = false ]; then
 	boot
 fi
-
-echo "Redox bootstrap complete!"

ci.toml

@@ -137,7 +137,6 @@ ptyd = {}
 #python = {} # getaddrinfo
 #qemu = {}
 randd = {}
-ramfs = {}
 readline = {}
 redoxerd = {}
 redoxfs = {}

cookbook

@@ -1 +1 @@
-Subproject commit 84535c9062c8f977e0d7c76ade8a3c751982b4d6
+Subproject commit d553dbc09dafa31579741608642dd2156c933934

initfs.toml

@@ -9,8 +9,8 @@ prompt = false
 [packages]
 drivers = {}
 init = {}
-nulld = {}
 #pciids = {}
+nulld = {}
 ramfs = {}
 randd = {}
 redoxfs = {}

initfs_coreboot.toml

@@ -11,7 +11,6 @@ drivers = {}
 init = {}
 nulld = {}
 #pciids = {}
-ramfs = {}
 randd = {}
 redoxfs = {}
 zerod = {}
@@ -27,7 +26,6 @@ randd
 vesad T T G
 stdio display:1
 ps2d us
-ramfs logging
 pcid /etc/pcid/initfs.toml
 redoxfs disk/live: file
 cd file:

initfs_live.toml

@@ -11,7 +11,6 @@ drivers = {}
 init = {}
 nulld = {}
 #pciids = {}
-ramfs = {}
 randd = {}
 redoxfs = {}
 zerod = {}
@@ -27,7 +26,6 @@ randd
 vesad T T G
 stdio display:1
 ps2d us
-ramfs logging
 pcid /etc/pcid/initfs.toml
 redoxfs disk/live: file
 cd file:

kernel

@@ -1 +1 @@
-Subproject commit 903390283066a988b74e86e3630106b12b4df806
+Subproject commit cff858b45560b529d95c5e0ec93c2accb5a7876a

mk/config.mk

@@ -53,7 +53,7 @@ INSTALLER=\
  	installer/target/release/redox_installer $(INSTALLER_FLAGS)
 
 ## Bootloader variables
-EFI_TARGET=$(ARCH)-unknown-uefi
+EFI_TARGET=$(ARCH)-efi-pe
 
 ## Cross compiler variables
 AR=$(TARGET)-gcc-ar

mk/initfs.mk

@@ -1,5 +1,3 @@
-INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid
-
 build/initfs.tag: initfs.toml prefix
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
@@ -7,10 +5,6 @@ build/initfs.tag: initfs.toml prefix
 	rm -rf build/initfs
 	mkdir -p build/initfs
 	$(INSTALLER) -c $< build/initfs/
-	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
-	for bin in $(INITFS_RM_BINS); do \
-		rm -f build/initfs/bin/$$bin; \
-	done
 	touch $@
 
 build/initfs_coreboot.tag: initfs_coreboot.toml prefix
@@ -20,10 +14,6 @@ build/initfs_coreboot.tag: initfs_coreboot.toml prefix
 	rm -rf build/initfs_coreboot
 	mkdir -p build/initfs_coreboot
 	$(INSTALLER) -c $< build/initfs_coreboot/
-	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
-	for bin in $(INITFS_RM_BINS); do \
-		rm -f build/initfs_coreboot/bin/$$bin; \
-	done
 	touch $@
 
 build/initfs_live.tag: initfs_live.toml prefix
@@ -33,8 +23,4 @@ build/initfs_live.tag: initfs_live.toml prefix
 	rm -rf build/initfs_live
 	mkdir -p build/initfs_live
 	$(INSTALLER) -c $< build/initfs_live/
-	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
-	for bin in $(INITFS_RM_BINS); do \
-		rm -f build/initfs_live/bin/$$bin; \
-	done
 	touch $@

relibc

@@ -1 +1 @@
-Subproject commit 1a0edd8eeb2e3aae407a91795696461f475b445e
+Subproject commit 07ec3b6591878f23f3c4be80c26cbfc584abfe43