diff --git a/Makefile b/Makefile index cd53ccee..1eb892f9 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/build-aux/iso-grub-cfg.sh b/build-aux/iso-grub-cfg.sh index 984021b1..4d817a8e 100755 --- a/build-aux/iso-grub-cfg.sh +++ b/build-aux/iso-grub-cfg.sh @@ -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 diff --git a/share/man/man7/kernel.7 b/share/man/man7/kernel.7 index 3db231fb..29a4385d 100644 --- a/share/man/man7/kernel.7 +++ b/share/man/man7/kernel.7 @@ -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: