Skip to content

Commit dc30270

Browse files
NDragosNDragos
committed
Introduced scripts for qemu with 9pfs support for redis. Chabged the appropriate README files with the necessary information. Added to the rests of scripts wtihin the directories the extension of the filesystem they utilize - *.cpio or *.9pfs
Signed-off-by: NDragos <dragosneagu28@gmail.com>
1 parent a720a86 commit dc30270

28 files changed

+153
-35
lines changed

‎redis/Config.uk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ default y
1919
# each select corresponding features. The other core components are
2020
# selected as dependencies of Redis.
2121
select LIBVFSCORE
22-
select LIBUK9P
23-
select LIB9PFS
22+
select LIBRAMFS
23+
select LIBUKCPIO
2424
select LIBDEVFS
2525
select LIBDEVFS_AUTOMOUNT
2626
select LIBDEVFS_DEVSTDOUT

‎redis/scripts/README.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,51 @@ Use scripts as quick actions for building and running Redis on Unikraft.
66

77
**Note**: Run scripts from the application directory.
88

9-
## Build for <plat> / <arch>:
9+
## Build for <plat> / <arch> / <filesystem>:
1010

1111
```console
12-
./scripts/build/<plat>.<arch>
12+
./scripts/build/<plat>.<arch>.<filesystem>
1313
```
1414

1515
e.g.:
1616

1717
```console
18-
./scripts/build/qemu.x86_64
19-
./scripts/build/qemu.arm64
20-
./scripts/build/fc.x86_64
21-
./scripts/build/xen.arm64
18+
./scripts/build/qemu.x86_64.cpio
19+
./scripts/build/qemu.arm64.9pfs
20+
./scripts/build/fc.x86_64.cpio
21+
./scripts/build/xen.arm64.cpio
2222
```
2323

24-
## Build for <plat> / <arch> using a different compiler
24+
## Build for <plat> / <arch> / <filesystem> using a different compiler
2525

2626
```console
27-
CC=/path/to/compiler ./scripts/build/<plat>.<arch>
27+
CC=/path/to/compiler ./scripts/build/<plat>.<arch>.<filesystem>
2828
```
2929

3030
e.g.
3131

3232
```console
33-
CC=/usr/bin/gcc-12 ./scripts/build/qemu.x86_64
34-
CC=/usr/bin/aarch64-linux-gnu-gcc-12 ./scripts/build/qemu.arm64
35-
CC=/usr/bin/clang ./scripts/build/qemu.x86_64
36-
CC=/usr/bin/clang ./scripts/build/qemu.arm64
37-
CC=/usr/bin/gcc-12 ./scripts/build/fc.x86_64
38-
CC=/usr/bin/aarch64-linux-gnu-gcc-12 ./scripts/build/fc.arm64
39-
CC=/usr/bin/clang ./scripts/build/fc.x86_64
40-
CC=/usr/bin/clang ./scripts/build/fc.arm64
33+
CC=/usr/bin/gcc-12 ./scripts/build/qemu.x86_64.cpio
34+
CC=/usr/bin/aarch64-linux-gnu-gcc-12 ./scripts/build/qemu.arm64.cpio
35+
CC=/usr/bin/clang ./scripts/build/qemu.x86_64.9pfs
36+
CC=/usr/bin/clang ./scripts/build/qemu.arm64.9pfs
37+
CC=/usr/bin/gcc-12 ./scripts/build/fc.x86_64.cpio
38+
CC=/usr/bin/aarch64-linux-gnu-gcc-12 ./scripts/build/fc.arm64.cpio
39+
CC=/usr/bin/clang ./scripts/build/fc.x86_64.cpio
40+
CC=/usr/bin/clang ./scripts/build/fc.arm64.cpio
4141
```
4242

43-
## Run on <plat> / <arch>
43+
## Run on <plat> / <arch> / <filesystem>
4444

4545
```console
46-
./scripts/run/<plat>.<arch>
46+
./scripts/run/<plat>.<arch>.<filesystem>
4747
```
4848

4949
e.g.
5050

5151
```console
52-
./scripts/run/qemu.x86_64
53-
./scripts/run/qemu.arm64
54-
./scripts/run/fc.x86_64
55-
./scripts/run/xen.arm64
52+
./scripts/run/qemu.x86_64.cpio
53+
./scripts/run/qemu.arm64.cpio
54+
./scripts/run/fc.x86_64.cpio
55+
./scripts/run/xen.arm64.cpio
5656
```

redis/scripts/build/fc.arm64 renamed to redis/scripts/build/fc.arm64.cpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
make distclean
4-
UK_DEFCONFIG=$(pwd)/scripts/defconfig/fc.arm64 make defconfig
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/fc.arm64.cpio make defconfig
55
touch Makefile.uk
66
make prepare
77
if test -z "$CC"; then

redis/scripts/build/fc.x86_64 renamed to redis/scripts/build/fc.x86_64.cpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
make distclean
4-
UK_DEFCONFIG=$(pwd)/scripts/defconfig/fc.x86_64 make defconfig
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/fc.x86_64.cpio make defconfig
55
touch Makefile.uk
66
make prepare
77
if test -z "$CC"; then

redis/scripts/build/qemu.arm64 renamed to redis/scripts/build/qemu.arm64.9pfs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
make distclean
4-
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.arm64 make defconfig
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.arm64.9pfs make defconfig
55
touch Makefile.uk
66
make prepare
77
if test -z "$CC"; then

redis/scripts/build/qemu.x86_64 renamed to redis/scripts/build/qemu.arm64.cpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
make distclean
4-
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.x86_64 make defconfig
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.arm64.cpio make defconfig
55
touch Makefile.uk
66
make prepare
77
if test -z "$CC"; then

‎redis/scripts/build/qemu.x86_64.9pfs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
make distclean
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.x86_64.9pfs make defconfig
5+
touch Makefile.uk
6+
make prepare
7+
if test -z "$CC"; then
8+
make -j $(nproc)
9+
else
10+
make CC="$CC" -j $(nproc)
11+
fi

‎redis/scripts/build/qemu.x86_64.cpio‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
make distclean
4+
UK_DEFCONFIG=$(pwd)/scripts/defconfig/qemu.x86_64.cpio make defconfig
5+
touch Makefile.uk
6+
make prepare
7+
if test -z "$CC"; then
8+
make -j $(nproc)
9+
else
10+
make CC="$CC" -j $(nproc)
11+
fi

redis/scripts/build/xen.arm64 renamed to redis/scripts/build/xen.arm64.cpio

File renamed without changes.

redis/scripts/build/xen.x86_64 renamed to redis/scripts/build/xen.x86_64.cpio

File renamed without changes.

0 commit comments

Comments
 (0)