diff mbox series

[2/3,B,SRU] UBUNTU: [packaging] fix dkms-build--nvidia-N on ppc64el

Message ID 20200529143616.2217218-3-alberto.milone@canonical.com
State New
Headers show
Series Add signed modules for the new NVIDIA -server drivers | expand

Commit Message

Alberto Milone May 29, 2020, 2:36 p.m. UTC 
This changes the regex on ppc64el.

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

Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
---
 debian/scripts/dkms-build--nvidia-N | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N
index 3759232549f1..5f4e006a48d7 100755
--- a/debian/scripts/dkms-build--nvidia-N
+++ b/debian/scripts/dkms-build--nvidia-N
@@ -15,15 +15,25 @@  shift 6
 
 build="$( dirname "$objects" )/build"
 
+arch="$( /usr/bin/dpkg-architecture -qDEB_HOST_ARCH )"
+
 # Copy over the objects ready for reconstruction.
 mkdir -p "$pkgdir/bits/scripts"
 cp -rp "$objects"/* "$pkgdir/bits"
 
 # Install the support files we need.
 cp "$srcdir/scripts/module-common.lds" "$pkgdir/bits/scripts"
-grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD"
-grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \
-	-e 's/.*-o  *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN"
+
+if [ "$arch" = "ppc64el" ]; then
+	grep /usr/bin/ld.bfd "$log" | grep -v "^  if" | sed -e 's@; *make -f ./arch/powerpc/.*@@' \
+		-e "s@$build/@@g" >"$pkgdir/bits/BUILD"
+	grep /usr/bin/ld.bfd "$log"| grep -v "^  if" | sed -e "s@$build/@@g" \
+		-e 's/.*-o  *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN"
+else
+	grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD"
+	grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \
+		-e 's/.*-o  *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN"
+fi
 
 # As the builds contain the absolute filenames as used.  Use RECONSTRUCT to
 # rebuild the .ko's, sign them, pull off the signatures and then finally clean