diff --git a/aux-file-data.sh b/aux-file-data.sh index 8be1b1d15..01539fef6 100755 --- a/aux-file-data.sh +++ b/aux-file-data.sh @@ -15,7 +15,7 @@ base=$(basename $bootscripts .tar.xz) bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ") bootmd5=$(md5sum $bootscripts | cut -f1 -d" ") -# Figure intalled size of bootscripts +# Figure installed size of bootscripts TOPDIR=$(pwd) TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX) pushd $TMP_DIR > /dev/null diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 558230238..d3a7ed661 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,9 @@ +2024-08-23 Xi Ruoyao + * In console, detect FB console by checking /sys/class/graphics/fbcon + instead of fb0. The latter does not exist if CONFIG_FB=n, but + CONFIG_DRM_FBDEV_EMULATION=y can support a FB console without + CONFIG_FB. + 2024-07-12 Xi Ruoyao * In mountvirtfs, recreate /dev/fd correctly if it's already created by the initramfs. diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console index a5338cc71..9409e4757 100644 --- a/bootscripts/lfs/init.d/console +++ b/bootscripts/lfs/init.d/console @@ -47,7 +47,7 @@ case "${1}" in log_info_msg "Setting up Linux console..." # Figure out if a framebuffer console is used - [ -d /sys/class/graphics/fb0 ] && use_fb=1 || use_fb=0 + [ -d /sys/class/graphics/fbcon ] && use_fb=1 || use_fb=0 # Figure out the command to set the console into the # desired mode diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0bdb8d7cc..1b1070847 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,17 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-23 + + + [xry111] - Update to lfs-bootscripts-20240823, to fix an + issue causing VT 2-6 not affected by the FONT= setting in + /etc/sysconfig/console. + + + + 2024-08-17 diff --git a/git-version.sh b/git-version.sh index 09a8fadd7..9d6c3fe0a 100755 --- a/git-version.sh +++ b/git-version.sh @@ -19,7 +19,7 @@ if [ -e LFS-RELEASE ]; then fi if ! git status > /dev/null; then - # Either it's not a git repository, or git is unavaliable. + # Either it's not a git repository or git is unavaliable. # Just workaround. echo " version.ent echo "" >> version.ent diff --git a/lfs-latest-git.php b/lfs-latest-git.php index ce76e970e..55c634e0b 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -322,7 +322,7 @@ function get_current() $file = basename( $line ) . "\n"; if ( preg_match( "/patch$/", $file ) ) { continue; } // Skip patches - $file = preg_replace( "/bz2/", '', $file ); // The 2 confusses the regex + $file = preg_replace( "/bz2/", '', $file ); // The 2 confuses the regex $file = rtrim( $file ); $pkg_pattern = "/(\D*).*/"; diff --git a/packages.ent b/packages.ent index bd58ce720..5185716f4 100644 --- a/packages.ent +++ b/packages.ent @@ -2,7 +2,7 @@ + diff --git a/stylesheets/lfs-xsl/chunkfast.xsl b/stylesheets/lfs-xsl/chunkfast.xsl index 6d9d823a5..c9338820f 100644 --- a/stylesheets/lfs-xsl/chunkfast.xsl +++ b/stylesheets/lfs-xsl/chunkfast.xsl @@ -8,7 +8,7 @@ exclude-result-prefixes="cf exsl"> + Dropping unneeded anchors and fo:wrapper elemments. --> @@ -111,7 +111,7 @@ - + diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl index ea247f5db..e1c03147c 100644 --- a/stylesheets/lfs-xsl/pdf.xsl +++ b/stylesheets/lfs-xsl/pdf.xsl @@ -27,7 +27,7 @@ - + @@ -93,7 +93,7 @@ + Addibg a bullet, left alignment, and @kepp-*.* attributes + for packages and patches list. --> @@ -135,7 +135,7 @@ diff --git a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl index e5c7ae090..f38699e9c 100644 --- a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl +++ b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl @@ -128,7 +128,7 @@ + Be sure that literal will use always normal font weight. --> @@ -139,7 +139,7 @@ + literal, option, prompt, systemitem, varname, sgmltag, tag, and uri --> diff --git a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl index 7ec85ddf4..5578fd661 100644 --- a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl +++ b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl @@ -176,7 +176,7 @@ + Small font size and left alignment. --> - + and that do not affect the chunk algorithm. --> @@ -187,7 +187,7 @@ @@ -208,7 +208,7 @@ - + diff --git a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl index 36c4ba3fe..5dbe2136e 100644 --- a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl +++ b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl @@ -65,7 +65,7 @@ diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl index f863edc1f..94e33b70b 100644 --- a/stylesheets/patcheslist.xsl +++ b/stylesheets/patcheslist.xsl @@ -51,7 +51,7 @@ exit - + diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl index eca53a4c9..09f99cd22 100644 --- a/stylesheets/wget-list.xsl +++ b/stylesheets/wget-list.xsl @@ -15,7 +15,7 @@ + duplicated URLs due that may be split for PDF output -->