Changeset adcb9c0


Ignore:
Timestamp:
05/25/2021 03:45:10 AM (15 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
f081763
Parents:
8fbd2fb (diff), 1432cda (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:
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r8fbd2fb radcb9c0  
    167167wget-list: $(BASEDIR)/wget-list
    168168$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
    169                       packages.ent patches.ent
     169                      packages.ent patches.ent general.ent
    170170        @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
    171171        $(Q)mkdir -p $(BASEDIR)
  • chapter01/resources.xml

    r8fbd2fb radcb9c0  
    5757    Relay Chat (IRC). Before using this support, please make sure that your
    5858    question is not already answered in the LFS FAQ or the mailing list
    59     archives. You can find the IRC network at <uri>irc.freenode.net</uri>.
     59    archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
    6060    The support channel is named #LFS-support.</para>
    6161
  • general.ent

    r8fbd2fb radcb9c0  
    4141<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
    4242
    43 <!ENTITY anduin-sources  "http://anduin.linuxfromscratch.org/LFS">
     43<!ENTITY anduin-sources  "https://anduin.linuxfromscratch.org/LFS">
    4444
    4545<!ENTITY buildtime       "Approximate build time">
Note: See TracChangeset for help on using the changeset viewer.