Skip to content

fix: install doc files that were previously installed pre-Meson#6501

Merged
blackboxsw merged 1 commit into
canonical:mainfrom
dermotbradley:add-missing-doc-files
Oct 6, 2025
Merged

fix: install doc files that were previously installed pre-Meson#6501
blackboxsw merged 1 commit into
canonical:mainfrom
dermotbradley:add-missing-doc-files

Conversation

@dermotbradley
Copy link
Copy Markdown
Contributor

Proposed Commit Message

fix: install doc files that were previously installed pre-Meson

The Meson-based installation does not install these text files whereas
the pre-Meson installation did, so reinstate them.

Additional Context

Test Steps

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

The Meson-based installation does not install these text files whereas
the pre-Meson installation did, so reinstate them.
@blackboxsw blackboxsw added the documentation This Pull Request changes documentation label Oct 6, 2025
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @dermotbradley for catching and fixing this. I can confirm the missing files when comparing our releases pre-meson to post-meson in Ubuntu as well.

csmith@midtown:~/src/cloud-init$ diff -urN p.doc  q.doc 
--- p.doc	2025-10-06 09:32:18.528023059 -0600
+++ q.doc	2025-10-06 09:32:06.938022440 -0600
@@ -55,9 +55,6 @@
 /usr/share/doc/cloud-init/examples/seed/meta-data
 /usr/share/doc/cloud-init/examples/seed/user-data
 /usr/share/doc/cloud-init/examples/user-script.txt
-/usr/share/doc/cloud-init/status.txt
-/usr/share/doc/cloud-init/userdata.txt
-/usr/share/doc/cloud-init/var-lib-cloud.txt
 /usr/share/doc/cloud-init-base
 /usr/share/doc/cloud-init-base/NEWS.Debian.gz
 /usr/share/doc/cloud-init-base/changelog.Debian.gz
  • Also confirmed the proper formatting:
cat >meson.ini <<EOF
indent_size = 2
EOF
muon-v0.5.0-amd64-linux fmt -c meson.ini -i meson.build
  • install works:
 meson install -C ./builddir/ --destdir=installtest
find ./builddir/installtest/ | grep doc/cloud-init | tail -n 5
./builddir/installtest/usr/local/share/doc/cloud-init/examples/network-config-v1-nameserver.yaml
./builddir/installtest/usr/local/share/doc/cloud-init/examples/cloud-config-ansible-pull.txt
./builddir/installtest/usr/local/share/doc/cloud-init/userdata.txt
./builddir/installtest/usr/local/share/doc/cloud-init/status.txt
./builddir/installtest/usr/local/share/doc/cloud-init/var-lib-cloud.txt

@blackboxsw blackboxsw merged commit 83defe9 into canonical:main Oct 6, 2025
21 checks passed
blackboxsw pushed a commit to blackboxsw/cloud-init that referenced this pull request Dec 12, 2025
…nical#6501)

The Meson-based installation does not install these text files whereas
the pre-Meson installation did, so reinstate them.
holmanb pushed a commit that referenced this pull request Dec 18, 2025
The Meson-based installation does not install these text files whereas
the pre-Meson installation did, so reinstate them.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation This Pull Request changes documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants