diff options
| -rw-r--r-- | Makefile.in | 22 | ||||
| -rw-r--r-- | usr.sbin/init/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/init/main.c | 34 | ||||
| -rw-r--r-- | usr.sbin/link.ld | 35 |
4 files changed, 96 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 8955004..aeb6911 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,16 +45,36 @@ override KERNEL_OBJECTS = $(KERNEL_CFILES:.c=.o) override KERNEL_ASMOBJECTS = $(KERNEL_ASMFILES:.S=.S.o) override KERNEL_HEADER_DEPS = $(KERNEL_CFILES:.c=.d) +######################## +# Userland +######################## +override SBIN_MAKEDIRS = $(shell find usr.sbin/ -type d -name "*" | awk '!/usr.sbin\/$$/') +override USRDIR = $(shell pwd)/base/usr + .PHONY: all -all: base base/boot/hyra-kernel ramfs iso +all: base libc sbin base/boot/hyra-kernel ramfs iso rm -f sys/include/machine rm -rf iso_root +.PHONY: sbin +sbin: $(SBIN_MAKEDIRS) + $(MAKE) -C $^ -I$(shell pwd)/builddeps \ + LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR) + find $^ -type f -executable -exec mv {} base/usr/sbin/ \; + +.PHONY: libc +libc: + $(MAKE) -C lib/libc/ -I$(shell pwd)/builddeps \ + USRDIR=$(USRDIR) + cp lib/libc/build/libc.a base/usr/lib/ + .PHONY: base base: mkdir -p base/usr/lib/ mkdir -p base/usr/sbin/ mkdir -p base/boot/ + mkdir -p base/usr/include/sys/ + cp sys/include/sys/*.h base/usr/include/sys/ .PHONY: cross cross: diff --git a/usr.sbin/init/Makefile b/usr.sbin/init/Makefile new file mode 100644 index 0000000..bee9f3a --- /dev/null +++ b/usr.sbin/init/Makefile @@ -0,0 +1,6 @@ +include user.mk + +CFILES = $(shell find . -name "*.c") + +init: + gcc $(CFILES) -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.sbin/init/main.c b/usr.sbin/init/main.c new file mode 100644 index 0000000..8ef90d3 --- /dev/null +++ b/usr.sbin/init/main.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +int +main(void) +{ + return 0; +} diff --git a/usr.sbin/link.ld b/usr.sbin/link.ld new file mode 100644 index 0000000..da2346d --- /dev/null +++ b/usr.sbin/link.ld @@ -0,0 +1,35 @@ +ENTRY(_start) + +PHDRS +{ + text PT_LOAD FLAGS((1 << 0) | (1 << 2)) ; /* Execute + Read */ + rodata PT_LOAD FLAGS((1 << 2)) ; /* Read only */ + data PT_LOAD FLAGS((1 << 1) | (1 << 2)) ; /* Write + Read */ +} + +SECTIONS +{ + . = 0x10000; + + .text : { + *(.text) + *(.text.*) + } :text + + .rodata : ALIGN(8) { + *(.rodata) + *(.rodata.*) + } :rodata + + .data : ALIGN(8) { + *(.data) + *(.data.*) + } :data + + .bss : ALIGN(8) { + __bss_start = .; + *(.bss) + *(.bss.*) + __bss_end = .; + } :data +} |