Skip to content
This repository has been archived by the owner on Mar 4, 2024. It is now read-only.

Stefan jum/add dev content #13

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Stefan jum/add dev content #13

merged 6 commits into from
Oct 3, 2023

Conversation

StefanJum
Copy link
Member

No description provided.

@StefanJum
Use workdir/ as clone directory instead of .unikraft/
5165191 
`.unikraft/` was previously used as the directory to clone library
 repositories (including the `unikraft` core repository). Being a
hidden directory, it is not immediately available to the developer.

Use `workdir/` instead.
Also use `workdir/build/` as output directory and ignore the `workdir/`
directory.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
@razvand
Copy link
Contributor

razvand commented Sep 24, 2023

Please also add an update to the README.md file. See the updates from this commit.

Also update .unikraft/ to workdir/ and use the proper names for defconfig files.

@razvand razvand self-requested a review September 24, 2023 14:14
@StefanJum
Copy link
Member Author

Done @razvand

razvand
razvand suggested changes Sep 30, 2023
View reviewed changes
Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the generate.py script, since it's now downloaded. Also ignore it.

Also update the TLDR in README.md with the downloading and using of generate.py, same as documented here.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@StefanJum StefanJum requested a review from razvand October 1, 2023 14:30
razvand
razvand reviewed Oct 1, 2023
View reviewed changes
Copy link
Contributor

@razvand razvand left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also rename fs0/ to rootfs/.

Ignore generate.py in scripts/. I recommend a .gitignore file in scripts/.

@StefanJum StefanJum force-pushed the StefanJum/add-dev-content branch 2 times, most recently from eb1be0e to 7fa45b0 Compare October 1, 2023 20:16
@StefanJum StefanJum requested a review from razvand October 1, 2023 20:23
razvand
razvand suggested changes Oct 1, 2023
View reviewed changes
defconfigs/fc-x86_64-initrd Show resolved Hide resolved
scripts/setup.py Outdated Show resolved Hide resolved
scripts/run.yaml Outdated Show resolved Hide resolved
scripts/run.yaml Outdated Show resolved Hide resolved
scripts/run.yaml Outdated Show resolved Hide resolved
@StefanJum
Move config files to defconfigs/ directory
9ec8cc8 
Move all the defconfig files into the `defconfigs/` directory.
Also minimise them using `make savedefconfig`, removing all
unnecesary config options.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
@StefanJum StefanJum requested a review from razvand October 1, 2023 21:01
razvand
razvand suggested changes Oct 2, 2023
View reviewed changes
Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You took out fs0/ by mistake. Rename it to rootfs/.

Rename aarch64 to arm64 in kraft.yaml target names.

.gitignore Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
@razvand razvand added the enhancement New feature or request label Oct 2, 2023
razvand
razvand suggested changes Oct 2, 2023
View reviewed changes
Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use test instead of [. It's more readable and it's consistent with other scripts we're using.

scripts/setup.sh Outdated Show resolved Hide resolved
scripts/setup.sh Outdated Show resolved Hide resolved
scripts/setup.sh Outdated Show resolved Hide resolved
scripts/setup.sh Outdated Show resolved Hide resolved
@StefanJum
Add run config yaml file and setup script
dd50271 
The `generate.py` script will be downloaded from
https://raw.githubusercontent.com/unikraft/app-testing/staging/scripts/generate.py
and used to generate the scripts in the `scripts/build/` and `scripts/run/`
directories. This will improve maintenance (only required to happen for the
`generate.py` script), while still keeping things usable by providing the
basic build and run scripts.

Use the `setup.sh` script will clone all the dependencies in the
`workdir` repository.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
@StefanJum StefanJum requested a review from razvand October 2, 2023 07:41
@StefanJum StefanJum changed the base branch from stable to staging October 2, 2023 08:10
@StefanJum @razvand
README.md: Document generator script usage
ce67d4c 
Add instructions on how to use the generator and output scripts to build
and run the application.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
@StefanJum @razvand
kraft.yaml: Update arm64 target names
a6edc30 
Use `arm64` instead of `aarch64` for target names, for consistency with
the script generated by `generate.py`.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
@StefanJum @razvand
.gitignore: Ignore all output config files
e04506f 
Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
razvand
razvand approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed-by: Razvan Deaconescu razvand@unikraft.io
Approved-by: Razvan Deaconescu razvand@unikraft.io

@razvand razvand merged commit a12e028 into unikraft:staging Oct 3, 2023
@razvand razvand deleted the StefanJum/add-dev-content branch October 3, 2023 16:15
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
Use workdir/ as clone directory instead of .unikraft/
09b5c4a 
`.unikraft/` was previously used as the directory to clone library
 repositories (including the `unikraft` core repository). Being a
hidden directory, it is not immediately available to the developer.

Use `workdir/` instead.
Also use `workdir/build/` as output directory and ignore the `workdir/`
directory.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
Move config files to defconfigs/ directory
4da85c9 
Move all the defconfig files into the `defconfigs/` directory.
Also minimise them using `make savedefconfig`, removing all
unnecesary config options.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
Add run config yaml file and setup script
932bf9b 
The `generate.py` script will be downloaded from
https://raw.githubusercontent.com/unikraft/app-testing/staging/scripts/generate.py
and used to generate the scripts in the `scripts/build/` and `scripts/run/`
directories. This will improve maintenance (only required to happen for the
`generate.py` script), while still keeping things usable by providing the
basic build and run scripts.

Use the `setup.sh` script will clone all the dependencies in the
`workdir` repository.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
README.md: Document generator script usage
0a4b203 
Add instructions on how to use the generator and output scripts to build
and run the application.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
kraft.yaml: Update arm64 target names
c4231e2 
Use `arm64` instead of `aarch64` for target names, for consistency with
the script generated by `generate.py`.

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum @razvand
.gitignore: Ignore all output config files
d556e2b 
Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
razvand pushed a commit that referenced this pull request Oct 3, 2023
@StefanJum
kraft.yaml: Use fs1 as 9pfs id
bae330e 
Switch to using fs1 as 9pfs id in `kraft.yaml`. This makes it compatible
with KraftKit handling of 9pfs mounts

Signed-off-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@razvand razvand razvand approved these changes

Assignees

@razvand razvand

Labels
enhancement New feature or request
Projects
(Binary) Application Compatibility
Status: Done
Release 0.15
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@StefanJum @razvand