[PATCH] Karmic: Change patch templates to separate sauce and

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Karmic: Change patch templates to separate sauce and

Amit Kucheria-6
Currently, all our patches go into SAUCE. The original definition of SAUCE was
patches that would _not_ get accepted upstream (see the template). This has been
lost.

This change to the templates will force us to think what patches should go
upstream and what will be rejected.

Amit Kucheria (1):
  UBUNTU: [Config] Changes to patch templates to separate upstream and
    sauce

 debian/commit-templates/patch          |   28 ----------------------
 debian/commit-templates/patch-sauce    |   40 ++++++++++++++++++++++++++++++++
 debian/commit-templates/patch-upstream |   28 ++++++++++++++++++++++
 debian/commit-templates/sauce-patch    |   38 ------------------------------
 debian/commit-templates/update-configs |    7 ++++-
 5 files changed, 73 insertions(+), 68 deletions(-)
 delete mode 100644 debian/commit-templates/patch
 create mode 100644 debian/commit-templates/patch-sauce
 create mode 100644 debian/commit-templates/patch-upstream
 delete mode 100644 debian/commit-templates/sauce-patch


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Config] Changes to patch templates to separate upstream and sauce

Amit Kucheria-6
This change might force us to think about what patches ought to go upstream
and what won't be accepted

It also annotates all config changes with [Config]

Signed-off-by: Amit Kucheria <[hidden email]>
---
 debian/commit-templates/patch          |   28 ----------------------
 debian/commit-templates/patch-sauce    |   40 ++++++++++++++++++++++++++++++++
 debian/commit-templates/patch-upstream |   28 ++++++++++++++++++++++
 debian/commit-templates/sauce-patch    |   38 ------------------------------
 debian/commit-templates/update-configs |    7 ++++-
 5 files changed, 73 insertions(+), 68 deletions(-)
 delete mode 100644 debian/commit-templates/patch
 create mode 100644 debian/commit-templates/patch-sauce
 create mode 100644 debian/commit-templates/patch-upstream
 delete mode 100644 debian/commit-templates/sauce-patch

diff --git a/debian/commit-templates/patch b/debian/commit-templates/patch
deleted file mode 100644
index 35e0492..0000000
--- a/debian/commit-templates/patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Ubuntu commit template.
-#
-# NOTE: This gets reformatted for debian/changelog
-#
-# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
-# referenced to the Author in the debian/changelog entry.
-#
-# The text following is the short message that will be placed in the
-# changelog. Extra text on the following lines will be ignored, but left
-# in the git commit. Lines with # will be ignored in the commit.
-#
-# OriginalAuthor allows for alternate attribution.
-#
-# OriginalLocation allows for a URL or description of where the patch came
-# from.
-#
-# Bug is a reference to a Malone bug number. Be sure to include the '#' as
-# part of the bug number, e.g., 'Bug: #1'.
-#
-# Ignore: yes will keep this commit from showing up in the changelog.
-#
-UBUNTU:
-
-# OriginalAuthor:
-# OriginalLocation:
-# Bug: #
-# Ignore: yes
-# Other text below here.
diff --git a/debian/commit-templates/patch-sauce b/debian/commit-templates/patch-sauce
new file mode 100644
index 0000000..88771f5
--- /dev/null
+++ b/debian/commit-templates/patch-sauce
@@ -0,0 +1,40 @@
+# Ubuntu commit template.
+#
+# NOTE: This gets reformatted for debian/changelog
+#
+#
+# SAUCE refers to the fact that this patch might not go upstream, but we need to
+# carry it to successive releases. In most cases you DONOT want to use this
+# template.
+#
+# An example of a SAUCE patch is the ACPI DSDT-in-initramfs patch which has been
+# refused upstream, but still provides useful functionality to users with broken
+# BIOSes.
+#
+#-------------------------------------------------------------------------
+#
+# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
+# referenced to the Author in the debian/changelog entry.
+#
+# The text following is the short message that will be placed in the
+# changelog. Extra text on the following lines will be ignored, but left
+# in the git commit. Lines with # will be ignored in the commit.
+#
+# OriginalAuthor allows for alternate attribution.
+#
+# OriginalLocation allows for a URL or description of where the patch came
+# from.
+#
+# Bug is a reference to a Malone bug number.
+#
+# Ignore: yes will keep this commit from showing up in the changelog.
+#
+UBUNTU: SAUCE:
+
+<Why is this patch not going upstream?>
+
+# OriginalAuthor:
+# OriginalLocation:
+# Bug: #
+# Ignore: yes
+# Other text below here.
diff --git a/debian/commit-templates/patch-upstream b/debian/commit-templates/patch-upstream
new file mode 100644
index 0000000..c4798fe
--- /dev/null
+++ b/debian/commit-templates/patch-upstream
@@ -0,0 +1,28 @@
+# Ubuntu commit template.
+#
+# NOTE: This gets reformatted for debian/changelog
+#
+# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
+# referenced to the Author in the debian/changelog entry.
+#
+# The text following is the short message that will be placed in the
+# changelog. Extra text on the following lines will be ignored, but left
+# in the git commit. Lines with # will be ignored in the commit.
+#
+# OriginalAuthor allows for alternate attribution.
+#
+# OriginalLocation allows for a URL or description of where the patch came
+# from.
+#
+# Bug is a reference to a Malone bug number. Be sure to include the '#' as
+# part of the bug number, e.g., 'Bug: #1'.
+#
+# Ignore: yes will keep this commit from showing up in the changelog.
+#
+UBUNTU: [Upstream]
+
+# OriginalAuthor:
+# OriginalLocation:
+# Bug: #
+# Ignore: yes
+# Other text below here.
diff --git a/debian/commit-templates/sauce-patch b/debian/commit-templates/sauce-patch
deleted file mode 100644
index eb72a7e..0000000
--- a/debian/commit-templates/sauce-patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# Ubuntu commit template.
-#
-# NOTE: This gets reformatted for debian/changelog
-#
-#
-# SAUCE refers to the fact that this patch might not go upstream, but we need to
-# carry it to successive releases. In most cases you DONOT want to use this
-# template.
-#
-# An example of a SAUCE patch is the ACPI DSDT-in-initramfs patch which has been
-# refused upstream, but still provides useful functionality to users with broken
-# BIOSes.
-#
-#-------------------------------------------------------------------------
-#
-# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
-# referenced to the Author in the debian/changelog entry.
-#
-# The text following is the short message that will be placed in the
-# changelog. Extra text on the following lines will be ignored, but left
-# in the git commit. Lines with # will be ignored in the commit.
-#
-# OriginalAuthor allows for alternate attribution.
-#
-# OriginalLocation allows for a URL or description of where the patch came
-# from.
-#
-# Bug is a reference to a Malone bug number.
-#
-# Ignore: yes will keep this commit from showing up in the changelog.
-#
-UBUNTU: SAUCE:
-
-# OriginalAuthor:
-# OriginalLocation:
-# Bug: #
-# Ignore: yes
-# Other text below here.
diff --git a/debian/commit-templates/update-configs b/debian/commit-templates/update-configs
index 9120256..21c6187 100644
--- a/debian/commit-templates/update-configs
+++ b/debian/commit-templates/update-configs
@@ -5,6 +5,9 @@
 # 'debian/rules insertchanges' from inserting this commit meesage
 # as a changelog entry.
 #
-UBUNTU: Updating configs
+# Please give a one-line description of the config change followed
+# by a detailed explanation if necessary
 
-Ignore: yes
+UBUNTU: [Config] XXXX
+
+#Ignore: yes
--
1.6.0.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Karmic: Change patch templates to separate sauce and

Tim Gardner-2
In reply to this post by Amit Kucheria-6
Amit Kucheria wrote:

> Currently, all our patches go into SAUCE. The original definition of SAUCE was
> patches that would _not_ get accepted upstream (see the template). This has been
> lost.
>
> This change to the templates will force us to think what patches should go
> upstream and what will be rejected.
>
> Amit Kucheria (1):
>   UBUNTU: [Config] Changes to patch templates to separate upstream and
>     sauce
>
>  debian/commit-templates/patch          |   28 ----------------------
>  debian/commit-templates/patch-sauce    |   40 ++++++++++++++++++++++++++++++++
>  debian/commit-templates/patch-upstream |   28 ++++++++++++++++++++++
>  debian/commit-templates/sauce-patch    |   38 ------------------------------
>  debian/commit-templates/update-configs |    7 ++++-
>  5 files changed, 73 insertions(+), 68 deletions(-)
>  delete mode 100644 debian/commit-templates/patch
>  create mode 100644 debian/commit-templates/patch-sauce
>  create mode 100644 debian/commit-templates/patch-upstream
>  delete mode 100644 debian/commit-templates/sauce-patch
>
>

If you use the patch-upstream template, do we delay pushing to our core
repo until its been accepted by an upstream maintainer? What if its
rejected? Perhaps we should keep a branch of pending upstream patch
submissions that don't get moved into our mainline until they've been
accepted upstream. (I know Stefan wanted more process...)

On a more finicky note, can you change the patch template names so that
tab completion works on the first unique character? upstream-patch
instead of patch-upstream, config-update instead of update-configs, etc.

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Karmic: Change patch templates to separate sauce and

Amit Kucheria-6
On Thu, Apr 16, 2009 at 09:01:27AM -0600, Tim Gardner wrote:

> Amit Kucheria wrote:
> > Currently, all our patches go into SAUCE. The original definition of SAUCE was
> > patches that would _not_ get accepted upstream (see the template). This has been
> > lost.
> >
> > This change to the templates will force us to think what patches should go
> > upstream and what will be rejected.
>
> If you use the patch-upstream template, do we delay pushing to our core
> repo until its been accepted by an upstream maintainer? What if its
> rejected? Perhaps we should keep a branch of pending upstream patch
> submissions that don't get moved into our mainline until they've been
> accepted upstream. (I know Stefan wanted more process...)

Perhaps the rationale should be that anything that uses the -upstream template has already been emailed upstream. If it is rejected, it tells us that we need to revert the patch and refactor it and resend. Repeat ad infinitum.
 
> On a more finicky note, can you change the patch template names so that
> tab completion works on the first unique character? upstream-patch
> instead of patch-upstream, config-update instead of update-configs, etc.

I purposely changed the name to start with patch- so that it wouldn't autocomplete easily and one would have to think about the right template. :)

I can change it though.

/Amit

--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || [hidden email]
----------------------------------------------------------------------

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Karmic: Change patch templates to separate sauce and

Tim Gardner-2
Amit Kucheria wrote:

> On Thu, Apr 16, 2009 at 09:01:27AM -0600, Tim Gardner wrote:
>> Amit Kucheria wrote:
>>> Currently, all our patches go into SAUCE. The original definition
>>> of SAUCE was patches that would _not_ get accepted upstream (see
>>> the template). This has been lost.
>>>
>>> This change to the templates will force us to think what patches
>>> should go upstream and what will be rejected.
>> If you use the patch-upstream template, do we delay pushing to our
>> core repo until its been accepted by an upstream maintainer? What
>> if its rejected? Perhaps we should keep a branch of pending
>> upstream patch submissions that don't get moved into our mainline
>> until they've been accepted upstream. (I know Stefan wanted more
>> process...)
>
> Perhaps the rationale should be that anything that uses the -upstream
> template has already been emailed upstream. If it is rejected, it
> tells us that we need to revert the patch and refactor it and resend.
> Repeat ad infinitum.
>

I guess thats the part of the feedback loop that I'm concerned about.
Even though a patch has been submitted upstream, we currently have no
mechanism for reconciling which patches were accepted, which were
rejected, and which were simply missed. If we are going to make a
determined effort to get these patches upstream, then we really need a
way to keep track of them.

>> On a more finicky note, can you change the patch template names so
>> that tab completion works on the first unique character?
>> upstream-patch instead of patch-upstream, config-update instead of
>> update-configs, etc.
>
> I purposely changed the name to start with patch- so that it wouldn't
> autocomplete easily and one would have to think about the right
> template. :)
>

I think you know how typing impaired I am.

> I can change it though.
>
> /Amit
>


--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team