Changeset 64a4f13

Timestamp:

01/19/2024 11:30:16 PM (5 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

bb1dfaf

Parents:

5d2d864 (diff), 619e4d9 (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:

Automatic merge of trunk into multilib

Files:

• appendices/dependencies.xml (modified) (2 diffs)
• chapter10/kernel/kernel-config.py (modified) (1 diff)
• git-version.sh (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -1240 +1240 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Man-DB and Perl</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -2456 +2456 @@
         <segtitle>&dependencies;</segtitle>
         <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>
         </seglistitem>

chapter10/kernel/kernel-config.py

@@ -294 +294 @@
 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"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">

git-version.sh

@@ -58 +58 @@
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-    version="$version+"
-    versiond="$versiond+"
+    version="$version-wip"
+    versiond="$versiond-wip"
 fi
 

packages.ent

@@ -1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Notes:

patches.ent

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