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

Update installer

Browse source
This commit is contained in:
Jeremy Soller 2017-09-26 20:53:08 -06:00
parent 5624ea8918
commit edf3ac0582
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -25,16 +25,18 @@ pull:
make update make update
update: update:
cd cookbook; \ cd cookbook && ./update.sh \
./update.sh "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages ../initfs.toml ../filesystem.toml)" "$$(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 cookbook/pkgutils/Cargo.toml
cargo update --manifest-path installer/Cargo.toml cargo update --manifest-path installer/Cargo.toml
cargo update --manifest-path kernel/Cargo.toml cargo update --manifest-path kernel/Cargo.toml
cargo update --manifest-path redoxfs/Cargo.toml cargo update --manifest-path redoxfs/Cargo.toml
fetch: fetch:
cd cookbook; \ cd cookbook && ./fetch.sh \
./fetch.sh "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages ../initfs.toml ../filesystem.toml)" "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
# Emulation recipes # Emulation recipes
include mk/qemu.mk include mk/qemu.mk
@ -53,7 +55,7 @@ include mk/disk.mk
# Travis target # Travis target
travis: FORCE travis: FORCE
INSTALLER_FLAGS= make build/harddrive.bin.gz build/livedisk.iso make INSTALLER_FLAGS= build/harddrive.bin.gz build/livedisk.iso
rm -rf build/travis rm -rf build/travis
mkdir build/travis mkdir build/travis
mv build/harddrive.bin.gz build/travis/redox_$(TRAVIS_TAG).bin.gz mv build/harddrive.bin.gz build/travis/redox_$(TRAVIS_TAG).bin.gz

1
filesystem.toml
View file

@ -4,7 +4,6 @@
[general] [general]
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false
sysroot = "build/filesystem"
# Package settings # Package settings
[packages] [packages]

1
initfs.toml
View file

@ -4,7 +4,6 @@
[general] [general]
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false
sysroot = "build/initfs"
# Package settings # Package settings
[packages] [packages]

2
installer

@ -1 +1 @@
Subproject commit a7b16dcb9712aa39de91ae05ffa005e439a91ed1 Subproject commit a82a5771803fa14666343568e415999dd51887c7

2
mk/filesystem.mk
View file

@ -9,7 +9,7 @@ build/filesystem.bin: filesystem.toml build/kernel
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp build/kernel build/filesystem/kernel cp build/kernel build/filesystem/kernel
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $< cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/filesystem/
chown -R 0:0 build/filesystem chown -R 0:0 build/filesystem
chown -R 1000:1000 build/filesystem/home/user chown -R 1000:1000 build/filesystem/home/user
chmod -R uog+rX build/filesystem chmod -R uog+rX build/filesystem

3
mk/initfs.mk
View file

@ -1,5 +1,6 @@
build/initfs.tag: initfs.toml build/initfs.tag: initfs.toml
cd kernel && xargo clean cd kernel && xargo clean
rm -rf build/initfs rm -rf build/initfs
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $< mkdir -p build/initfs
cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs/
touch $@ touch $@