[PATCH 1/8 B][SRU][L-R-M] UBUNTU: [packaging] fix reproducible builds on ppc64el

[Alberto Milone]

---
 debian/scripts/dkms-build--nvidia-N | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N
index 3759232..6598ddd 100755
--- a/debian/scripts/dkms-build--nvidia-N
+++ b/debian/scripts/dkms-build--nvidia-N
@@ -14,6 +14,7 @@ package="$6"
 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"
@@ -21,9 +22,17 @@ 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
-- 
2.25.1