From f4091c4d7e1b4c579c8a33be3e81f75fa51f3264 Mon Sep 17 00:00:00 2001
From: WangRunji <wangrunji0408@163.com>
Date: Mon, 21 May 2018 00:01:53 +0800
Subject: [PATCH] Change package name

---
 Cargo.toml     |  9 +++------
 Makefile       |  4 ++--
 travis-qemu.sh | 39 ---------------------------------------
 3 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100755 travis-qemu.sh

diff --git a/Cargo.toml b/Cargo.toml
index 5d29df7d..d37cce0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "blog_os"
+name = "rust-ucore"
 version = "0.1.0"
-authors = ["Philipp Oppermann <dev@phil-opp.com>"]
+authors = ["Runji Wang <wangrunji0408@163.com>"]
 
 [lib]
 crate-type = ["staticlib"]
@@ -26,11 +26,8 @@ redox_syscall = "0.1.37"
 xmas-elf = "0.6"
 arrayvec = { version = "0.4.7", default-features = false }
 log = "0.4"
+lazy_static = { version = "1.0.0", features = ["spin_no_std"] }
 simple-filesystem = { git = "https://github.com/wangrunji0408/SimpleFileSystem-Rust" }
 
 [build-dependencies]
 cc = "1.0"
-
-[dependencies.lazy_static]
-version = "1.0.0"
-features = ["spin_no_std"]
diff --git a/Makefile b/Makefile
index d89f04d1..fc059f69 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ arch ?= x86_64
 kernel := build/kernel-$(arch).bin
 iso := build/os-$(arch).iso
 target ?= $(arch)-blog_os
-rust_os := target/$(target)/debug/libblog_os.a
+rust_os := target/$(target)/debug/librust_ucore.a
 
 boot_src := src/arch/$(arch)/boot
 linker_script := $(boot_src)/linker.ld
@@ -103,7 +103,7 @@ innerpwd ?= /root/blog_os
 else
 uid ?= $(shell id -u)
 gid ?= $(shell id -g)
-innerpwd ?= pwd
+innerpwd ?= $(pwd)
 endif
 docker_cargo_volume ?=  blogos-$(uid)-$(gid)-cargo
 docker_rustup_volume ?=  blogos-$(uid)-$(gid)-rustup
diff --git a/travis-qemu.sh b/travis-qemu.sh
deleted file mode 100755
index 69767e74..00000000
--- a/travis-qemu.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -e
-
-VERSION=${QEMU_VERSION:=2.11.1}
-ARCHES=${QEMU_ARCHES:=arm aarch64 i386 x86_64}
-TARGETS=${QEMU_TARGETS:=$(echo $ARCHES | sed 's#$# #;s#\([^ ]*\) #\1-softmmu \1-linux-user #g')}
-
-if echo "$VERSION $TARGETS" | cmp --silent $HOME/qemu/.build -; then
-  echo "qemu $VERSION up to date!"
-  exit 0
-fi
-
-echo "VERSION: $VERSION"
-echo "TARGETS: $TARGETS"
-
-cd $HOME
-rm -rf qemu
-
-# Checking for a tarball before downloading makes testing easier :-)
-test -f "qemu-$VERSION.tar.bz2" || wget "http://wiki.qemu-project.org/download/qemu-$VERSION.tar.bz2"
-tar -xf "qemu-$VERSION.tar.bz2"
-cd "qemu-$VERSION"
-
-./configure \
-  --prefix="$HOME/qemu" \
-  --target-list="$TARGETS" \
-  --disable-docs \
-  --disable-sdl \
-  --disable-gtk \
-  --disable-gnutls \
-  --disable-gcrypt \
-  --disable-nettle \
-  --disable-curses \
-  --static
-
-make -j4
-make install
-
-echo "$VERSION $TARGETS" > $HOME/qemu/.build