[JAMMY][UNSTABLE][LRM][PATCH 1/3] UBUNTU: [Packaging] Ensure that pkg_archs is a space separated list

Dimitri John Ledkov dimitri.ledkov at canonical.com
Mon Mar 21 10:59:46 UTC 2022


If both package.config and dkms-versions are arch qualified, ensure
that pkg_archs variable remains space separated, as otherwise invalid
makefiles are generated.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian/scripts/gen-rules.lrg | 2 +-
 debian/scripts/gen-rules.lrm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/gen-rules.lrg b/debian/scripts/gen-rules.lrg
index 776a898e55..8843026987 100755
--- a/debian/scripts/gen-rules.lrg
+++ b/debian/scripts/gen-rules.lrg
@@ -101,7 +101,7 @@ do
 			pkg_archs=$archs
 		else
 			# Package arches set, build for intersection
-			pkg_archs=$(sort <(echo $archs | tr " " "\n") <(echo $pkg_archs | tr " " "\n") | uniq -d)
+			pkg_archs=$(sort <(echo $archs | tr " " "\n") <(echo $pkg_archs | tr " " "\n") | uniq -d | tr "\n" " ")
 			# No intersection, skip
 			if [ -z "$pkg_archs" ]; then
 				continue
diff --git a/debian/scripts/gen-rules.lrm b/debian/scripts/gen-rules.lrm
index b336a7232e..ce9654b4ba 100755
--- a/debian/scripts/gen-rules.lrm
+++ b/debian/scripts/gen-rules.lrm
@@ -109,7 +109,7 @@ EOL
 			pkg_archs=$archs
 		else
 			# Package arches set, build for intersection
-			pkg_archs=$(sort <(echo $archs | tr " " "\n") <(echo $pkg_archs | tr " " "\n") | uniq -d)
+			pkg_archs=$(sort <(echo $archs | tr " " "\n") <(echo $pkg_archs | tr " " "\n") | uniq -d | tr "\n" " ")
 			# No intersection, skip
 			if [ -z "$pkg_archs" ]; then
 				continue
-- 
2.32.0




More information about the kernel-team mailing list