diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-22 11:22:52 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-22 11:22:52 +0200 |
commit | 1583dec77aab2cb521b92ef3a377f84c081dfc50 (patch) | |
tree | 2277a991fd3cd6e9cb95cc9f544accca37693090 | |
parent | d909afeed29663ce6f4c6f56bee82644eeccaab9 (diff) | |
download | i486tcc-linux-1583dec77aab2cb521b92ef3a377f84c081dfc50.tar.gz i486tcc-linux-1583dec77aab2cb521b92ef3a377f84c081dfc50.tar.bz2 |
temporarily added X fonts and some xinit scripts
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | local/root/.xinitrc | 1 | ||||
-rw-r--r-- | local/root/.xserverrc | 6 | ||||
-rw-r--r-- | local/share/X11/fonts/6x13-ISO8859-1.pcf.gz | bin | 0 -> 4675 bytes | |||
-rw-r--r-- | local/share/X11/fonts/fonts.alias | 2 | ||||
-rw-r--r-- | local/share/X11/fonts/fonts.dir | 3 | ||||
-rw-r--r-- | local/share/X11/fonts/olcursor.pcf.gz | bin | 0 -> 1371 bytes | |||
-rw-r--r-- | patches/uflbbl-boot-options.patch | 2 | ||||
-rwxr-xr-x | scripts/create_root.sh | 2 |
9 files changed, 16 insertions, 1 deletions
@@ -434,6 +434,7 @@ EOF Only BCF, PCF are supported - font handling when installing, currently in local/share/fonts/X11, we should generate them from BCF files +- rxvt: can't load font "7x14" missing things -------------- diff --git a/local/root/.xinitrc b/local/root/.xinitrc new file mode 100644 index 0000000..319672f --- /dev/null +++ b/local/root/.xinitrc @@ -0,0 +1 @@ +rxvt diff --git a/local/root/.xserverrc b/local/root/.xserverrc new file mode 100644 index 0000000..7d825cb --- /dev/null +++ b/local/root/.xserverrc @@ -0,0 +1,6 @@ +#!/bin/oksh + +insmod /lib/modules/drivers/input/mouse/psmouse.ko +insmod /lib/modules/drivers/input/mousedev.ko + +exec Xfbdev :0 -fp /share/X11/fonts diff --git a/local/share/X11/fonts/6x13-ISO8859-1.pcf.gz b/local/share/X11/fonts/6x13-ISO8859-1.pcf.gz Binary files differnew file mode 100644 index 0000000..8bc303e --- /dev/null +++ b/local/share/X11/fonts/6x13-ISO8859-1.pcf.gz diff --git a/local/share/X11/fonts/fonts.alias b/local/share/X11/fonts/fonts.alias new file mode 100644 index 0000000..890f113 --- /dev/null +++ b/local/share/X11/fonts/fonts.alias @@ -0,0 +1,2 @@ +fixed "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1" +cursor "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1" diff --git a/local/share/X11/fonts/fonts.dir b/local/share/X11/fonts/fonts.dir new file mode 100644 index 0000000..45926f3 --- /dev/null +++ b/local/share/X11/fonts/fonts.dir @@ -0,0 +1,3 @@ +2 +6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1 diff --git a/local/share/X11/fonts/olcursor.pcf.gz b/local/share/X11/fonts/olcursor.pcf.gz Binary files differnew file mode 100644 index 0000000..745e19e --- /dev/null +++ b/local/share/X11/fonts/olcursor.pcf.gz diff --git a/patches/uflbbl-boot-options.patch b/patches/uflbbl-boot-options.patch index 9d417ed..91bb58b 100644 --- a/patches/uflbbl-boot-options.patch +++ b/patches/uflbbl-boot-options.patch @@ -1,6 +1,6 @@ diff -rauN uflbbl/src/boot.asm uflbbl-boot-options/src/boot.asm --- uflbbl/src/boot.asm 2023-07-13 08:47:23.000000000 +0200 -+++ uflbbl-boot-options/src/boot.asm 2023-07-15 15:52:51.045860124 +0200 ++++ uflbbl-boot-options/src/boot.asm 2023-07-15 16:30:46.609197671 +0200 @@ -468,10 +468,10 @@ mov [READ_STATE], byte STATE_READ_INITRD ; qemu initrd start location 7fab000, 133869568 (this is 128MB) too high for us, diff --git a/scripts/create_root.sh b/scripts/create_root.sh index 727093f..fc30df0 100755 --- a/scripts/create_root.sh +++ b/scripts/create_root.sh @@ -73,6 +73,8 @@ test -d "${ROOT}"/mnt || mkdir "${ROOT}"/mnt # copy locally adapted scripts test -d "${ROOT}/root" || mkdir "${ROOT}/root" cp "${LOCAL}"/root/.profile "${ROOT}/root" +cp "${LOCAL}"/root/.xserverrc "${ROOT}/root" +cp "${LOCAL}"/root/.xinitrc "${ROOT}/root" test -d "${ROOT}/bin" || mkdir "${ROOT}/bin" cp -dR "${LOCAL}"/bin/* "${ROOT}/bin" test -d "${ROOT}/etc" || mkdir "${ROOT}/etc" |