Merge ~ahasenack/ubuntu/+source/git:lunar-git-cpuinfo-regexp into ubuntu/+source/git:ubuntu/devel

[Andreas Hasenack]

Adjust the regexp to cope with how processors are described in /proc/cpuinfo in s390x. The bug has details.

PPA (still building, but a manual build I did in an s390x VM confirmed the fix):

https://launchpad.net/~ahasenack/+archive/ubuntu/git-ftbfs-cpuinfo

[Sergio Durigan Junior (sergiodj)]

Thanks, Andreas.

The patch LGTM, and I see that upstream also likes the approach. The build is still pending on the PPA, so I'm +1 assuming that the build succeeds.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, sergiodj
Uploaders: ahasenack, sergiodj
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, the build succeeded, uploading.

[Andreas Hasenack (ahasenack)]

Uploading git_2.38.1-1ubuntu2.dsc
Uploading git_2.38.1-1ubuntu2.debian.tar.xz
Uploading git_2.38.1-1ubuntu2_source.buildinfo
Uploading git_2.38.1-1ubuntu2_source.changes

[Andreas Hasenack (ahasenack)]

This is in lunar-proposed already, and the branch was merged.

diff --git a/debian/changelog b/debian/changelog
index 3b0b6ce..0e94e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git (1:2.38.1-1ubuntu2) lunar; urgency=medium
+
+  * d/p/fix-cpuinfo-regexp.patch: fix cpuinfo regexp to accomodate the
+    way s390x shows it (LP: #1997475)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 22 Nov 2022 14:25:40 -0300
+
 git (1:2.38.1-1ubuntu1) lunar; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/fix-cpuinfo-regexp.patch b/debian/patches/fix-cpuinfo-regexp.patch
new file mode 100644
index 0000000..3b7cf79
--- /dev/null
+++ b/debian/patches/fix-cpuinfo-regexp.patch
@@ -0,0 +1,21 @@
+Description: adjust /proc/cpuinfo for s390x
+ In s390x, the ^processor line is like this:
+ processor 0: version = FF, identification = 148F67, machine = 2964
+Author: Andreas Hasenack <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024653
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/git/+bug/1997475
+Forwarded: https://public-inbox.org/git/[e-mail]/T/#u
+Last-Update: 2022-11-22
+diff --git a/t/chainlint.pl b/t/chainlint.pl
+index 976db4b8a0..2bbac1ebd7 100755
+--- a/t/chainlint.pl
++++ b/t/chainlint.pl
+@@ -656,7 +656,7 @@ sub ncores {
+ 	# Windows
+ 	return $ENV{NUMBER_OF_PROCESSORS} if exists($ENV{NUMBER_OF_PROCESSORS});
+ 	# Linux / MSYS2 / Cygwin / WSL
+-	do { local @ARGV='/proc/cpuinfo'; return scalar(grep(/^processor\s*:/, <>)); } if -r '/proc/cpuinfo';
++	do { local @ARGV='/proc/cpuinfo'; return scalar(grep(/^processor[\s\d]*:/, <>)); } if -r '/proc/cpuinfo';
+ 	# macOS & BSD
+ 	return qx/sysctl -n hw.ncpu/ if $^O =~ /(?:^darwin$|bsd)/;
+ 	return 1;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4bfb379
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-cpuinfo-regexp.patch