* [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts
@ 2018-07-30 16:24 Christian Ehrhardt
2018-07-30 16:24 ` [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines Christian Ehrhardt
2018-07-30 16:29 ` [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Luca Boccassi
0 siblings, 2 replies; 4+ messages in thread
From: Christian Ehrhardt @ 2018-07-30 16:24 UTC (permalink / raw)
To: Luca Boccassi, dpdk stable; +Cc: Christian Ehrhardt
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines
2018-07-30 16:24 [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Christian Ehrhardt
@ 2018-07-30 16:24 ` 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
1 sibling, 1 reply; 4+ messages in thread
From: Christian Ehrhardt @ 2018-07-30 16:24 UTC (permalink / raw)
To: Luca Boccassi, dpdk stable; +Cc: Christian Ehrhardt
In some cases like
7fa7216ed S mem: fix alignment of requested virtual areas (18.05)
d5dd22c9f S mem: fix alignment of requested virtual areas (18.05)
The current scripting will loose the former change.
It will create files based on format-patch and then later on import
them.
But due to the same subject line the later exported change will override
the former change.
Avoid that issue by using the commit-id as suffix for the filenames and
by that ensuring that they will be unique.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
import-commit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/import-commit b/import-commit
index 8d0763f..218924e 100644
--- a/import-commit
+++ b/import-commit
@@ -21,7 +21,7 @@ init()
exit 1
}
- patch=$($GIT format-patch -o $STABLE_DIR $commit -1)
+ patch=$($GIT format-patch --suffix="-$commit.patch" -o $STABLE_DIR $commit -1)
}
# add "[ upstream commit xxxx ]" tag
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts
2018-07-30 16:24 [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Christian Ehrhardt
2018-07-30 16:24 ` [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines Christian Ehrhardt
@ 2018-07-30 16:29 ` Luca Boccassi
1 sibling, 0 replies; 4+ messages in thread
From: Luca Boccassi @ 2018-07-30 16:29 UTC (permalink / raw)
To: Christian Ehrhardt, dpdk stable
On Mon, 2018-07-30 at 18:24 +0200, Christian Ehrhardt wrote:
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> README | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines
2018-07-30 16:24 ` [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines Christian Ehrhardt
@ 2018-07-30 16:29 ` Luca Boccassi
0 siblings, 0 replies; 4+ messages in thread
From: Luca Boccassi @ 2018-07-30 16:29 UTC (permalink / raw)
To: Christian Ehrhardt, dpdk stable
On Mon, 2018-07-30 at 18:24 +0200, Christian Ehrhardt wrote:
> In some cases like
> 7fa7216ed S mem: fix alignment of requested virtual areas (18.05)
> d5dd22c9f S mem: fix alignment of requested virtual areas (18.05)
>
> The current scripting will loose the former change.
> It will create files based on format-patch and then later on import
> them.
> But due to the same subject line the later exported change will
> override
> the former change.
>
> Avoid that issue by using the commit-id as suffix for the filenames
> and
> by that ensuring that they will be unique.
>
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> import-commit | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/import-commit b/import-commit
> index 8d0763f..218924e 100644
> --- a/import-commit
> +++ b/import-commit
> @@ -21,7 +21,7 @@ init()
> exit 1
> }
>
> - patch=$($GIT format-patch -o $STABLE_DIR $commit -1)
> + patch=$($GIT format-patch --suffix="-$commit.patch" -o
> $STABLE_DIR $commit -1)
> }
>
> # add "[ upstream commit xxxx ]" tag
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-30 16:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-30 16:24 [dpdk-stable] [PATCH 1/2] README: add some lessons learned from using the stable scripts Christian Ehrhardt
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
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).