gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2024-01-20 00:30:16 +01:00
commit 64a4f1330f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appendices/dependencies.xml
View File

@ -1239,7 +1239,7 @@
<segmentedlist id="groff-before"> <segmentedlist id="groff-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Man-DB and Perl</seg> <seg>Man-DB</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2455,7 +2455,7 @@
<segmentedlist id="perl-depends"> <segmentedlist id="perl-depends">
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff, <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
Libxcrypt, Make, Sed, and Zlib</seg> Libxcrypt, Make, Sed, and Zlib</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

2
chapter10/kernel/kernel-config.py
View File

@ -293,7 +293,7 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
from jinja2 import Template from jinja2 import Template
t = Template('''<?xml version="1.0" encoding="ISO-8859-1"?> t = Template('''<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- Automatically generated by kernel-config.py <!-- Automatically generated by kernel-config.py

4
git-version.sh
View File

@ -57,8 +57,8 @@ version="$rev"
versiond="$rev-systemd" versiond="$rev-systemd"
if [ "$(git diff HEAD | wc -l)" != "0" ]; then if [ "$(git diff HEAD | wc -l)" != "0" ]; then
version="$version+" version="$version-wip"
versiond="$versiond+" versiond="$versiond-wip"
fi fi
echo "<![ %sysv; [" > version.ent echo "<![ %sysv; [" > version.ent

2
packages.ent
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Notes: <!-- Notes:
For empty *-home entities use " " not "" For empty *-home entities use " " not ""

2
patches.ent
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Start of Common Patches --> <!-- Start of Common Patches -->