[PATCH][Unstable] UBUNTU: [Package] add support for specifying the primary makefile

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

[PATCH][Unstable] UBUNTU: [Package] add support for specifying the primary makefile

Kleber Sacilotto de Souza
From: Andy Whitcroft <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1786013

Signed-off-by: Andy Whitcroft <[hidden email]>
Signed-off-by: Kleber Sacilotto de Souza <[hidden email]>
---
Note: this patch has already been applied to T/X/B/C master-next
branches and it's needed only for unstable (D).

This is needed to fix an issue with the changelog of backports of
derivatives, where the config changes carried out from the original
derivative applied by the 'Start new release' commit is never added to
the changelog. Copying the changelog entries from the original derivative
instead of the master branch solves this problem.

 debian/scripts/misc/insert-ubuntu-changes | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/scripts/misc/insert-ubuntu-changes b/debian/scripts/misc/insert-ubuntu-changes
index 145c81c5dbd3..20864874ddba 100755
--- a/debian/scripts/misc/insert-ubuntu-changes
+++ b/debian/scripts/misc/insert-ubuntu-changes
@@ -1,9 +1,12 @@
 #!/usr/bin/perl
 
-if ($#ARGV != 2) {
- die "Usage: $0 <changelog> <stop at> <start at>\n";
+if ($#ARGV != 2 && $#ARGV != 3) {
+ die "Usage: $0 <changelog> <stop at> <start at> [<source changelog>]\n";
 }
-my ($changelog, $end, $start) = @ARGV;
+if ($#ARGV == 2) {
+ push(@ARGV, "debian.master/changelog")
+}
+my ($changelog, $end, $start, $source_changelog) = @ARGV;
 
 $end =~ s/^\D+//;
 $start =~ s/^\D+//;
@@ -32,7 +35,7 @@ sub version_cmp($$) {
 
 my @changes = ();
 my $output = 0;
-open(CHG, "<debian.master/changelog") ||
+open(CHG, "<$source_changelog") ||
  open(CHG, "<debian/changelog") ||
  die "$0: debian/changelog: open failed - $!\n";
 while (<CHG>) {
--
2.17.1


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

APPLIED: [PATCH][Unstable] UBUNTU: [Package] add support for specifying the primary makefile

Thadeu Lima de Souza Cascardo-3
Acked and applied to unstable master branch.

Thanks.
Cascardo.

Applied-to: unstable/master

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