Changeset 504e378


Ignore:
Timestamp:
08/25/2024 07:40:55 AM (3 weeks ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/loongarch, xry111/loongarch-12.2
Children:
2b40822
Parents:
7e06ddd (diff), 948cd14 (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/loongarch

Files:
22 edited

Legend:

Unmodified
Added
Removed

  • aux-file-data.sh

    r7e06ddd r504e378  
    1616bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
    1717
    18 # Figure intalled size of bootscripts
     18# Figure installed size of bootscripts
    1919TOPDIR=$(pwd)
    2020TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX)

  • bootscripts/ChangeLog

    r7e06ddd r504e378  
     12024-08-25 Xi Ruoyao <xry111@xry111.site>
     2   * Remove an empty line and an outdated comment (not valid anymore after
     3     /usr merge) from init-functions.
     4
     52024-08-24 Andrew Kreimer <algonell@gmail.com>
     6   * Fix typos.
     7
    182024-08-23 Xi Ruoyao <xry111@xry111.site>
    29   * In console, detect FB console by checking /sys/class/graphics/fbcon

  • bootscripts/lfs/lib/services/init-functions

    r7e06ddd r504e378  
    458458    # If a PID file is set and exists, use it.
    459459    if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
    460 
    461460        # Use the value in the first line of the pidfile
    462461        pidlist=`/bin/head -n1 "${pidfile}"`
    463         # This can optionally be written as 'sed 1q' to repalce 'head -n1'
    464         # should LFS move /bin/head to /usr/bin/head
    465462    else
    466463        # Use pidof

  • bootscripts/lfs/sbin/ifup.8

    r7e06ddd r504e378  
    9595
    9696       ONBOOT  - If set to 'yes', the specified interface is
    97                  configured by the netowrk boot script.
     97                 configured by the network boot script.
    9898
    9999       GATEWAY - The default IP address to use for routing if
    … …  
    113113                 for use with a virtual host such as kvm.
    114114
    115        Other paramters that are service specific include:
     115       Other parameters that are service specific include:
    116116
    117117       ipv4-static
    … …  
    129129                     device.  Example: eth0:2 (optional)
    130130
    131          BROADCAST - The brodcast address for this interface,
     131         BROADCAST - The broadcast address for this interface,
    132132                     e.g 192.168.1.255.  If not specified,
    133133                     the broadcast address will be calculated
    … …  
    155155                      at startup.
    156156
    157          DHCP_STOP  - Optional paremeters to pass to the dhcp client
     157         DHCP_STOP  - Optional parameters to pass to the dhcp client
    158158                      at shutdown.
    159159

  • chapter01/changelog.xml

    r7e06ddd r504e378  
    4545      <itemizedlist>
    4646        <listitem>
     47          <para>[xry111] - Update to lfs-bootscripts-20240825.  Only trivial
     48          non-functional changes.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
     54      <para>2024-08-23</para>
     55      <itemizedlist>
     56        <listitem>
    4757          <para>[xry111] - Update to lfs-bootscripts-20240823, to fix an
    4858          issue causing VT 2-6 not affected by the FONT= setting in

  • chapter08/sysklogd.xml

    r7e06ddd r504e378  
    8787*.emerg *
    8888
     89# Do not open any internet ports.
     90secure_mode 2
     91
    8992# End /etc/syslog.conf</literal>
    9093EOF</userinput></screen>

  • git-version.sh

    r7e06ddd r504e378  
    2020
    2121if ! git status > /dev/null; then
    22     # Either it's not a git repository, or git is unavaliable.
     22    # Either it's not a git repository or git is unavailable.
    2323    # Just workaround.
    2424    echo "<![ %sysv; ["                                    >  version.ent

  • lfs-latest-git.php

    r7e06ddd r504e378  
    323323      if ( preg_match( "/patch$/", $file ) ) { continue; } // Skip patches
    324324
    325       $file = preg_replace( "/bz2/", '', $file ); // The 2 confusses the regex
     325      $file = preg_replace( "/bz2/", '', $file ); // The 2 confuses the regex
    326326
    327327      $file        = rtrim( $file );

  • packages.ent

    r7e06ddd r504e378  
    33<!-- Notes:
    44     For empty *-home entities use " " not ""
    5      Packages sizes allways in KB
     5     Packages sizes always in KB
    66     Allowed deviation in SBUs : 10%
    77     Allowed deviation in disk usage : 2%
    … …  
    382382<!ENTITY less-fin-sbu "less than 0.1 SBU">
    383383
    384 <!ENTITY lfs-bootscripts-version "20240823">      <!-- Scripts depend on this format -->
     384<!ENTITY lfs-bootscripts-version "20240825">      <!-- Scripts depend on this format -->
    385385<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
    386386<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">

  • stylesheets/lfs-xsl/chunkfast.xsl

    r7e06ddd r504e378  
    99
    1010   <!-- Top-level chunked code for fast processing.
    11         Import standart customized chunk code.
     11        Import standard customized chunk code.
    1212        Replaces {docbook-xsl}/xhtml/chunkfast.xsl
    1313

  • stylesheets/lfs-xsl/common.xsl

    r7e06ddd r504e378  
    3737
    3838    <!-- indexterm:
    39            Dropping unneeded anchors and fo:wraper elemments. -->
     39           Dropping unneeded anchors and fo:wrapper elemments. -->
    4040    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
    4141  <xsl:template match="indexterm"/>
    … …  
    112112        <xsl:when test="$section.autolabel != 0">
    113113          <xsl:choose>
    114             <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
     114            <!-- If the first sect2 isn't numbered, renumber the remaining sections -->
    115115            <xsl:when test="string-length(../sect2[1]/title) = 0">
    116116              <xsl:variable name="totalsect2">

  • stylesheets/lfs-xsl/pdf.xsl

    r7e06ddd r504e378  
    2828  <xsl:include href="pdf/lfs-xref.xsl"/>
    2929
    30   <!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
     30  <!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO processor. -->
    3131  <xsl:param name="fop1.extensions" select="1"/>
    3232
    … …  
    9494       FOP-0.93 supports @keep-*.*, @orphans, and @widows attributes,
    9595       that solves several page break issues.
    96        It also supports the soft page break procesing instruction included
     96       It also supports the soft page break processing instruction included
    9797       in the DocBook stylesheets.
    9898       But sometimes we may need hard page breaks for final book versions.

  • stylesheets/lfs-xsl/pdf/lfs-lists.xsl

    r7e06ddd r504e378  
    4040
    4141    <!-- varlistentry mode block:
    42            Addibg a bullet, left alignament, and @kepp-*.* attributes
    43            for packages and paches list. -->
     42           Addibg a bullet, left alignment, and @kepp-*.* attributes
     43           for packages and patches list. -->
    4444    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
    4545  <xsl:template match="varlistentry" mode="vl.as.blocks">
    … …  
    136136
    137137    <!-- simplelist:
    138            Self-made template. Wrap it into a fo:block and process member childs.
     138           Self-made template. Wrap it into a fo:block and process member child.
    139139           If @type is specified, the original templates will be used.
    140140           NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints

  • stylesheets/lfs-xsl/pdf/lfs-mixed.xsl

    r7e06ddd r504e378  
    66
    77  <!-- This stylesheet contains misc params, attribute sets and templates
    8        for output formating.
     8       for output formatting.
    99       This file is for that templates that don't fit in other files. -->
    1010
    … …  
    129129
    130130    <!-- literal:
    131            Be sure that literal will use allways normal font weight. -->
     131           Be sure that literal will use always normal font weight. -->
    132132    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
    133133  <xsl:template match="literal">
    … …  
    140140           Added hyphenate-url support to classname, exceptionname, interfacename,
    141141           methodname, computeroutput, constant, envar, filename, function, code,
    142            literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
     142           literal, option, prompt, systemitem, varname, sgmltag, tag, and uri -->
    143143    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
    144144  <xsl:template name="inline.monoseq">

  • stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl

    r7e06ddd r504e378  
    177177
    178178    <!-- chapter title:
    179            Small font size and left alignament. -->
     179           Small font size and left alignment. -->
    180180    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
    181181  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">

  • stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl

    r7e06ddd r504e378  
    55                version="1.0">
    66
    7   <!-- This stylesheet contains misc templates for output formating.
     7  <!-- This stylesheet contains misc templates for output formatting.
    88       This file is for that templates that don't fit in other files
    9        and that not afect the chunk algorithm. -->
     9       and that do not affect the chunk algorithm. -->
    1010
    1111  <!-- Individual elements templates -->
    … …  
    188188
    189189    <!-- para/simplelist:
    190            Self-made template. Add a line break and process the childs.
     190           Self-made template. Add a line break and process the child.
    191191           If @type is specified, the original templates should be used,
    192192           but not tested. -->
    … …  
    209209
    210210
    211   <!-- Named formating templates -->
     211  <!-- Named formatting templates -->
    212212
    213213    <!-- Body attributes:

  • stylesheets/lfs-xsl/xhtml/lfs-sections.xsl

    r7e06ddd r504e378  
    146146
    147147    <!-- sect1:
    148            When there is a role attibute, use it as the class value.
     148           When there is a role attribute, use it as the class value.
    149149           Process the SVN keywords found in sect1info as a footnote.
    150150           Output title before the containing <div> so that the title
    … …  
    172172
    173173    <!-- sect2:
    174            When there is a role attibute, use it as the class value.
     174           When there is a role attribute, use it as the class value.
    175175           Removed unused code. -->
    176176    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->

  • stylesheets/lfs-xsl/xhtml/lfs-toc.xsl

    r7e06ddd r504e378  
    6666
    6767    <!-- toc.line:
    68            Adding the h* tags and dropping unneded links.
     68           Adding the h* tags and dropping unneeded links.
    6969           This template is a full re-made version of the original one. -->
    7070    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->

  • stylesheets/patcheslist.xsl

    r7e06ddd r504e378  
    5252
    5353  <xsl:template match="//ulink">
    54       <!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
     54      <!-- Match only local patch links and skip duplicated URLs split for PDF output-->
    5555    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
    5656            and not(ancestor-or-self::*/@condition = 'pdf')">

  • stylesheets/wget-list.xsl

    r7e06ddd r504e378  
    1616      <!-- If some package don't have the predefined strings in their
    1717      name, the next test must be fixed to match it also. Skip possible
    18       duplicated URLs due that may be splitted for PDF output -->
     18      duplicated URLs due that may be split for PDF output -->
    1919    <xsl:if test="(contains(@url, '.tar.') or
    2020                   contains(@url, '.tgz')  or

  • udev-lfs/README

    r7e06ddd r504e378  
    11The udev-lfs set of files is a customization of systemd.
    22In 2012, udev was merged with systemd and a build methodology
    3 incompatible with LFS.  These files add cusom udev rules
     3incompatible with LFS.  These files add custom udev rules
    44for LFS.
    55

  • udev-lfs/init-net-rules.sh

    r7e06ddd r504e378  
    33# This script generates rules for persistent network device naming
    44# Data from udev-182 75-persistent-net-generator.rules
    5 # Updated fof udev-197 (DEVICES=en*)
     5# Updated for udev-197 (DEVICES=en*)
    66
    77RULES=/etc/udev/rules.d/70-persistent-net.rules
Note: See TracChangeset for help on using the changeset viewer.