# Upstreamed From 2db0606adfdb800f3fcc95f2cb6c13ff76246e5f Mon Sep 17 00:00:00 2001 Message-Id: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu> From: Bruno Victal Date: Mon, 21 Aug 2023 20:58:22 +0100 Subject: [PATCH 1/2] libstdc++: Fix 'doc-install-info' rule. The info manual isn't moved to the expected location after generation which causes the install rule for it to fail. libstdc++-v3/Changelog: * doc/Makefile.in: Regenerate. * doc/Makefile.am: Fix 'doc-install-info' rule. Fix typo in commment. --- libstdc++-v3/doc/Makefile.am | 4 ++-- libstdc++-v3/doc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 8371441c62e..373522d593d 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -598,7 +598,7 @@ stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook doc-pdf-docbook: stamp-pdf-docbook # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -615,7 +615,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 21ad8557f7a..c19e3e3044c 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -645,7 +645,7 @@ manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -1096,7 +1096,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509 -- 2.40.1 -06-04 12:08:34 +0200'>2024-06-04services: base: Add optional delayed mount of file-systems...Add a mechanism to only require mounting a subset of file-system entries during early Shepherd initialization. Any file-system with additional Shepherd service requirements (e.g. networking) is not required to provision 'file-systems. * gnu/services/base.scm (file-system-shepherd-service): Splice file-system-requirements into the Shepherd service requirement list. (file-system-shepherd-services): Provision 'file-system only when file system services without additional Shepherd requirements are started. * gnu/system/file-systems.scm (file-system): Add shepherd-requirements field to the file-system record. This field is used for adding additional Shepherd requirements to a file-system Shepherd service. * doc/guix.texi: Add documentation for file-system shepherd-requirements. Change-Id: If0392db03d48e8820aa53df1df482c12ec72e1a5 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Richard Sent 2024-05-13file-systems: Add "virtiofs" to the list of pseudo file system types....* gnu/system/file-systems.scm (%pseudo-file-system-types): Add "virtiofs" to the list of pseudo file system types. Change-Id: Ib1d99127e65f6543c592faec1c54bd0c5eae3ad7 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Massimo Zaniboni 2023-12-10file-systems: Add tracefs to %pseudo-file-system-types....* gnu/system/file-systems.scm (%pseudo-file-system-types): Add tracefs. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Leo Nikkilä 2023-10-30gnu: file-systems: Add xenfs to %pseudo-file-system-types....* gnu/system/file-systems.scm (%pseudo-file-system-types): Add xenfs. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Skyler Ferris 2023-09-17gnu: file-systems: Add variable %base-live-file-systems....* gnu/system/file-systems.scm (%base-live-file-systems): New variable. * gnu/system/install.scm (installation-os): Use %base-live-file-systems. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Nicolas Graves