Skip to content

Commit a727681

Browse files
danbugsdanbugs
authored
Merge pull request #8 from hyperlight-dev/use-upstream-plat-hyperlight
Use upstream unikraft/app-elfloader plat-hyperlight branches
2 parents 2814d15 + e51a2d8 commit a727681

19 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎.github/workflows/publish-examples.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ jobs:
106106
UK_BRANCH=$(grep 'version:' kraft.yaml | head -1 | awk '{print $2}')
107107
mkdir -p .unikraft/apps .unikraft/libs
108108
rm -rf .unikraft/unikraft .unikraft/apps/elfloader
109-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/unikraft.git .unikraft/unikraft
110-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/app-elfloader.git .unikraft/apps/elfloader
109+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/unikraft.git .unikraft/unikraft
110+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/app-elfloader.git .unikraft/apps/elfloader
111111
git clone --branch staging --depth 1 https://github.com/unikraft/lib-libelf.git .unikraft/libs/libelf
112112
rm -rf .unikraft/build
113113
kraft-hyperlight --no-prompt build --plat hyperlight --arch x86_64

‎.github/workflows/test-examples.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ jobs:
108108
UK_BRANCH=$(grep -E '^ version:' kraft.yaml | head -1 | awk '{print $2}')
109109
mkdir -p .unikraft/apps .unikraft/libs
110110
rm -rf .unikraft/unikraft .unikraft/apps/elfloader .unikraft/libs/libelf .unikraft/build
111-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/unikraft.git .unikraft/unikraft
112-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/app-elfloader.git .unikraft/apps/elfloader
111+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/unikraft.git .unikraft/unikraft
112+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/app-elfloader.git .unikraft/apps/elfloader
113113
git clone --branch staging --depth 1 https://github.com/unikraft/lib-libelf.git .unikraft/libs/libelf
114114
kraft-hyperlight --no-prompt build --plat hyperlight --arch x86_64
115115
fi
@@ -285,8 +285,8 @@ jobs:
285285
UK_BRANCH=$(grep -E '^ version:' kraft.yaml | head -1 | awk '{print $2}')
286286
mkdir -p .unikraft/apps .unikraft/libs
287287
rm -rf .unikraft/unikraft .unikraft/apps/elfloader .unikraft/libs/libelf .unikraft/build
288-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/unikraft.git .unikraft/unikraft
289-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/app-elfloader.git .unikraft/apps/elfloader
288+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/unikraft.git .unikraft/unikraft
289+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/app-elfloader.git .unikraft/apps/elfloader
290290
git clone --branch staging --depth 1 https://github.com/unikraft/lib-libelf.git .unikraft/libs/libelf
291291
kraft-hyperlight --no-prompt build --plat hyperlight --arch x86_64
292292
fi
@@ -418,8 +418,8 @@ jobs:
418418
UK_BRANCH=$(grep -E '^ version:' kraft.yaml | head -1 | awk '{print $2}')
419419
mkdir -p .unikraft/apps .unikraft/libs
420420
rm -rf .unikraft/unikraft .unikraft/apps/elfloader .unikraft/libs/libelf .unikraft/build
421-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/unikraft.git .unikraft/unikraft
422-
git clone --branch $UK_BRANCH --depth 1 https://github.com/danbugs/app-elfloader.git .unikraft/apps/elfloader
421+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/unikraft.git .unikraft/unikraft
422+
git clone --branch $UK_BRANCH --depth 1 https://github.com/unikraft/app-elfloader.git .unikraft/apps/elfloader
423423
git clone --branch staging --depth 1 https://github.com/unikraft/lib-libelf.git .unikraft/libs/libelf
424424
kraft-hyperlight --no-prompt build --plat hyperlight --arch x86_64
425425
fi

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
8383
cargo install just
8484

8585
# 2. kraft-hyperlight (builds Unikraft kernels)
86-
git clone --branch hyperlight-platform https://github.com/unikraft/kraftkit.git
86+
git clone --branch hyperlight-platform https://github.com/danbugs/kraftkit.git
8787
cd kraftkit && go build -o kraft-hyperlight ./cmd/kraft
8888
sudo mv kraft-hyperlight /usr/local/bin/ && cd ..
8989

@@ -204,7 +204,7 @@ Every path the guest sends is resolved relative to `HOST_DIR` and any
204204
escape (via `..` or symlinks) is rejected host-side.
205205

206206
Known limitation: `opendir`/`readdir` don't work yet (see
207-
[lib/hostfs/README.md](https://github.com/unikraft/unikraft/blob/hyperlight-platform/lib/hostfs/README.md)). Stat and enumerate known paths instead.
207+
[lib/hostfs/README.md](https://github.com/unikraft/unikraft/blob/plat-hyperlight/lib/hostfs/README.md)). Stat and enumerate known paths instead.
208208

209209
### Running ad-hoc code (no initrd rebuild)
210210

‎demos/pptx-gen/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ specification: '0.6'
44
name: python-pptx-hyperlight
55

66
unikraft:
7-
source: https://github.com/danbugs/unikraft.git
8-
version: hyperlight-platform
7+
source: https://github.com/unikraft/unikraft.git
8+
version: plat-hyperlight
99
kconfig:
1010
# Platform
1111
CONFIG_PLAT_HYPERLIGHT: 'y'
@@ -61,8 +61,8 @@ unikraft:
6161

6262
libraries:
6363
app-elfloader:
64-
source: https://github.com/danbugs/app-elfloader.git
65-
version: hyperlight-platform
64+
source: https://github.com/unikraft/app-elfloader.git
65+
version: plat-hyperlight
6666
libelf:
6767
source: https://github.com/unikraft/lib-libelf.git
6868
version: staging

‎examples/dotnet-nativeaot/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ specification: '0.6'
22
name: dotnet-nativeaot-hyperlight
33

44
unikraft:
5-
source: https://github.com/danbugs/unikraft.git
6-
version: hyperlight-platform
5+
source: https://github.com/unikraft/unikraft.git
6+
version: plat-hyperlight
77
kconfig:
88
CONFIG_PLAT_HYPERLIGHT: 'y'
99
CONFIG_PAGING: 'n'
@@ -53,8 +53,8 @@ unikraft:
5353

5454
libraries:
5555
app-elfloader:
56-
source: https://github.com/danbugs/app-elfloader.git
57-
version: hyperlight-platform
56+
source: https://github.com/unikraft/app-elfloader.git
57+
version: plat-hyperlight
5858
libelf:
5959
source: https://github.com/unikraft/lib-libelf.git
6060
version: staging

‎examples/dotnet/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ specification: '0.6'
22
name: dotnet-hyperlight
33

44
unikraft:
5-
source: https://github.com/danbugs/unikraft.git
6-
version: hyperlight-platform
5+
source: https://github.com/unikraft/unikraft.git
6+
version: plat-hyperlight
77
kconfig:
88
# Platform
99
CONFIG_PLAT_HYPERLIGHT: 'y'
@@ -78,8 +78,8 @@ unikraft:
7878

7979
libraries:
8080
app-elfloader:
81-
source: https://github.com/danbugs/app-elfloader.git
82-
version: hyperlight-platform
81+
source: https://github.com/unikraft/app-elfloader.git
82+
version: plat-hyperlight
8383
libelf:
8484
source: https://github.com/unikraft/lib-libelf.git
8585
version: staging

‎examples/go/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ specification: '0.6'
33
name: go-hyperlight
44

55
unikraft:
6-
source: https://github.com/danbugs/unikraft.git
7-
version: hyperlight-platform
6+
source: https://github.com/unikraft/unikraft.git
7+
version: plat-hyperlight
88
kconfig:
99
# Platform
1010
CONFIG_PLAT_HYPERLIGHT: 'y'
@@ -61,8 +61,8 @@ unikraft:
6161

6262
libraries:
6363
app-elfloader:
64-
source: https://github.com/danbugs/app-elfloader.git
65-
version: hyperlight-platform
64+
source: https://github.com/unikraft/app-elfloader.git
65+
version: plat-hyperlight
6666
libelf:
6767
source: https://github.com/unikraft/lib-libelf.git
6868
version: staging

‎examples/helloworld-c/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ specification: '0.6'
22
name: helloworld-hyperlight
33

44
unikraft:
5-
source: https://github.com/danbugs/unikraft.git
6-
version: hyperlight-platform
5+
source: https://github.com/unikraft/unikraft.git
6+
version: plat-hyperlight
77
kconfig:
88
CONFIG_PLAT_HYPERLIGHT: 'y'
99
CONFIG_PAGING: 'n'
@@ -52,8 +52,8 @@ unikraft:
5252

5353
libraries:
5454
app-elfloader:
55-
source: https://github.com/danbugs/app-elfloader.git
56-
version: hyperlight-platform
55+
source: https://github.com/unikraft/app-elfloader.git
56+
version: plat-hyperlight
5757
libelf:
5858
source: https://github.com/unikraft/lib-libelf.git
5959
version: staging

‎examples/hostfs-posix-c/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ specification: '0.6'
22
name: hostfs-posix-c-hyperlight
33

44
unikraft:
5-
source: https://github.com/danbugs/unikraft.git
6-
version: hyperlight-platform
5+
source: https://github.com/unikraft/unikraft.git
6+
version: plat-hyperlight
77
kconfig:
88
# Platform
99
CONFIG_PLAT_HYPERLIGHT: 'y'
@@ -68,8 +68,8 @@ unikraft:
6868

6969
libraries:
7070
app-elfloader:
71-
source: https://github.com/danbugs/app-elfloader.git
72-
version: hyperlight-platform
71+
source: https://github.com/unikraft/app-elfloader.git
72+
version: plat-hyperlight
7373
libelf:
7474
source: https://github.com/unikraft/lib-libelf.git
7575
version: staging

‎examples/hostfs-posix-py/kraft.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ specification: '0.6'
22
name: hostfs-posix-py-hyperlight
33

44
unikraft:
5-
source: https://github.com/danbugs/unikraft.git
6-
version: hyperlight-platform
5+
source: https://github.com/unikraft/unikraft.git
6+
version: plat-hyperlight
77
kconfig:
88
# Platform
99
CONFIG_PLAT_HYPERLIGHT: 'y'
@@ -73,8 +73,8 @@ unikraft:
7373

7474
libraries:
7575
app-elfloader:
76-
source: https://github.com/danbugs/app-elfloader.git
77-
version: hyperlight-platform
76+
source: https://github.com/unikraft/app-elfloader.git
77+
version: plat-hyperlight
7878
libelf:
7979
source: https://github.com/unikraft/lib-libelf.git
8080
version: staging

0 commit comments

Comments
 (0)