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

enable build from mixed source/binary packages

Browse source
This commit is contained in:
Ron Williams 2023-03-09 23:30:33 -08:00
parent 189d7218f2
commit be957aa4d7
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/build/ /build/
/prefix/ /prefix/
.config .config
**/my_*

2
installer

@ -1 +1 @@
Subproject commit c91bea94524996d82c9268a085a4116c5856b765 Subproject commit b23b2f6e5db1a463769ff864aac994ff0eb83119

3
mk/config.mk
View file

@ -61,6 +61,9 @@ INSTALLER=installer/target/release/redox_installer
ifeq ($(REPO_BINARY),0) ifeq ($(REPO_BINARY),0)
INSTALLER+=--cookbook=cookbook INSTALLER+=--cookbook=cookbook
REPO_TAG=$(BUILD)/repo.tag REPO_TAG=$(BUILD)/repo.tag
else
INSTALLER+=--cookbook=cookbook --cooking
REPO_TAG=$(BUILD)/repo.tag
endif endif
FSTOOLS_TAG=build/fstools.tag FSTOOLS_TAG=build/fstools.tag

6
mk/disk.mk
View file

@ -3,7 +3,7 @@ $(BUILD)/harddrive.img: $(FSTOOLS_TAG) $(REPO_TAG)
rm -rf $@ $@.partial rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true -$(FUMOUNT) /tmp/redox_installer || true
fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
$(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
mv $@.partial $@ mv $@.partial $@
$(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG) $(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG)
@ -11,7 +11,7 @@ $(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG)
rm -rf $@ $@.partial rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true -$(FUMOUNT) /tmp/redox_installer || true
fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
mv $@.partial $@ mv $@.partial $@
$(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG) $(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG)
@ -25,7 +25,7 @@ $(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG)
redoxfs/target/release/redoxfs $@.partial $(BUILD)/filesystem/ redoxfs/target/release/redoxfs $@.partial $(BUILD)/filesystem/
sleep 1 sleep 1
pgrep redoxfs pgrep redoxfs
$(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/ umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/
sync sync
-$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) $(BUILD)/filesystem/ || true
rm -rf $(BUILD)/filesystem/ rm -rf $(BUILD)/filesystem/