vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move filesystem size to installer config

Browse source
This commit is contained in:
Jeremy Soller 2022-10-17 08:02:13 -06:00
parent f64ca1e155
commit e21f066628
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
13 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/aarch64/desktop.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/i686/desktop-minimal.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 128
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/i686/desktop.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/i686/server-minimal.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 64
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/acid.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/demo.toml
View file

@ -24,6 +24,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 512
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/desktop.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/jeremy.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 2048
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/resist.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/rustc.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 1024
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

2
config/x86_64/server.toml
View file

@ -2,6 +2,8 @@
# General settings # General settings
[general] [general]
# Filesystem size in MiB
filesystem_size = 256
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false

5
mk/ci.mk
View file

@ -1,15 +1,13 @@
IMG_TAG?=$(shell git describe --tags) IMG_TAG?=$(shell git describe --tags)
IMG_SEPARATOR?=_ IMG_SEPARATOR?=_
IMG_DIR?=build/img IMG_DIR?=build/img
DEMO_FS_SIZE?=1500
# CI image target - build desktop, server and demo images # CI image target - build desktop, server and demo images
# To leave out the build tag, set both IMG_TAG and IMG_SEPARATOR to null # To leave out the build tag, set both IMG_TAG and IMG_SEPARATOR to null
ci-img: FORCE ci-img: FORCE
rm -rf $(IMG_DIR) rm -rf $(IMG_DIR)
mkdir -p $(IMG_DIR) mkdir -p $(IMG_DIR)
$(MAKE) desktop server $(MAKE) demo desktop server
$(MAKE) FILESYSTEM_SIZE=$(DEMO_FS_SIZE) demo
cd $(IMG_DIR) && sha256sum -b * > SHA256SUM cd $(IMG_DIR) && sha256sum -b * > SHA256SUM
# The name of the target must match the name of the filesystem config file # The name of the target must match the name of the filesystem config file
@ -44,4 +42,3 @@ ci-toolchain: FORCE
cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz" cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz" cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM

4
mk/config.mk
View file

@ -9,8 +9,8 @@ PREFIX_BINARY?=1
REPO_BINARY?=0 REPO_BINARY?=0
## Select filesystem config ## Select filesystem config
FILESYSTEM_CONFIG?=config/$(ARCH)/desktop.toml FILESYSTEM_CONFIG?=config/$(ARCH)/desktop.toml
## Filesystem size in MB (256 is the default) ## Filesystem size in MB (default comes from filesystem_size in the FILESYSTEM_CONFIG)
FILESYSTEM_SIZE?=256 FILESYSTEM_SIZE?=$(shell grep filesystem_size $(FILESYSTEM_CONFIG) | cut -d' ' -f3)
## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption ## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption
REDOXFS_MKFS_FLAGS?= REDOXFS_MKFS_FLAGS?=