Skip to content

Commit

Permalink
kernel: Install to /share
Browse files Browse the repository at this point in the history
  • Loading branch information
mintsuki committed Jan 1, 2024
1 parent cc92987 commit 88629ee
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build-support/limine.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ TERM_WALLPAPER_STYLE=stretched

:Vinix
PROTOCOL=limine
KERNEL_PATH=boot:///boot/vinix.elf
KERNEL_PATH=boot:///boot/vinix
MODULE_PATH=boot:///boot/initramfs.tar
2 changes: 1 addition & 1 deletion build-support/makeiso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rm -rf sysroot
# Prepare the iso and boot directories.
rm -rf iso_root
mkdir -pv iso_root/boot
cp sysroot/boot/vinix.elf iso_root/boot/
cp sysroot/usr/share/vinix/vinix iso_root/boot/
cp initramfs.tar iso_root/boot/
cp build-support/limine.cfg build-support/background.bmp iso_root/boot/

Expand Down
6 changes: 3 additions & 3 deletions kernel/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ifeq ($(PROD), true)
override INTERNALCFLAGS += -DPROD
endif

override KERNEL := vinix.elf
override KERNEL := vinix
override VFILES := $(shell find ./ -type f -name '*.v')
override CFILES := $(shell find ./ -type f -name '*.c')
override SFILES := $(shell find ./ -type f -name '*.S')
Expand Down Expand Up @@ -113,8 +113,8 @@ distclean: clean

.PHONY: install
install:
install -d "$(DESTDIR)$(PREFIX)/boot"
install $(KERNEL) "$(DESTDIR)$(PREFIX)/boot/"
install -d "$(DESTDIR)$(PREFIX)/share/vinix"
install -m 644 $(KERNEL) "$(DESTDIR)$(PREFIX)/share/vinix/"

blob.o: $(VFILES) freestanding_headers flanterm-c c/printf
$(V) $(VFLAGS) $(INTERNALVFLAGS) -o blob.c .
Expand Down
2 changes: 1 addition & 1 deletion recipes/kernel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build() {
}

package() {
make install PREFIX="/" DESTDIR="${dest_dir}"
make install PREFIX="/usr" DESTDIR="${dest_dir}"

post_package_strip
}

0 comments on commit 88629ee

Please sign in to comment.