Skip to content

Commit 8922886

Browse files
committed
Merge branch 'void-linux:master' into fde-musl-link
2 parents 617d951 + 689fb87 commit 8922886

File tree

8 files changed

+38
-12
lines changed

8 files changed

+38
-12
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Void packages:
1313

1414
- `mdBook`
1515
- `findutils`
16-
- `pandoc`
16+
- `lowdown` (version 0.8.1 or greater)
1717
- `texlive`
1818
- `perl`
1919
- `perl-JSON`

res/build.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,33 @@
66
set -e
77
PATH="$PWD/res:$PATH"
88

9+
if [ -z "$SOURCE_DATE_EPOCH" ]; then
10+
export SOURCE_DATE_EPOCH=$(git log --pretty='%ct' -1)
11+
if [ -z "$SOURCE_DATE_EPOCH" -a "$BUILD_MANPAGES" = 1 ]; then
12+
echo "git or SOURCE_DATE_EPOCH are needed to build man pages!"
13+
exit 1
14+
fi
15+
fi
16+
917
# Build HTML mdbook
1018
echo "Building mdBook"
1119
mdbook build
1220

13-
1421
if [ "$BUILD_MANPAGES" = "1" ]; then
1522
# Build mandoc version
1623
echo "Building man pages"
17-
mkdir -p mandoc
1824
cd src
1925

2026
find . -type d -exec mkdir -p "../mandoc/{}" \;
27+
2128
find . -type f -name "*.md" -exec sh -c \
22-
'file="{}"; filew="${file%.md}"; pandoc -V "title=${filew##*/}" -V section=7 -V "header=Void Docs" -s -o "../mandoc/${filew}.7" "$file"' \;
29+
'file="{}"; filew="${file%.md}"; \
30+
man_date="$(git log --pretty=%cs -1 "$file" 2>/dev/null || date -d "@$SOURCE_DATE_EPOCH" +%F)";
31+
lowdown -Tman \
32+
${man_date:+-m "date: $man_date"} \
33+
-m "title: ${filew##*/}" \
34+
-m "section: 7" -m "source: Void Docs" -m "volume: Void Docs" \
35+
-s -o "../mandoc/${filew}.7" "$file"' \;
2336

2437
cd -
2538
fi

src/config/media/pulseaudio.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ terminal as follows:
1919
$ pulseaudio --daemonize=no --exit-idle-time=-1
2020
```
2121

22+
On the other hand, PulseAudio can also end up being auto activated when it isn't
23+
desired. To inhibit this behavior, the `autospawn` directive from
24+
[pulse-client.conf(5)](https://man.voidlinux.org/pulse-client.conf.5) can be set
25+
to `no`.
26+
2227
There are several methods of allowing PulseAudio to access to audio devices. The
2328
simplest one is to add your user to the `audio` group. Alternatively, you can
2429
use a session manager, like `elogind`.

src/config/services/logging.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ implementations available in the Void repositories.
99

1010
[socklog(8)](https://man.voidlinux.org/socklog.8) is a syslog implementation
1111
from the author of [runit(8)](https://man.voidlinux.org/runit.8). Use socklog if
12-
you're not sure which syslog implementation to use. To use it, install the
13-
`socklog-void` package, and enable the `socklog-unix` and `nanoklogd` services.
12+
you're not sure which syslog implementation to use. To enable it, install the
13+
`socklog-void` package and enable the `socklog-unix` and `nanoklogd` services.
14+
Ensure no other syslog daemon is running.
1415

1516
The logs are saved in sub-directories of `/var/log/socklog/`, and `svlogtail`
16-
can be used to help access them conveniently.
17+
can be used to access them conveniently.
1718

1819
The ability to read logs is limited to `root` and users who are part of the
1920
`socklog` group.

src/installation/guides/chroot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,14 @@ For example, the partition scheme used throughout previous examples yields the
225225
following `fstab`:
226226

227227
```
228-
/dev/sda1 /boot/EFI vfat rw,relatime,[...] 0 0
228+
/dev/sda1 /boot/efi vfat rw,relatime,[...] 0 0
229229
/dev/sda2 / ext4 rw,relatime 0 0
230230
```
231231

232232
The information from `blkid` results in the following `/etc/fstab`:
233233

234234
```
235-
UUID=6914[...] /boot/EFI vfat rw,relatime,[...] 0 2
235+
UUID=6914[...] /boot/efi vfat rw,relatime,[...] 0 2
236236
UUID=dc1b[...] / ext4 rw,relatime 0 1
237237
```
238238

src/installation/musl.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ software to need modification to compile and/or function properly. Void
1919
developers work to patch such software and hopefully get portability/correctness
2020
changes accepted into the upstream projects.
2121

22-
Proprietary software rarely supports non-glibc libc implementations, although
23-
sometimes these applications are available as [flatpaks](https://flatpak.org/),
24-
which provide their own libc in the image.
22+
Proprietary software usually supports only glibc systems, though sometimes such
23+
applications are available as
24+
[flatpaks](../config/external-applications.md#flatpak) and can be run on a musl
25+
system. In particular, the [proprietary NVIDIA
26+
drivers](../config/graphical-session/graphics-drivers/nvidia.md#nvidia-proprietary-driver)
27+
do not support musl, which should be taken into account when evaluating hardware
28+
compatibility.
2529

2630
### glibc chroot
2731

src/xbps/repositories/mirrors/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ sub-repository.
3838
| <https://mirror.aarnet.edu.au/pub/voidlinux/> | AU: Canberra |
3939
| <https://ftp.swin.edu.au/voidlinux/> | AU: Melbourne |
4040
| <https://void.cijber.net/> | EU: Amsterdam, NL |
41+
| <https://mirror.easylee.nl/voidlinux/> | EU: Amsterdam, NL |
4142
| <http://ftp.dk.xemacs.org/voidlinux/> | EU: Denmark |
4243
| <https://mirrors.dotsrc.org/voidlinux/> | EU: Denmark |
4344
| <https://quantum-mirror.hu/mirrors/pub/voidlinux/> | EU: Hungary |
45+
| <https://voidlinux.qontinuum.space:4443/> | EU: Monaco |
4446
| <http://ftp.debian.ru/mirrors/voidlinux/> | EU: Russia |
4547
| <https://mirror.yandex.ru/mirrors/voidlinux/> | EU: Russia |
4648
| <https://cdimage.debian.org/mirror/voidlinux/> | EU: Sweden |

src/xbps/repositories/mirrors/tor.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The following Void Linux Mirrors are available on the Tor Network:
99
| Repository | Location |
1010
|----------------------------------------------------------------------------------------|------------|
1111
| <http://lysator7eknrfl47rlyxvgeamrv7ucefgrrlhk7rouv3sna25asetwid.onion/pub/voidlinux/> | EU: Sweden |
12+
| <http://aafeeff2jty6me2boflxjbz4nqnm6ww5tcylc5u2fdprzbqg6gz5p2id.onion> | |
1213

1314
## Using XBPS with Tor
1415

0 commit comments

Comments
 (0)