From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Luca Boccassi <bluca@debian.org>, dpdk stable <stable@dpdk.org>
Cc: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts
Date: Mon, 30 Jul 2018 18:24:46 +0200 [thread overview]
Message-ID: <20180730162447.17661-1-christian.ehrhardt@canonical.com> (raw)
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
README | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/README b/README
index 772382d..8a2ccea 100644
--- a/README
+++ b/README
@@ -1,12 +1,22 @@
Here is a short description of the scripts I used for managing DPDK
stable/LTS releases.
+It is expected to run these scripts from the directory of the stable-scripts
+repository. The settings in lib.sh will make it know about you (signature) and
+your directories holding the stable and dpdk git.
+So as the first step you should adapt the setting in lib.sh to your own needs.
+
+Note: often the same directory is used for stable and upstream dpdk trees with
+both remotes fully fetched.
+
0-set-stable-release
--------------------
Set the current stable release you want to work on. With that, you
don't need to provide the stable release info for following scripts.
+It will also create a local directory that will be used as tmp dir for
+the patches and mails.
1-import
--------
@@ -19,7 +29,8 @@ Where, the commit list should be provided from the "git-log-fixes.sh"
script from DPDK. Assuming v17.11-rc1 is out and I then could prepare
patches for v17.08.1 stable release, I normally do:
- $ ./devtools/git-log-fixes v17.08..v17.11-rc1 > /tmp/list
+ $ ./devtools/git-log-fixes.sh v17.08..v17.11-rc1 > /tmp/list
+
I then will check the generated list and edit it manually if necessary,
say removing some false commits. Notably, they are:
@@ -34,6 +45,12 @@ say removing some false commits. Notably, they are:
We probably need add an option for "gitl-log-fixes.sh" to let it do
that automatically.
+Note: if this is the first time a particular release gets a stable branch
+XX.YY.1 then you'll need to check out a branch for it based on the release tag.
+For example for 18.05 you'd do like:
+ $ git checkout v18.05
+ # check this really is what you want to base on
+ $ git checkout -b 18.05
2-send-notice
-------------
--
2.17.1
next reply other threads:[~2018-07-30 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 16:24 Christian Ehrhardt [this message]
2018-07-30 16:24 ` [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines Christian Ehrhardt
2018-07-30 16:29 ` Luca Boccassi
2018-07-30 16:29 ` [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Luca Boccassi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180730162447.17661-1-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=bluca@debian.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).