Skip to content

Commit

Permalink
Misc changes and new ports added
Browse files Browse the repository at this point in the history
  • Loading branch information
mintsuki committed Jul 9, 2022
1 parent 630c441 commit f2efbbc
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 788 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Nightly Vinix rebuild

on: [push]
# schedule:
# - cron: '0 0 * * *'
on:
schedule:
- cron: '0 0 * * *'

jobs:
vinix-build:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jinx
builds
host-builds
host-pkgs
Expand Down
18 changes: 10 additions & 8 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@
QEMUFLAGS ?= -M q35,smm=off -m 8G -cdrom vinix.iso -serial stdio

.PHONY: all
all:
all: jinx
./jinx build base-files kernel init util-vinix
./build-support/makeiso.sh

.PHONY: debug
debug:
cp jinx-config jinx-config.bak
echo "export VINIX_PROD=no" >> jinx-config
$(MAKE) all || ( mv jinx-config.bak jinx-config && false )
mv jinx-config.bak jinx-config
JINX_CONFIG_FILE=jinx-config-debug $(MAKE) all

jinx:
curl -o jinx https://raw.githubusercontent.com/mintsuki/jinx/trunk/jinx
chmod +x jinx

.PHONY: distro-full
distro-full:
distro-full: jinx
./jinx build-all

.PHONY: distro-base
distro-base:
distro-base: jinx
./jinx build bash coreutils

.PHONY: run-kvm
Expand Down Expand Up @@ -68,6 +69,7 @@ clean: kernel-clean util-vinix-clean init-clean base-files-clean
rm -rf iso_root sysroot vinix.iso initramfs.tar

.PHONY: distclean
distclean: clean
distclean: clean jinx
make -C kernel distclean
./jinx clean
rm jinx
1 change: 0 additions & 1 deletion base-files/etc/bash/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ HISTCONTROL=ignoredups
HISTSIZE=-1
HISTFILESIZE=-1
alias ls="ls --color=auto"
alias clear='printf "\e[2J\e[H"'
6 changes: 5 additions & 1 deletion host-recipes/binutils
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ imagedeps="gcc"
hostdeps="autoconf automake"

configure() {
"${source_dir}"/configure CFLAGS="${common_cflags}" CXXFLAGS="${common_cflags}" --prefix="${prefix}" --target=x86_64-vinix --with-sysroot="${sysroot_dir}" --disable-werror
"${source_dir}"/configure \
--prefix="${prefix}" \
--target=x86_64-vinix \
--with-sysroot="${sysroot_dir}" \
--disable-werror
}

build() {
Expand Down
8 changes: 7 additions & 1 deletion host-recipes/gcc-compiler
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ hostrundeps="binutils"
deps="mlibc-headers"

configure() {
"${source_dir}"/configure CFLAGS="${common_cflags}" CXXFLAGS="${common_cflags}" --prefix="${prefix}" --target=x86_64-vinix --with-sysroot="${sysroot_dir}" --enable-languages=c,c++ --disable-multilib --enable-initfini-array
"${source_dir}"/configure \
--prefix="${prefix}" \
--target=x86_64-vinix \
--with-sysroot="${sysroot_dir}" \
--enable-languages=c,c++ \
--disable-multilib \
--enable-initfini-array
}

build() {
Expand Down
3 changes: 2 additions & 1 deletion host-recipes/libtool
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ hostdeps="autoconf automake"
imagedeps="help2man gcc"

configure() {
"${source_dir}"/configure CFLAGS="${common_cflags}" CXXFLAGS="${common_cflags}" --prefix="${prefix}"
"${source_dir}"/configure \
--prefix="${prefix}"
}

build() {
Expand Down
6 changes: 5 additions & 1 deletion host-recipes/limine
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ hostdeps="gcc"
imagedeps="nasm gcc mtools"

configure() {
"${source_dir}"/configure CFLAGS="${common_cflags}" CXXFLAGS="${common_cflags}" --prefix="${prefix}" CROSS_TOOLCHAIN=x86_64-vinix LDFLAGS="-static" --enable-all
"${source_dir}"/configure \
--prefix="${prefix}" \
CROSS_TOOLCHAIN=x86_64-vinix \
LDFLAGS="-static" \
--enable-all
}

build() {
Expand Down
3 changes: 2 additions & 1 deletion host-recipes/pkg-config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ imagedeps="gcc"
hostdeps="automake autoconf libtool"

configure() {
"${source_dir}"/configure CFLAGS="${common_cflags}" CXXFLAGS="${common_cflags}" --prefix="${prefix}"
"${source_dir}"/configure \
--prefix="${prefix}"
}

build() {
Expand Down
Loading

0 comments on commit f2efbbc

Please sign in to comment.