nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup! Package the system as a tix binary package.

This commit is contained in:
Jonas 'Sortie' Termansen 2023-09-11 20:36:33 +02:00
parent d992f098c2
commit 44423e0162
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -686,7 +686,7 @@ $(SORTIX_RELEASE_DIR)/$(RELEASE)/repository/$(HOST):
.PHONY: release-repository
release-repository: sysroot $(SYSTEM_INITRD) $(SORTIX_RELEASE_DIR)/$(RELEASE)/repository/$(HOST)
xz -c $(SYSTEM_INITRD) > $(SORTIX_RELEASE_DIR)/$(RELEASE)/repository/$(HOST)/system.tix.tar.xz
for port in `LC_ALL=C ls "$(SYSROOT)/tix/tixinfo"`; do \
for port in `LC_ALL=C ls "$(SYSROOT)/tix/tixinfo" | (grep -Ev '^system$$' || true)`; do \
cp $(SORTIX_REPOSITORY_DIR)/$(HOST)/$$port.tix.tar.xz $(SORTIX_RELEASE_DIR)/$(RELEASE)/repository/$(HOST) && \
cp $(SORTIX_REPOSITORY_DIR)/$(HOST)/$$port.version $(SORTIX_RELEASE_DIR)/$(RELEASE)/repository/$(HOST); \
done

2
build-aux/iso-grub-cfg.sh
View File

@ -129,7 +129,7 @@ else
ports=$(ls repository |
grep -E '\.tix\.tar\.xz$' |
sed -E 's/\.tix\.tar\.xz$//' |
grep -Ev '^system$')
(grep -Ev '^system$' || true))
fi
mkdir -p boot/grub

5
share/man/man7/kernel.7
View File

@ -83,11 +83,6 @@ The format of each multiboot module is automatically detected by default:
.Xr tar 7
archives in the ustar format are extracted into the root directory.
The bootloader must already have decompressed the archive.
If the archive contains the
.Pa tix/tixinfo
file, it is instead installed into the root directory as a
.Xr tix 7
binary package.
.El
.Pp
Each multiboot module has its own command line where the options are as follows: