From 602a01ffe99d810901fa46fc3ef220848b79e44a Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 30 Aug 2020 06:09:09 +0000 Subject: [PATCH] Merge changes from trunk to multilib git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12041 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 +++++++ chapter09/systemd-custom.xml | 4 +-- chapter10/kernel.xml | 57 +++++++++++++++++++++--------------- general.ent | 6 ++-- lfs-latest.php | 1 + packages.ent | 18 ++++++------ 6 files changed, 58 insertions(+), 38 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e3630b0f0..59774caff 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + + 2020-08-28 + + [bdubbs] - Update to iana-Etc-20200821. Addresses + #4722. + + + + 2020-08-24 diff --git a/chapter09/systemd-custom.xml b/chapter09/systemd-custom.xml index 809c1a273..7addaefbb 100644 --- a/chapter09/systemd-custom.xml +++ b/chapter09/systemd-custom.xml @@ -54,7 +54,7 @@ EOF ln -sfv /dev/null /etc/systemd/system/tmp.mount - Alternatively, if a a separate partition for + Alternatively, if a separate partition for /tmp is desired, specify that partition in a /etc/fstab entry. @@ -103,7 +103,7 @@ EOF The type field, q, discusses creating a subvolume with quotas which is really only applicable to btrfs filesystems. It references type v which in turn references type d (directory). This then creates the - specified directory if is is not present and adjusts the permissions + specified directory if it is not present and adjusts the permissions and ownership as specified. Contents of the directory will be subject to time based cleanup if the age argument is specified. diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 2c2c66896..9882c9b9a 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -54,10 +54,41 @@ kernel compilation. Do not rely on the source tree being clean after un-tarring. + There are several ways to configure the kernel options. Usually, + This is done through a menu-driven interface, for example: + +make menuconfig + + + The meaning of optional make environment variables: + + + LANG=<host_LANG_value> LC_ALL= + + This establishes the locale setting to the one used on the + host. This may be needed for a proper menuconfig ncurses interface + line drawing on a UTF-8 linux text console. + + If used, be sure to replace + <host_LANG_value> by the value of + the $LANG variable from your host. You can + alternatively use instead the host's value of $LC_ALL + or $LC_CTYPE. + + + + + make menuconfig + + This launches an ncurses menu-driven interface. For other + (graphical) interfaces, type make help. + + + + - Configure the kernel via a menu-driven interface. For general - information on kernel configuration see For general information on kernel configuration see . BLFS has some information regarding particular kernel configuration requirements of packages outside of LFS at -make menuconfig - - - The meaning of optional make environment variables: - - - LANG=<host_LANG_value> LC_ALL= - - This establishes the locale setting to the one used on the - host. This may be needed for a proper menuconfig ncurses interface - line drawing on a UTF-8 linux text console. - - If used, be sure to replace - <host_LANG_value> by the value of - the $LANG variable from your host. You can - alternatively use instead the host's value of $LC_ALL - or $LC_CTYPE. - - - - - Alternatively, make oldconfig may be more appropriate in some situations. See the README file for more information. diff --git a/general.ent b/general.ent index b712e8952..e50b3d95b 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/lfs-latest.php b/lfs-latest.php index 6fe2ea0ca..1cd061946 100644 --- a/lfs-latest.php +++ b/lfs-latest.php @@ -116,6 +116,7 @@ if ( $package == "expect" ) $dirpath = "http://sourceforge.net/projects/expe if ( $package == "file" ) $dirpath = "https://github.com/file/file/releases"; if ( $package == "flex" ) $dirpath = "https://github.com/westes/flex/releases"; if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" ); +if ( $package == "iana-etc" ) $dirpath = "https://github.com/Mic92/iana-etc/releases"; if ( $package == "intltool" ) $dirpath = "https://launchpad.net/intltool/trunk"; if ( $package == "meson" ) $dirpath = "https://github.com/mesonbuild/meson/releases"; if ( $package == "mpc" ) $dirpath = "https://ftp.gnu.org/gnu/mpc"; diff --git a/packages.ent b/packages.ent index 53cc45df8..fb38ef4b2 100644 --- a/packages.ent +++ b/packages.ent @@ -319,11 +319,11 @@ - - - - - + + + + + @@ -432,11 +432,11 @@ - - - + max is allmodconfig which requires openssl --> + +