gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 11:49: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 2023-01-07 00:30:13 +01:00
commit e7de61ebc6
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
appendices/dependencies.xml
View File

@ -1474,37 +1474,37 @@
</segmentedlist> </segmentedlist>
<!-- Begin Jinja2 dependency info --> <!-- Begin Jinja2 dependency info -->
<bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead> <bridgehead revision='systemd' renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
<segmentedlist id="jinja2-depends"> <segmentedlist id="jinja2-depends" revision='systemd'>
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>MarkupSafe and Python</seg> <seg>MarkupSafe and Python</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="jinja2-rundeps"> <segmentedlist id="jinja2-rundeps" revision='systemd'>
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>MarkupSafe and Python</seg> <seg>MarkupSafe and Python</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="jinja2-testdeps"> <segmentedlist id="jinja2-testdeps" revision='systemd'>
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>No test suite available</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="jinja2-before"> <segmentedlist id="jinja2-before" revision='systemd'>
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Systemd</seg> <seg>Systemd</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="jinja2-optdeps"> <segmentedlist id="jinja2-optdeps" revision='systemd'>
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
@ -2071,37 +2071,37 @@
</segmentedlist> </segmentedlist>
<!-- Begin MarkupSafe dependency info --> <!-- Begin MarkupSafe dependency info -->
<bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead> <bridgehead renderas="sect2" id="markupsafe-dep" revision='systemd'>MarkupSafe</bridgehead>
<segmentedlist id="markupsafe-depends"> <segmentedlist id="markupsafe-depends" revision='systemd'>
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Python</seg> <seg>Python</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="markupsafe-rundeps"> <segmentedlist id="markupsafe-rundeps" revision='systemd'>
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>Python</seg> <seg>Python</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="markupsafe-testdeps"> <segmentedlist id="markupsafe-testdeps" revision='systemd'>
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>No test suite available</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="markupsafe-before"> <segmentedlist id="markupsafe-before" revision='systemd'>
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Jinja2</seg> <seg>Jinja2</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="markupsafe-optdeps"> <segmentedlist id="markupsafe-optdeps" revision='systemd'>
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
@ -2135,7 +2135,10 @@
<segmentedlist id="meson-before"> <segmentedlist id="meson-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Systemd</seg> <seg>
<phrase revision='sysv'>None</phrase>
<phrase revision='systemd'>Systemd</phrase>
</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2749,9 +2752,9 @@
</segmentedlist> </segmentedlist>
<!-- Begin systemd dependency info --> <!-- Begin systemd dependency info -->
<bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead> <bridgehead renderas="sect2" id="systemd-dep" revision='systemd'>Systemd</bridgehead>
<segmentedlist id="systemd-depends"> <segmentedlist id="systemd-depends" revision='systemd'>
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
@ -2760,28 +2763,28 @@
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="systemd-rundeps"> <segmentedlist id="systemd-rundeps" revision='systemd'>
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>Acl, Attr, Glibc, Libcap, and Util-linux</seg> <seg>Acl, Attr, Glibc, Libcap, and Util-linux</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="systemd-testdeps"> <segmentedlist id="systemd-testdeps" revision='systemd'>
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="systemd-before"> <segmentedlist id="systemd-before" revision='systemd'>
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="systemd-optdeps"> <segmentedlist id="systemd-optdeps" revision='systemd'>
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg> <seg>
@ -2836,37 +2839,37 @@
</segmentedlist> </segmentedlist>
<!-- Begin Sysvinit dependency info --> <!-- Begin Sysvinit dependency info -->
<bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead> <bridgehead renderas="sect2" id="sysvinit-dep" revision='sysv'>Sysvinit</bridgehead>
<segmentedlist id="sysvinit-depends"> <segmentedlist id="sysvinit-depends" revision='sysv'>
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg> <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysvinit-rundeps"> <segmentedlist id="sysvinit-rundeps" revision='sysv'>
<segtitle>&runtime;</segtitle> <segtitle>&runtime;</segtitle>
<seglistitem> <seglistitem>
<seg>Glibc</seg> <seg>Glibc</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysvinit-testdeps"> <segmentedlist id="sysvinit-testdeps" revision='sysv'>
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>No test suite available</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysvinit-before"> <segmentedlist id="sysvinit-before" revision='sysv'>
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
<segmentedlist id="sysvinit-optdeps"> <segmentedlist id="sysvinit-optdeps" revision='sysv'>
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>None</seg>
@ -3109,7 +3112,10 @@
<segmentedlist id="wheel-before"> <segmentedlist id="wheel-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Jinja2</seg> <seg>
<phrase revision='sysv'>None</phrase>
<phrase revision='systemd'>Jinja2</phrase>
</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -3262,7 +3268,7 @@
<segmentedlist id="zstd-before"> <segmentedlist id="zstd-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>GCC and Systemd</seg> <seg>GCC <phrase revision='systemd'>and Systemd</phrase></seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

2
git-version.sh
View File

@ -29,7 +29,7 @@ if ! git status > /dev/null; then
fi fi
export LC_ALL=en_US.utf8 export LC_ALL=en_US.utf8
export TZ=US/Pacific export TZ=America/Chicago
commit_date=$(git show -s --format=format:"%cd" --date=local) commit_date=$(git show -s --format=format:"%cd" --date=local)