For some reason nobranch was removed in the past despite
overall agreement that this is the way and now when
the kernel has been rebased to 6.4 the fetch is failing
again.
Go back to `nobranch + commit ref` and stick with it.
Switch to morello-last-6.1 tag while at it.
Signed-off-by: Pawel Zalewski <pzalewski(a)thegoodpenguin.co.uk>
---
meta-morello/recipes-kernel/linux/linux-morello.inc | 2 +-
.../recipes-kernel/linux/linux-morello_morello-1.6.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-morello/recipes-kernel/linux/linux-morello.inc b/meta-morello/recipes-kernel/linux/linux-morello.inc
index 4442cf4..1822096 100644
--- a/meta-morello/recipes-kernel/linux/linux-morello.inc
+++ b/meta-morello/recipes-kernel/linux/linux-morello.inc
@@ -17,7 +17,7 @@ DEPENDS:remove:toolchain-llvm-morello = "virtual/musl-morello"
RDEPENDS:${PN}:remove:toolchain-llvm-morello = " musl"
SRC_URI = " \
- git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${… \
+ git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1 \
"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb
index a514274..09c89c4 100644
--- a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb
+++ b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb
@@ -2,10 +2,10 @@ require linux-morello.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCREV = "c4b74f2e4712d38f2ea9d5b924f52e38c6faa446"
-SRCBRANCH = "morello/master"
+SRCREV = "666422c8579d7fd0e8e301ec16b4a2dce2ba8ec1"
LINUX_VERSION = "6.1"
LINUX_VERSION_EXTENSION= "-yocto-purecap"
COMPATIBLE_MACHINE = "morello"
+
--
2.34.1
v3:
- Allow additional user flags which contain spaces.
v2:
- Check if shared folder exists before enabling it in FVP
- Pass additional user flags through to FVP
---
README.md | 10 +++++++++-
usr/bin/morello | 6 +++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f83c799..4d90167 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Create the following workspace structure:
```
workspace/
|-> morello/
+ |-> shared_folder/
|-> docker-compose.yml
```
@@ -118,6 +119,12 @@ Username: root
Password: morello
```
+## Shared Folder
+To mount the shared folder to share files between host and FVP:
+```
+$ mount -t 9p -o trans=virtio,version=9p2000.L FM shared_folder
+```
+
## Shutdown the FVP Model
To shutdown the FVP correctly type on a root shell:
@@ -144,4 +151,5 @@ $ docker image prune
# Container verification
-morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory.
\ No newline at end of file
+morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory.
+
diff --git a/usr/bin/morello b/usr/bin/morello
index f7a515a..ed39722 100755
--- a/usr/bin/morello
+++ b/usr/bin/morello
@@ -16,4 +16,8 @@ export OUTPUT_DIR=/morello/logs
mkdir -p $OUTPUT_DIR
-morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img
+if [[ -d "/morello/shared_folder/" ]]; then
+ ENABLE_SHARED_FOLDER="-v /morello/shared_folder"
+fi
+
+morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img $ENABLE_SHARED_FOLDER "$@"
--
2.34.1
v2:
- Check if shared folder exists before enabling it in FVP
- Pass additional user flags through to FVP
---
README.md | 10 +++++++++-
usr/bin/morello | 6 +++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f83c799..4d90167 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Create the following workspace structure:
```
workspace/
|-> morello/
+ |-> shared_folder/
|-> docker-compose.yml
```
@@ -118,6 +119,12 @@ Username: root
Password: morello
```
+## Shared Folder
+To mount the shared folder to share files between host and FVP:
+```
+$ mount -t 9p -o trans=virtio,version=9p2000.L FM shared_folder
+```
+
## Shutdown the FVP Model
To shutdown the FVP correctly type on a root shell:
@@ -144,4 +151,5 @@ $ docker image prune
# Container verification
-morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory.
\ No newline at end of file
+morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory.
+
diff --git a/usr/bin/morello b/usr/bin/morello
index f7a515a..8efedeb 100755
--- a/usr/bin/morello
+++ b/usr/bin/morello
@@ -16,4 +16,8 @@ export OUTPUT_DIR=/morello/logs
mkdir -p $OUTPUT_DIR
-morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img
+if [[ -d "/morello/shared_folder/" ]]; then
+ ENABLE_SHARED_FOLDER="-v /morello/shared_folder"
+fi
+
+morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img $ENABLE_SHARED_FOLDER $@
--
2.34.1
Hi All,
I am Menna, a Linux kernel intern- Outreahy internship. I worked on a
project related to the Morello kernel. I checked the user guides and
followed this: https://git.morello-project.org/morello/morello-linux, but I
have a problem I couldn't create my own FVP kernel image and run it, I want
to develop the kernel and update the FVP image and run it but I don't know
how to do that.
Could you please help me?
Thanks in advance,
Menna
Hello,
This patch aims to enable the FVP shared folder for Morello Linux docker
image. This would allow files to be shared between the host and the FVP
session.
Thanks,
Harry.
---
README.md | 8 ++++++++
usr/bin/morello | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index fdc31f9..d7e183f 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,11 @@ Create the following workspace structure:
```
workspace/
|-> morello/
+ |-> shared_folder/
|-> docker-compose.yml
```
+
Create a `docker-compose.yml` file and map the morello directory into /morello as follows:
```
@@ -112,6 +114,12 @@ Username: root
Password: morello
```
+## Shared Folder
+To mount the shared folder to share files between host and FVP:
+```
+$ mount -t 9p -o trans=virtio,version=9p2000.L FM shared_folder
+```
+
## Shutdown the FVP Model
To shutdown the FVP correctly type on a root shell:
diff --git a/usr/bin/morello b/usr/bin/morello
index f7a515a..25f507b 100755
--- a/usr/bin/morello
+++ b/usr/bin/morello
@@ -16,4 +16,4 @@ export OUTPUT_DIR=/morello/logs
mkdir -p $OUTPUT_DIR
-morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img
+morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img -v /morello/shared_folder
--
2.34.1
Hi all,
I'm pulling the latest morello-sdk and getting the latest musl-libc repo from gitlab (https://git.morello-project.org/morello/musl-libc/) but seem to be unable to build musl-libc projects with clang.
I'm following the instructions here, which are only a month old but failing at the first step of building clang. I'm using clang 13 from the morello-llvm.
https://git.morello-project.org/morello/musl-libc/-/blob/morello/master/bui…
Mostly I seem to get cmake errors:
```
CMake Error at CMakeLists.txt:139 (MESSAGE):
libcxx isn't a known project:
bolt;clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;lld;lldb;mlir;openmp;polly;pstl;flang.
Did you mean to enable it as a runtime in LLVM_ENABLE_RUNTIMES?
```
Again this is all in the morello-sdk, any tips?