From 2a56d8f0ec3b5b4849a1217b6ef6b62a3af6631a Mon Sep 17 00:00:00 2001 From: Yuji Ito Date: Wed, 26 Feb 2025 08:55:32 +0000 Subject: [PATCH] add document: how to make a patch for export-diff cmd Signed-off-by: Yuji Ito --- ceph/README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ceph/README.md b/ceph/README.md index 4b984dd4..af6c0802 100644 --- a/ceph/README.md +++ b/ceph/README.md @@ -15,8 +15,7 @@ make test ## Procedure to update ### Update ceph version - -Imports all of the contents from upstream git, including tags. +**In the `cybozu/ceph` repository,** imports all of the contents from upstream git, including tags. ```sh git swtich main @@ -29,9 +28,24 @@ git push origin --tags ``` ### Update the patch -TBD +**In the `cybozu/ceph` repository,** the export-diff patch is created by each target Ceph version. A branch is created for each Ceph version. If there is no branch for the target version, You can create it like the following. + +```sh +# at working directory for https://github.com/ceph/ceph.git +VERSION=16.2.4 +git checkout -b rbd-export-v$VERSION tags/v$VERSION +``` + +You commit & push to the branch in the same way as normal development, but **you do not create an RP, and do not merge to the main branch.** You simply save the changes to the branch. + +```sh +git diff tags/v$VERSION > export-diff.patch +``` + +The patches are stored in the `ceph` directory in the `cybozu-go/mantle` repository. Please copy them manually. ### Release +**Works in the `cybozu-go/mantle` repository.** 1. The version is determined. The patch version is the same as the base ceph version. The fourth field starts at 0 for each ceph version and increases by 1 for each release. ```sh