From 090168e0ea2956eaca5e8d2397f2a15415df4cf1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 14 Dec 2016 09:49:05 -0700 Subject: [PATCH] Add make pull --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ceb2bb..4de8741 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo CARGOFLAGS=--target $(TARGET) --release -- # Default targets -.PHONY: all live iso clean doc ref test update qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE +.PHONY: all live iso clean doc ref test update pull qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE all: build/harddrive.bin @@ -148,6 +148,13 @@ update: cargo update --manifest-path schemes/tcpd/Cargo.toml cargo update --manifest-path schemes/udpd/Cargo.toml +pull: + git pull --rebase --recurse-submodules + git clean -X -f -d + git submodule update --recursive --init + make clean + make update + # Emulation QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(ARCH) QEMUFLAGS=-serial mon:stdio -d cpu_reset -d guest_errors