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

Move initfs.mk to a regular cookbook recipe.

Browse source
This commit is contained in:
4lDO2 2022-08-10 12:14:34 +02:00
parent 63605d1e80
commit ce83e7b46d
No known key found for this signature in database
GPG key ID: 996A1DBA676A00C0
7 changed files with 3 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -32,7 +32,6 @@ pull:
update:
cd cookbook && ./update.sh \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
cargo update --manifest-path cookbook/pkgutils/Cargo.toml
cargo update --manifest-path installer/Cargo.toml
@ -42,7 +41,6 @@ update:
fetch:
cargo build --manifest-path cookbook/Cargo.toml --release
cd cookbook && ./fetch.sh \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
# Cross compiler recipes
@ -52,7 +50,6 @@ include mk/prefix.mk
include mk/bootloader.mk
# Filesystem recipes
include mk/initfs.mk
include mk/filesystem.mk
# Disk images

1
config/desktop.toml
View file

@ -20,6 +20,7 @@ extrautils = {}
findutils = {}
gdbserver = {}
gnu-make = {}
initfs = {}
installer = {}
ion = {}
ipcd = {}

2
cookbook

@ -1 +1 @@
Subproject commit fb22428bb1d1bc586c1058fe4787ac2a48ea329a
Subproject commit dd942939275a3b57f8c76db3c616f1511215a9ea

39
initfs.toml
View file

@ -1,39 +0,0 @@
# This is the default configuration file
# General settings
[general]
# Do not prompt if settings are not defined
prompt = false
# Package settings
[packages]
drivers-initfs = {}
init = {}
logd = {}
nulld = {}
#pciids = {}
ramfs = {}
randd = {}
redoxfs = {}
zerod = {}
[[files]]
path="/etc/init.rc"
data="""
export PATH /bin
export TMPDIR /tmp
nulld
zerod
randd
vesad T T G
logd debug: display:1
stdio log:
ps2d us
ramfs logging
acpid
pcid /etc/pcid/initfs.toml
redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
cd file:
export PATH file:/bin
run.d /etc/init.d
"""

3
mk/filesystem.mk
View file

@ -1,4 +1,4 @@
build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/initfs.img
build/filesystem.bin: prefix filesystem.toml build/bootloader.bin
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
@ -20,7 +20,6 @@ build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/initfs.i
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
$(INSTALLER) -c filesystem.toml build/filesystem/
cp build/initfs.img build/filesystem/initfs
sync
-$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/

16
mk/initfs.mk
View file

@ -1,16 +0,0 @@
INITFS_RM_BINS=\
redoxfs-ar \
redoxfs-mkfs
build/initfs.img: initfs.toml prefix
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
rm -rf build/initfs
mkdir -p build/initfs
$(INSTALLER) -c $< build/initfs/
#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
rm -rf build/initfs/pkg
for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs/bin/$$bin; \
done
cargo run --manifest-path redox-initfs/tools/Cargo.toml --bin redox-initfs-ar -- build/initfs -o $@

1
redox-initfs

@ -1 +0,0 @@
Subproject commit 89b8fb8984cf96c418880b7dcd9ce3d6afc3f71c