Skip to content

Commit

Permalink
Made small edits to dennix's ports to work on Cobalt...
Browse files Browse the repository at this point in the history
  • Loading branch information
Dashbloxx committed Feb 22, 2023
1 parent c5474ea commit 5079f4f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ INITRD = $(BUILD_DIR)/initrd.tar.xz
ISO = cobalt.iso
LICENSE = $(LICENSES_DIR)/cobalt/LICENSE

DXPORT = ./ports/dxport --host=$(ARCH)-cobalt --builddir=$(BUILD_DIR)/install-ports
DXPORT += --sysroot=$(SYSROOT)

all: libc kernel libdxui apps sh utils iso

apps: $(INCLUDE_DIR) $(LIB_DIR)
Expand Down Expand Up @@ -58,6 +61,11 @@ $(LIB_DIR):
$(MAKE) -C libc install-libs
$(MAKE) -C libdxui install-lib

install-ports $(DXPORT_DIR): $(INCLUDE_DIR) $(LIB_DIR)
ifneq ($(wildcard ./ports/dxport),)
-$(DXPORT) install -k all
endif

install-sh: $(INCLUDE_DIR) $(LIB_DIR)
$(MAKE) -C sh install

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ The first line will clean the root filesystem model, and delete the `.iso` file.
## Testing Cobalt
Cobalt currently supports only two architectures, which are i386, and x86_64. When Cobalt is built for one of these architectures you can test them using QEMU:
```
qemu-system-x86_64 -cdrom cobalt.iso
qemu-system-x86_64 -m 1024M -cdrom cobalt.iso
```
This will get QEMU to test out the CDROM image of Cobalt that was built.
This will get QEMU to test out the CDROM image of Cobalt that was built. If you are running on a x86_64 architecture, you can add `-accel kvm` to make the emulation even faster.
## Contributing
For guidelines on contributing, see [this](CONTRIBUTING.md) page. A list of contributors can be found here:
* [Falkosc223](https://github.com/orgs/syscobalt/people/Falkosc223)
Expand All @@ -30,4 +30,5 @@ For guidelines on contributing, see [this](CONTRIBUTING.md) page. A list of cont
Others who created code which can be found here are listed aswell:
* [dennis95](https://github.com/dennis95)
## Ports
See the [ports repository](https://github.com/syscobalt/cobalt-ports). This repository contains ported software and user-made applications that should be optional to install on Cobalt.
There is a subfolder called `ports`, which uses a port manager made for [dennix](https://github.com/dennis95/dennix) that is compatible with Cobalt. Most of these ports have been made for Dennix, but were slightly modified to work with Cobalt.
These ports are automatically built when you run `make`, because they are considered vital, although others may see it as bloatware.
1 change: 1 addition & 0 deletions build-aux/paths.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ INCLUDE_DIR = $(SYSROOT)/include
LIB_DIR = $(SYSROOT)/lib
SBIN_DIR = $(SYSROOT)/sbin
LICENSES_DIR = $(SYSROOT)/share/licenses
DXPORT_DIR = $(SYSROOT)/local/dxport

0 comments on commit 5079f4f

Please sign in to comment.