From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
travis: update relevant places to use loader.elf instead of kernel.elf
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ jobs:
- cp /tmp/osv-version "$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/repository/osv-loader/osv-loader.qemu
"$ARTIFACTS_DIR"
- gzip "$ARTIFACTS_DIR"/osv-loader.qemu
- - docker cp build:/git-repos/osv/build/release/kernel-stripped.elf
"$ARTIFACTS_DIR"/kernel.elf
- - gzip "$ARTIFACTS_DIR"/kernel.elf
+ - docker cp build:/git-repos/osv/build/release/loader-stripped.elf
"$ARTIFACTS_DIR"/loader.elf
+ - gzip "$ARTIFACTS_DIR"/loader.elf
- docker cp build:/root/.capstan/repository/osv-loader/index.yaml
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.bootstrap.mpm
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.bootstrap.yaml
"$ARTIFACTS_DIR"
diff --git a/scripts/build-capstan-mpm-packages
b/scripts/build-capstan-mpm-packages
--- a/scripts/build-capstan-mpm-packages
+++ b/scripts/build-capstan-mpm-packages
@@ -237,9 +237,9 @@ created: $(date +'%Y-%m-%d %H:%M')
description: "OSv kernel"
platform: "$PLATFORM"
EOF
- #Copy kernel.elf
+ #Copy loader.elf
mkdir -p $CAPSTAN_LOCAL_REPO/repository/osv-kernel/
- cp -a $OSV_BUILD/kernel.elf
$CAPSTAN_LOCAL_REPO/repository/osv-kernel/osv-kernel.elf
+ cp -a $OSV_BUILD/loader-stripped.elf
$CAPSTAN_LOCAL_REPO/repository/osv-kernel/osv-kernel.elf
cp $CAPSTAN_LOCAL_REPO/repository/osv-loader/index.yaml
$CAPSTAN_LOCAL_REPO/repository/osv-kernel/index.yaml
# Create bootstrap package
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/000000000000430f9605e34191bb%40google.com.
