forked from pool/build
26 lines
968 B
Diff
26 lines
968 B
Diff
|
From 7d1bfa52e9d2ffd60019481c1e3b96aa06d625ff Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Jaeger <aj@suse.de>
|
||
|
|
Date: Thu, 4 Oct 2012 11:13:13 +0200
|
||
|
|
Subject: [PATCH] Mount /proc for rpmlint checks
|
||
|
|
|
||
|
|
Otherwise rpm which is run in chroot will warn about missing /proc
|
||
|
|
|
||
|
|
diff --git a/build b/build
|
||
|
|
index 4ff7848..d88c094 100755
|
||
|
|
--- a/build
|
||
|
|
+++ b/build
|
||
|
|
@@ -2299,11 +2299,13 @@ if test -n "$RPMS" -a "$DO_CHECKS" != "false" -a -x "$BUILD_ROOT/opt/testing/bin
|
||
|
|
rpmlint_logfile=$TOPDIR/OTHER/rpmlint.log
|
||
|
|
rm -f "$BUILD_ROOT$rpmlint_logfile"
|
||
|
|
ret=0
|
||
|
|
+ mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
|
||
|
|
chroot $BUILD_ROOT su -s /opt/testing/bin/rpmlint "$BUILD_USER" -- \
|
||
|
|
--info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} \
|
||
|
|
${SRPM_FILE_LIST[*]#$BUILD_ROOT} > "$BUILD_ROOT$rpmlint_logfile" || ret=1
|
||
|
|
cat "$BUILD_ROOT$rpmlint_logfile"
|
||
|
|
echo
|
||
|
|
+ umount -n $BUILD_ROOT/proc 2>/dev/null || true
|
||
|
|
if test "$ret" = 1; then
|
||
|
|
cleanup_and_exit 1
|
||
|
|
fi
|