Changeset 73d91ac for appendices/dependencies.xml

Timestamp:

12/05/2023 05:12:55 AM (7 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64

Children:

00de269

Parents:

6b6a1b9 (diff), dc8572f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/arm64

File:

• appendices/dependencies.xml (modified) (18 diffs)

appendices/dependencies.xml

@@ -7 +7 @@
   <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
                          <phrase revision='sysv'>Udev</phrase>">
+  <!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
 ]>
 
@@ -30 +31 @@
   the test suites. The fourth list of dependencies are packages that require
   this package to be built and installed in its final location before they are
-  built and installed. In most cases, this is because these packages will hard
-  code paths to binaries within their scripts. If not built in a certain order,
-  this could result in paths of /tools/bin/[binary] being placed inside scripts
-  installed to the final system. This is obviously not desirable.</para>
+  built and installed.</para>
 
   <para>The last list of dependencies are optional packages that are not
@@ -295 +293 @@
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Glibc and Zlib</seg>
+          <seg>Glibc, Zlib, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1487 +1485 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
             <ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
@@ -1497 +1495 @@
 
 <!-- Begin Jinja2 dependency info -->
-  <bridgehead revision='systemd' renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
-
-      <segmentedlist id="jinja2-depends" revision='systemd'>
-        <segtitle>&dependencies;</segtitle>
+  <bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
+
+      <segmentedlist id="jinja2-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>MarkupSafe, Python, Setuptools, and Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="jinja2-rundeps">
+        <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>MarkupSafe and Python</seg>
@@ -1506 +1511 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-rundeps" revision='systemd'>
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>MarkupSafe and Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="jinja2-testdeps" revision='systemd'>
+      <segmentedlist id="jinja2-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
@@ -1520 +1518 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-before" revision='systemd'>
+      <segmentedlist id="jinja2-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
@@ -1527 +1525 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-optdeps" revision='systemd'>
+      <segmentedlist id="jinja2-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -2137 +2135 @@
 
 <!-- Begin MarkupSafe dependency info -->
-  <bridgehead renderas="sect2" id="markupsafe-dep" revision='systemd'>MarkupSafe</bridgehead>
-
-      <segmentedlist id="markupsafe-depends" revision='systemd'>
-        <segtitle>&dependencies;</segtitle>
+  <bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead>
+
+      <segmentedlist id="markupsafe-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python, Setuptools, and Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="markupsafe-rundeps">
+        <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>Python</seg>
@@ -2146 +2151 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-rundeps" revision='systemd'>
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>Python</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="markupsafe-testdeps" revision='systemd'>
+      <segmentedlist id="markupsafe-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
@@ -2160 +2158 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-before" revision='systemd'>
+      <segmentedlist id="markupsafe-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
@@ -2167 +2165 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-optdeps" revision='systemd'>
+      <segmentedlist id="markupsafe-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -2180 +2178 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Ninja and Python</seg>
+          <seg>Ninja, Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
@@ -2487 +2485 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
+            &bdb;
           </seg>
         </seglistitem>
@@ -2656 +2654 @@
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
             <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
@@ -2736 +2734 @@
 
       <segmentedlist id="sed-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Setuptools dependency info -->
+  <bridgehead renderas="sect2" id="setuptools-dep">Setuptools</bridgehead>
+
+      <segmentedlist id="setuptools-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python and Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Jinja2, MarkupSafe, and Meson</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -3217 +3253 @@
 
 <!-- Begin Wheel dependency info -->
-  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
+  <bridgehead renderas="sect2" id="wheel-dep">Wheel</bridgehead>
 
       <segmentedlist id="wheel-depends">
@@ -3244 +3280 @@
         <seglistitem>
           <seg>
-            <phrase revision='sysv'>None</phrase>
-            <phrase revision='systemd'>Jinja2</phrase>
+            Jinja2, MarkupSafe, Meson, and Setuptools
           </seg>
         </seglistitem>