Fixed evolutionOS not booting

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to evolution-packages
 
-evolution-packages is the backbone of the Evolution Linux distribution. It contains all the definitions to build packages from source.
+evolution-packages is the backbone of the EvolutionOS distribution. It contains all the definitions to build packages from source.
 
 This document describes how you, as a contributor, can help with adding packages, correcting bugs and adding features to evolution-packages.
 
@@ -30,32 +30,25 @@ Betas, arbitrary VCS revisions, templates using tip of development branch taken
 
 ## Creating, updating, and modifying packages in evolution by yourself
 
-If you really want to get a new package or package update into evolution Linux, we recommend you contribute it yourself.
+If you really want to get a new package or package update into evolutionOS, we recommend you contribute it yourself.
 
 We provide a [comprehensive Manual](./Manual.md) on how to create new packages.
 There's also a [manual for xbps-src](./README.md), which is used to build package files from templates.
 
-For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [GitHub Account](http://github.com) with [SSH set up](https://docs.github.com/en/authentication/connecting-to-github-with-ssh).
+For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [Centrifuge Account](http://centrifuge.hectabit.org) with SSH set up.
 
-You should also [set the email](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address) on your GitHub account and in git so your commits are associated with your GitHub account properly.
+To get started, fork the evolutionOS `evolution-packages` git repository on Centrifuge and clone it:
 
-To get started, [fork](https://help.github.com/articles/fork-a-repo) the evolution-linux `evolution-packages` git repository on GitHub and clone it:
+    $ git clone git@hectabit.org:<user>/evolution-packages.git
-
-    $ git clone git@github.com:<user>/evolution-packages.git
 
 To keep your forked repository up to date, setup the `upstream` remote to pull in new changes:
 
-    $ git remote add upstream https://github.com/evolution-linux/evolution-packages.git
+    $ git remote add upstream https://centrifuge.hectabit.org/evolutionos/evolution-packages.git
     $ git pull --rebase upstream master
 
-This can also be done with the `github-cli` tool:
-
-    $ gh repo fork evolution-linux/evolution-packages
-    $ gh repo clone <user>/evolution-packages
-
 This automatically sets up the `upstream` remote, so `git pull --rebase upstream master` can still be used to keep your fork up-to-date.
 
-Using the GitHub web editor for making changes is strongly discouraged, because you will need to clone the repo anyways to edit and test your changes.
+Using the Forgejo web editor for making changes is strongly discouraged, because you will need to clone the repo anyways to edit and test your changes.
 
 Using the `master` branch of your fork for contributing is also strongly discouraged.
 It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once.
@@ -103,18 +96,9 @@ If `xlint` reports any issues, resolve them before committing.
 
 Once you have made and verified your changes to the package template and/or other files, make one commit per package (including all changes to its sub-packages). Each commit message should have one of the following formats:
 
-* for new packages, use `New package: <pkgname>-<version>` ([example](https://github.com/evolution-linux/evolution-packages/commit/8ed8d41c40bf6a82cf006c7e207e05942c15bff8)).
+* We have no formal naming system, so call your commit what you like (up to an extent, no swearing, profanity, etc)!
 
-* for package updates, use `<pkgname>: update to <version>.` ([example](https://github.com/evolution-linux/evolution-packages/commit/c92203f1d6f33026ae89f3e4c1012fb6450bbac1)).
+* I have broken this rule myself several times, we are very lenient here...
-
-* for template modifications without a version change, use `<pkgname>: <reason>` ([example](https://github.com/evolution-linux/evolution-packages/commit/ff39c912d412717d17232de9564f659b037e95b5)).
-
-* for package removals, use `<pkgname>: remove package` and include the removal reason in the commit body ([example](https://github.com/evolution-linux/evolution-packages/commit/4322f923bdf5d4e0eb36738d4f4717d72d0a0ca4)).
-
-* for changes to any other file, use `<filename>: <reason>` ([example](https://github.com/evolution-linux/evolution-packages/commit/e00bea014c36a70d60acfa1758514b0c7cb0627d),
-  [example](https://github.com/evolution-linux/evolution-packages/commit/93bf159ce10d8e474da5296e5bc98350d00c6c82), [example](https://github.com/evolution-linux/evolution-packages/commit/dc62938c67b66a7ff295eab541dc37b92fb9fb78), [example](https://github.com/evolution-linux/evolution-packages/commit/e52317e939d41090562cf8f8131a68772245bdde))
-
-If you want to describe your changes in more detail, explain in the commit body (separated from the first line with a blank line) ([example](https://github.com/evolution-linux/evolution-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)).
 
 `xbump`, available in the [xtools](https://github.com/leahneukirchen/xtools) package, can be used to commit a new or updated package:
 
@@ -128,7 +112,7 @@ If you want to describe your changes in more detail, explain in the commit body
 
 ### Starting a pull request
 
-Once you have successfully built the package, you can [create a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request). Pull requests are also known as PRs.
+Once you have successfully built the package, you can create a pull request. Pull requests are also known as PRs.
 
 Most pull requests should only contain a single package and dependencies which are not part of evolution-packages yet.
 
@@ -177,31 +161,27 @@ Once you have applied all requested changes, the reviewers will merge your reque
 If the pull request becomes inactive for some days, the reviewers may or may not warn you when they are about to close it.
 If it stays inactive further, it will be closed.
 
-Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, [mark it as a draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft), or add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included.
+Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included.
 
 #### Publishing the package
 
 Once the reviewers have merged the pull request, our [build server](http://build.evolutionlinux.org) is automatically triggered and builds
-all packages in the pull request for all supported platforms. Upon completion, the packages are available to all evolution Linux users.
+all packages in the pull request for all supported platforms. Upon completion, the packages are available to all evolutionOS users.
 
 ## Testing Pull Requests
 
 While it is the responsibility of the PR creator to test changes before sending it, one person can't test all configuration options, usecases, hardware, etc.
 Testing new package submissions and updates is always helpful, and is a great way to get started with contributing.
-First, [clone the repository](https://github.com/evolution-linux/evolution-packages#quick-start) if you haven't done so already.
+First, clone the repository if you haven't done so already.
-Then check out the pull request, either with `github-cli`:
+Then check out the pull request, with `git`:
-
-    $ gh pr checkout <number>
-
-Or with `git`:
 
 If your local evolution-packages repository is cloned from your fork, you may need to add the main repository as a remote first:
 
-    $ git remote add upstream https://github.com/evolution-linux/evolution-packages.git
+    $ git remote add upstream https://centrifuge.hectabit.org/evolutionos/evolution-packages.git
 
 Then fetch and check out the PR (replacing `<remote>` with either `origin` or `upstream`):
 
     $ git fetch <remote> pull/<number>/head:<branch-name>
     $ git checkout <branch-name>
 
-Then [build and install](https://github.com/evolution-linux/evolution-packages#building-packages) the package and test its functionality.
+Then [build and install](https://centrifuge.hectabit.org/EvolutionOS/evolution-packages/src/branch/master/README.md#user-content-building-packages) the package and test its functionality.

COPYING

@@ -1,5 +1,5 @@
  Copyright (c) 2008-2020 Juan Romero Pardines and contributors
- Copyright (c) 2017-2023 The Void Linux team and contributors
+ Copyright (c) 2023 The EvolutionOS team and contributors
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

README.md

@@ -1,7 +1,7 @@
 ## The XBPS source packages collection
 
 This repository contains the XBPS source packages collection to build binary packages
-for the Evolution Linux distribution.
+for the EvolutionOS distribution.
 
 The included `xbps-src` script will fetch and compile the sources, and install its
 files into a `fake destdir` to generate XBPS binary packages that can be installed
@@ -59,7 +59,7 @@ methods.
 Clone the `evolution-packages` git repository and install the bootstrap packages:
 
 ```
-$ git clone https://github.com/evolution-linux/evolution-packages.git
+$ git clone https://centrifuge.hectabit.org/evolutionos/evolution-packages.git
 $ cd evolution-packages
 $ ./xbps-src binary-bootstrap
 ```
@@ -395,7 +395,7 @@ In etc/conf you may optionally define a mirror or a list of mirrors to search fo
     $ echo 'XBPS_DISTFILES_MIRROR="ftp://192.168.100.5/gentoo/distfiles"' >> etc/conf
 
 If more than one mirror is to be searched, you can either specify multiple URLs separated
-with blanks, or add to the variable like this. Remeber, offically, Evolution Linux uses 2 REPOS. This means not all packages are included.
+with blanks, or add to the variable like this. Remeber, offically, EvolutionOS uses 2 REPOS. This means not all packages are included.
 
     $ echo 'XBPS_DISTFILES_MIRROR+=" https://sources.voidlinux.org/"' >> etc/conf
 
@@ -441,7 +441,7 @@ try other [chroot methods](#chroot-methods).
 
 Clone the `evolution-packages` git repository:
 
-    $ git clone https://github.com/evolution-linux/evolution-packages.git
+    $ git clone https://centrifuge.hectabit.org/evolutionos/evolution-packages.git
 
 and `xbps-src` should be fully functional; just start the `bootstrap` process, i.e:
 

srcpkgs/base-system/template

@@ -1,22 +1,21 @@
 # Template file for 'base-system'
 pkgname=base-system
 version=0.114
-revision=6
+revision=7
 bootstrap=yes
 build_style=meta
-short_desc="Evolution Linux base system meta package"
+short_desc="EvolutionOS base system meta package"
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 license="Public Domain"
 homepage="https://hectabit.org/evolutionos"
 
 depends="
- base-files ncurses busybox-evolution libgcc
+ base-files busybox-evolution
- bash file man-pages
+ mdocml>=1.13.3 shadow
- mdocml>=1.13.3 shadow btrfs-progs
+ procps-ng tzdata iana-etc dhcpcd
- procps-ng tzdata iana-etc openssh dhcpcd
+ iwd xbps wifi-firmware
- kbd iwd xbps wifi-firmware
+ dinit removed-packages
- kmod eudev dinit removed-packages
+ evolution-patches booster-evolution"
- evolution-patches opendoas booster evolution-artwork"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;

srcpkgs/booster-evolution/template

@@ -1,11 +1,10 @@
-# Template file for 'booster'
+# Template file for 'booster-evolution'
-pkgname=booster
+pkgname=booster-evolution
 version=0.11
-revision=0
+revision=1
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"
-depends="busybox-evolution"
 short_desc="Fast and secure initramfs generator"
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 license="MIT"
@@ -13,6 +12,7 @@ homepage="https://github.com/anatol/booster"
 distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
 checksum=2f111b1729143c38ec287e5567ae9f57e0fb8118cc11afa22657da8ac9b0105a
 conf_files="/etc/booster.yaml"
+replaces="booster"
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/booster/kernel-hook-postrm
@@ -28,7 +28,6 @@ do_build() {
 
 	ronn docs/manpage.md
 
-	echo "busybox: true" > booster.yaml
 }
 
 do_install() {

srcpkgs/dinit/files/dinit.d/agetty.sh

@@ -2,9 +2,6 @@
 
 tty=$1
 
-exec ${GETTY} ${GETTY_ARGS} \
-        "${tty}" "${BAUD_RATE}" "${TERM_NAME}"
-
 if [ -x /sbin/agetty -o -x /bin/agetty ]; then
     # util-linux specific settings
     if [ "${tty}" = "tty1" ]; then
@@ -26,3 +23,6 @@ elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
         # util-linux
         GETTY=agetty
 fi
+
+exec ${GETTY} ${GETTY_ARGS} \
+        "${tty}" "${BAUD_RATE}" "${TERM_NAME}"

srcpkgs/dinit/files/dinit.d/rcboot

@@ -1,5 +1,6 @@
 # Various startup operations
 
+waits-for = rootrw
 type = scripted
 command = /etc/dinit.d/rcboot.sh start
 stop-command = /etc/dinit.d/rcboot.sh stop

srcpkgs/dinit/files/dinit.d/splash

@@ -1,4 +1,4 @@
 type = scripted
-command = /sbin/busybox fbsplash -s /home/liqing/oldsplash.ppm
+command = /sbin/busybox fbsplash -s /usr/share/evolution-artwork/splash.ppm
 
 restart = false

srcpkgs/dinit/files/drunner

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 for i in $(ls /etc/sv/); do
+  rm -f /etc/dinit.d/boot.d/runitb.d
   mkdir -p /etc/dinit.d/runitb.d/"$i"
   cp -r /etc/sv/"$i"/* /etc/dinit.d/runitb.d/"$i"/
   rm -rf /etc/dinit.d/runitb.d/"$i"/supervise

srcpkgs/dinit/template

@@ -1,7 +1,7 @@
 #!/bin/sh
 pkgname=dinit
 version=0.17.1
-revision=5
+revision=7
 short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)"
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 homepage="https://github.com/davmac314/dinit"

srcpkgs/evolution-artwork/template

@@ -1,8 +1,8 @@
 # Template file for 'evolution-artwork'
 pkgname=evolution-artwork
-version=20221013
+version=20231024
-revision=5
+revision=0
-short_desc="Evolution Linux artwork"
+short_desc="EvolutionOS artwork"
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 license="custom:Public Domain" #no vlicense check
 homepage="https://hectabit.org/evolutionos"
@@ -20,4 +20,5 @@ do_install() {
 	done
 	vinstall ${FILESDIR}/icons/evolution-logo.svg 644 usr/share/icons/hicolor/scalable/apps
 	vinstall ${FILESDIR}/icons/evolution-logo-notext.svg 644 usr/share/icons/hicolor/scalable/apps
+	vinstall ${FILESDIR}/oldsplash.ppm 644 usr/share/evolution-artwork
 }