src v5.0.0

.github/workflows/build-rootfs.yml

@@ -29,8 +29,8 @@ jobs:
 
       - name: Build nocc rootfs tarball
         run: |
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh init
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh build nocc
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh init
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh build nocc
 
       - name: Upload nocc Rootfs
         uses: actions/upload-artifact@v3.1.1
@@ -44,7 +44,7 @@ jobs:
 
       - name: Build builder rootfs tarball
         run: |
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh build builder
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh build builder
 
       - name: Upload Builder Rootfs
         uses: actions/upload-artifact@v3.1.1
@@ -58,7 +58,7 @@ jobs:
 
       - name: Build server rootfs tarball
         run: |
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh build server
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh build server
 
       - name: Upload Server Rootfs
         uses: actions/upload-artifact@v3.1.1
@@ -72,7 +72,7 @@ jobs:
 
       - name: Build builder-gnu rootfs tarball
         run: |
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh build builder-gnu
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh build builder-gnu
 
       - name: Upload builder-gnu Rootfs
         uses: actions/upload-artifact@v3.1.1
@@ -86,7 +86,7 @@ jobs:
 
       - name: Build builder-systemd rootfs tarball
         run: |
-          IS_ACTIONS=y sh $GITHUB_WORKSPACE/src/scripts/build-ci.sh build builder-systemd
+          IS_ACTIONS=y sh $GITHUB_WORKSPACE/scripts/build-ci.sh build builder-systemd
 
       - name: Upload builder-systemd Rootfs
         uses: actions/upload-artifact@v3.1.1
@@ -112,11 +112,11 @@ jobs:
       - name: Prepare for Docker
         run: |
             mkdir /tmp/docker.tmp /tmp/docker.tmp.nocc /tmp/docker.tmp.builder-gnu /tmp/docker.tmp.server /tmp/docker.tmp.builder-systemd
-            cp $GITHUB_WORKSPACE/src/docker/Dockerfile /tmp/docker.tmp.nocc || exit 1
-            cp $GITHUB_WORKSPACE/src/docker/Dockerfile /tmp/docker.tmp/ || exit 1
-            cp $GITHUB_WORKSPACE/src/docker/Dockerfile /tmp/docker.tmp.builder-gnu || exit 1
-            cp $GITHUB_WORKSPACE/src/docker/Dockerfile /tmp/docker.tmp.server || exit 1
-            cp $GITHUB_WORKSPACE/src/docker/Dockerfile /tmp/docker.tmp.builder-systemd || exit 1
+            cp $GITHUB_WORKSPACE/docker/Dockerfile /tmp/docker.tmp.nocc || exit 1
+            cp $GITHUB_WORKSPACE/docker/Dockerfile /tmp/docker.tmp/ || exit 1
+            cp $GITHUB_WORKSPACE/docker/Dockerfile /tmp/docker.tmp.builder-gnu || exit 1
+            cp $GITHUB_WORKSPACE/docker/Dockerfile /tmp/docker.tmp.server || exit 1
+            cp $GITHUB_WORKSPACE/docker/Dockerfile /tmp/docker.tmp.builder-systemd || exit 1
             tar -xvpf $GITHUB_WORKSPACE/builder-gnu-rootfs/kreato-linux-builder-gnu-*.tar.gz -C "/tmp/docker.tmp.builder-gnu"
             tar -xvpf $GITHUB_WORKSPACE/builder-systemd-rootfs/kreato-linux-builder-systemd-*.tar.gz -C "/tmp/docker.tmp.builder-systemd"
             tar -xvpf $GITHUB_WORKSPACE/builder-rootfs/kreato-linux-builder-*.tar.gz -C "/tmp/docker.tmp"

.github/workflows/build.yml

@@ -2,11 +2,9 @@ name: CI
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
   push:
-    branches: ["master"]
-  pull_request:
-    branches: ["master"]
+    paths:
+      - '**.nim'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -28,7 +26,7 @@ jobs:
 
       - name: build (amd64)
         run: |
-          nim c --threads=on -o=/tmp/kpkg-amd64-linux --passL:-static -d:ssl --passL:-lssl --dynlibOverride:ssl --passL:-lcrypto --dynlibOverride:crypto src/kpkg/kpkg.nim
+          nim c --threads=on -o=/tmp/kpkg-amd64-linux --passL:-static -d:ssl --passL:-lssl --dynlibOverride:ssl --passL:-lcrypto --dynlibOverride:crypto kpkg/kpkg.nim
 
       - uses: actions/upload-artifact@v3
         with:
@@ -43,5 +41,5 @@ jobs:
 
       - name: build and run purr
         run: |
-          nim c --threads=on -o=/tmp/ci --passL:-static -d:ssl --passL:-lssl --dynlibOverride:ssl --passL:-lcrypto --dynlibOverride:crypto src/purr/purr.nim
+          nim c --threads=on -o=/tmp/ci --passL:-static -d:ssl --passL:-lssl --dynlibOverride:ssl --passL:-lcrypto --dynlibOverride:crypto purr/purr.nim
           /tmp/ci

.github/workflows/man.yml

@@ -3,7 +3,7 @@ name: Build manpages
 on:
   push:
     paths:
-      - 'src/man/*.md'
+      - 'man/*.md'
   workflow_dispatch:
 
 jobs:
@@ -21,7 +21,7 @@ jobs:
       - name: Build manpages
         run: |
           [ ! -d "man" ] && mkdir man
-          for i in src/man/*.md; do
+          for i in man/*.md; do
             pandoc --standalone --to man "$i" -o man/"$(basename $i .md)"
           done
 

.gitignore

@@ -1,6 +1,6 @@
 out
 packages
-src/kreastrap/kreastrap
+kreastrap/kreastrap
 result
 kpkg-repo
 archives

Makefile

@@ -1,4 +1,4 @@
-SRCDIR = $(shell pwd)/src
+SRCDIR = $(shell pwd)
 PREFIX = ./out
 
 nimbuild = nim c -d:release -d:branch=master --threads:on -d:ssl -o=$(PREFIX)/$1 $(SRCDIR)/$1/$1.nim

README.md

@@ -1,6 +1,5 @@
 <p align="left">
-<img src="https://github.com/Kreato-Linux/logo/blob/master/withtext.png"> 
-  <img src="https://github.com/Kreato-Linux/logo/blob/master/core.png" height="10%" width="10%">
+<img src="https://github.com/Kreato-Linux/logo/blob/master/withtext.png">
 </p>
 
 # src
@@ -21,7 +20,7 @@ There are a couple of build variables;
 
 ## kreastrap
 There is also kreastrap v3, a rootfs building utility.
-You can build it by running `make kreastrap`. The binary will be located on `src/kreastrap/kreastrap`.
+You can build it by running `make kreastrap`. The binary will be located on `kreastrap/kreastrap`.
 
 ## mari
 Mari is a very simple http server that uses httpbeast. It is mainly used to run Kreato Linux binary repository. You can build it by running `make mari`. The binary will be located on the usual `out` folder.

src/jumpstart/logging.nim → common/logging.nim

@@ -1,3 +1,4 @@
+
 import terminal
 
 proc debug*(message: string) =

src/jumpstart/jumpstart.nim → jumpstart/jumpstart.nim

@@ -2,6 +2,9 @@ import std/net
 import json
 include serviceHandler/main
 
+if getCurrentProcessId() != 1:
+    error "jumpstart needs to be ran as PID 1 (init) to function correctly"
+
 ## Initialize the entire system, such as mounting /proc etc.
 initSystem()
 

src/jumpstart/serviceHandler/disable.nim → jumpstart/serviceHandler/disable.nim

@@ -1,6 +1,6 @@
 import os
 include ../commonImports
-import ../logging
+import ../../common/logging
 
 proc disableService*(service: string, isMount: bool) =
     ## Disables an service.

src/jumpstart/serviceHandler/enable.nim → jumpstart/serviceHandler/enable.nim

@@ -1,6 +1,6 @@
 import os
 include ../commonImports
-import ../logging
+import ../../common/logging
 
 proc enableService*(service: string, isMount: bool) =
     ## Enables an service.

src/jumpstart/serviceHandler/jumpmount/main.nim → jumpstart/serviceHandler/jumpmount/main.nim

@@ -1,5 +1,5 @@
 import parsecfg
-import ../../logging
+import ../../../common/logging
 import os
 import strutils
 import osproc

src/jumpstart/serviceHandler/jumpmount/umount.nim → jumpstart/serviceHandler/jumpmount/umount.nim

@@ -2,7 +2,7 @@ import parsecfg
 import osproc
 import os
 import strutils
-import ../../logging
+import ../../../common/logging
 include ../../commonImports
 
 proc stopMount*(mountName: string) =

src/jumpstart/serviceHandler/main.nim → jumpstart/serviceHandler/main.nim

@@ -4,7 +4,7 @@ include ../commonImports
 import enable, disable, start, stop
 import os, osproc
 import parsecfg
-import ../logging
+import ../../common/logging
 import jumpmount/main
 import jumpmount/umount
 

src/jumpstart/serviceHandler/start.nim → jumpstart/serviceHandler/start.nim

@@ -2,7 +2,7 @@ import parsecfg
 import os, osproc
 import std/threadpool
 import status
-import ../logging
+import ../../common/logging
 include ../commonImports
 import globalVariables
 

src/jumpstart/serviceHandler/stop.nim → jumpstart/serviceHandler/stop.nim

@@ -1,4 +1,4 @@
-import ../logging
+import ../../common/logging
 import osproc
 import os
 import globalVariables

src/kpkg/build.nim → kpkg/commands/buildcmd.nim

@@ -1,11 +1,15 @@
+import os
+import osproc
+import installcmd
 import strutils
+import sequtils
 import libsha/sha256
-include modules/dephandler
-include modules/runparser
-include modules/downloader
-include install
-import modules/shadow
-import os
+import ../modules/logger
+import ../modules/shadow
+import ../modules/config
+import ../modules/runparser
+import ../modules/dephandler
+import ../modules/downloader
 
 const lockfile = "/tmp/kpkg.lock"
 
@@ -14,11 +18,9 @@ proc cleanUp() {.noconv.} =
     removeFile(lockfile)
     quit(0)
 
-proc builder(package: string, destdir: string,
+proc builder*(package: string, destdir: string,
     root = "/tmp/kpkg/build", srcdir = "/tmp/kpkg/srcdir", offline = false,
-            dontInstall = false, useCacheIfAvailable = false,
-                    binrepo = "mirror.kreato.dev",
-                    enforceReproducibility = false): bool =
+            dontInstall = false, useCacheIfAvailable = false): bool =
     ## Builds the packages.
 
     if not isAdmin():
@@ -75,7 +77,11 @@ proc builder(package: string, destdir: string,
         return true
 
     var filename: string
-    var existsPrepare = execShellCmd(". "&path&"/run"&" && command -v prepare")
+
+    let existsPrepare = execCmdEx(". "&path&"/run"&" && command -v prepare").exitCode
+    let existsInstall = execCmdEx(". "&path&"/run"&" && command -v package").exitCode
+    let existsPackageInstall = execCmdEx(
+            ". "&path&"/run"&" && command -v package_"&package).exitCode
 
     var int = 0
     var usesGit: bool
@@ -95,7 +101,10 @@ proc builder(package: string, destdir: string,
 
                 folder = @[lastPathPart(i.split("::")[1])]
             else:
-                waitFor download(i, filename)
+                if fileExists(path&"/"&i):
+                    copyFile(path&"/"&i, i)
+                else:
+                    download(i, filename)
 
                 # git cloning doesn't support sha256sum checking
                 var actualDigest = sha256hexdigest(readAll(open(
@@ -129,21 +138,27 @@ proc builder(package: string, destdir: string,
     # Run ldconfig beforehand for any errors
     discard execProcess("ldconfig")
 
+    var cmdStr = ". "&path&"/run"&" && export CC="&getConfigValue("Options",
+            "cc")&" && export CCACHE_DIR=/tmp/kpkg/cache && build"
+    var cmd2Str = ". "&path&"/run"&" && export DESTDIR="&root&" && export ROOT=$DESTDIR &&"
+
+    if existsPackageInstall == 0:
+        cmd2Str = cmd2Str&" package_"&package
+    elif existsInstall == 0:
+        cmd2Str = cmd2Str&" package"
+    else:
+        err "install stage of package doesn't exist, invalid runfile"
+
     if pkg.sources.split(";").len == 1:
         if existsPrepare == 0:
-            cmd = execShellCmd("su -s /bin/sh _kpkg -c '. "&path&"/run"&" && export CC="&getConfigValue(
-                    "Options", "cc")&" && export CCACHE_DIR=/tmp/kpkg/cache && build'")
-            cmd2 = execShellCmd(". "&path&"/run"&" && export DESTDIR="&root&" && export ROOT=$DESTDIR && install")
+            cmd = execShellCmd(sboxWrap(cmdStr))
+            cmd2 = execShellCmd("fakeroot -- "&cmd2Str)
         else:
-            cmd = execShellCmd("su -s /bin/sh _kpkg -c 'cd "&folder[
-                    0]&" && . "&path&"/run"&" && export CC="&getConfigValue(
-                    "Options", "cc")&" && export CCACHE_DIR=/tmp/kpkg/cache && build'")
-            cmd2 = execShellCmd("cd "&folder[
-                    0]&" && . "&path&"/run"&" && export DESTDIR="&root&" && export ROOT=$DESTDIR && install")
+            cmd = execShellCmd(sboxWrap("cd "&folder[0]&" && "&cmdStr))
+            cmd2 = execShellCmd("fakeroot -- cd "&folder[0]&" && "&cmd2Str)
     else:
-        cmd = execShellCmd("su -s /bin/sh _kpkg -c '. "&path&"/run"&" && export CC="&getConfigValue(
-                "Options", "cc")&" && export CCACHE_DIR=/tmp/kpkg/cache && build'")
-        cmd2 = execShellCmd(". "&path&"/run"&" && export DESTDIR="&root&" && export ROOT=$DESTDIR && install")
+        cmd = execShellCmd(sboxWrap(cmdStr))
+        cmd2 = execShellCmd("fakeroot -- "&cmd2Str)
 
     if cmd != 0:
         err("build failed")
@@ -166,9 +181,7 @@ proc builder(package: string, destdir: string,
         install_pkg(repo, package, "/")
 
     if not dontInstall:
-        install_pkg(repo, package, destdir,
-                enforceReproducibility = enforceReproducibility,
-                binrepo = binrepo, builddir = root)
+        install_pkg(repo, package, destdir, builddir = root)
 
     removeFile(lockfile)
 
@@ -178,11 +191,9 @@ proc builder(package: string, destdir: string,
 
     return false
 
-proc build(no = false, yes = false, root = "/",
+proc build*(no = false, yes = false, root = "/",
     packages: seq[string],
-            useCacheIfAvailable = false, binrepo = "mirror.kreato.dev",
-                    enforceReproducibility = false,
-                            forceInstallAll = false): string =
+            useCacheIfAvailable = false, forceInstallAll = false): string =
     ## Build and install packages
     var deps: seq[string]
 
@@ -217,9 +228,7 @@ proc build(no = false, yes = false, root = "/",
                     discard
                 else:
                     builderOutput = builder(i, fullRootPath, offline = false,
-                            useCacheIfAvailable = useCacheIfAvailable,
-                            enforceReproducibility = enforceReproducibility,
-                            binrepo = binrepo)
+                            useCacheIfAvailable = useCacheIfAvailable)
                     if not builderOutput:
                         cacheAvailable = false
 
@@ -233,9 +242,7 @@ proc build(no = false, yes = false, root = "/",
         for i in packages:
             try:
                 discard builder(i, fullRootPath, offline = false,
-                            useCacheIfAvailable = cacheAvailable,
-                            enforceReproducibility = enforceReproducibility,
-                            binrepo = binrepo)
+                            useCacheIfAvailable = cacheAvailable)
                 echo("kpkg: installed "&i&" successfully")
 
             except CatchableError:

src/kpkg/info.nim → kpkg/commands/infocmd.nim

@@ -1,4 +1,9 @@
-proc info(package: seq[string], testing = false): string =
+import os
+import ../modules/logger
+import ../modules/config
+import ../modules/runparser
+
+proc info*(package: seq[string], testing = false): string =
     ## Get information about packages
 
     if package.len == 0: