Skip to content

Update tmpfs branch #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
probonopd merged 7 commits into from
Nov 9, 2021
Merged

Update tmpfs branch #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
086c28d
Add initgfx_message
probonopd Nov 7, 2021
74b5ccf
Add initgfx_message
probonopd Nov 7, 2021
c9bb621
Add Nvidia driver version 390 for Nvidia Quadro 2000
probonopd Nov 7, 2021
0235fee
Run localize earlier [ci skip]
probonopd Nov 7, 2021
cbee860
Make Chromium use System Title Bar and Borders
probonopd Nov 8, 2021
98d7990
Make message more readable [ci skip]
probonopd Nov 9, 2021
2587e0d
sysutils/py-psutil [ci skip]
probonopd Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ task:
matrix:
# image: freebsd-12-1-release-amd64 # EOL
- image: freebsd-12-2-release-amd64
- image: freebsd-13-0-release-amd64 # ISO way too large, HIDPI broken?
# image: freebsd-13-0-release-amd64 # ISO way too large, HIDPI broken, BIOS boot broken, boot installed system broken?

env:
CIRRUS_CLONE_DEPTH: 1
Expand Down
4 changes: 3 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,10 @@ initgfx()
else
PKGS="latest"
fi

# 390 needed for Nvidia Quadro 2000, https://github.com/helloSystem/hello/discussions/241#discussioncomment-1599131
for ver in '390'; do # Only use NVIDIA version 440 and 390 for now to reduce ISO image size
# for ver in '' 390 340 304; do
for ver in ''; do # Only use NVIDIA version 440 for now to reduce ISO image size
pkgfile=$(/usr/local/sbin/pkg-static -c ${uzip} rquery %n-%v.txz nvidia-driver${ver:+-$ver})
fetch -o "${cache}/" "https://pkg.freebsd.org/FreeBSD:${MAJOR}:amd64/${PKGS}/All/${pkgfile}"
mkdir -p "${uzip}/usr/local/nvidia/${ver:-440}/"
Expand Down
2 changes: 1 addition & 1 deletion overlays/uzip/hello/files/usr/local/bin/desktop2app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ if __name__ == "__main__":
try:
import psutil
except:
print("Cannot watch the system for newly installed applications since py37-psutil is missing.")
print("Cannot watch the system for newly installed applications since sysutils/py-psutil is missing.")
exit(1)

signal.signal(signal.SIGINT, QtCore.QCoreApplication.quit) # FIXME: Make Ctrl-C work; Does not seem to work
Expand Down
7 changes: 6 additions & 1 deletion overlays/uzip/hello/files/usr/share/skel/dot.config/chromium/Default/Preferences
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
{"custom_chrome_frame":true}
{
"browser":{
"custom_chrome_frame":false,
"has_seen_welcome_page":true
}
}
72 changes: 72 additions & 0 deletions overlays/uzip/initgfx/files/etc/rc.d/initgfx_message
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#!/bin/sh
#
# Copyright (c) 2021, Simon Peter <probono@puredarwin.org>
#
# PROVIDE: initgfx_message
# REQUIRE: LOGIN
# BEFORE: initgfx

. /etc/rc.subr

name=initgfx_message
start_cmd="do_initgfx_message"

rcvar=initgfx_enable

load_rc_config ${name}

: ${initgfx_enable:="YES"}

initgfx_warn()
{
echo "${name}:" $* >&2
}

initgfx_debug()
{
echo "${name}:" $* >&2
}

do_initgfx_message()
{
# Wait for one minute after running initfgx
sleep 60

# Exit if Xorg is running
pgrep -f Xorg && exit 0

# If we don't have Xorg running by then, output a message and offer to log into the machine
clear
cat > /dev/console <<EOF
Failed to start the desktop.
Possibly the graphics hardware
in this device is not supported yet.
Please let us know.

Der Desktop konnte nicht gestartet werden.
Möglicherweise wird die Grafikhardware
in diesem Gerät noch nicht unterstützt.
Bitte geben Sie uns Bescheid.

Impossible de démarrer le bureau.
Il est possible que le matériel graphique
de cet appareil ne soit pas encore pris en charge.
Veuillez nous le faire savoir.
EOF

# echo ""
# echo "FreeBSD kernel version: $(freebsd-version -k)"

echo ""
sysctl dev.vgapci | grep pnpinfo
echo ""
echo "https://git.io/JXs1V"

# TODO: Output QR code for https://bsd-hardware.info/?id=pci:1002-67df-1682-c570
# qrencode -m 2 -t utf8 <<< "https://superuser.com/questions/1492624/how-do-you-output-a-qr-code-to-the-linux-cli-terminal-for-scanning/1492625"

# exec login

}

run_rc_command "$1"
4 changes: 2 additions & 2 deletions overlays/uzip/localize/files/usr/local/etc/rc.d/localize
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

# PROVIDE: localize
# REQUIRE: DAEMON NETWORKING
# BEFORE: LOGIN
# REQUIRE: ldconfig
# BEFORE: hostid
# KEYWORD: nojail shutdown

PATH=$PATH:/usr/local/sbin
Expand Down