From 7f5693cabafa792fc23e8d6757e4d0e4d82cd359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 5 Oct 2012 10:58:03 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=192 --- build.changes | 5 +++++ build.spec | 2 ++ master.diff | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 master.diff diff --git a/build.changes b/build.changes index 0d482bd5..f28cbc5d 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 5 10:58:15 UTC 2012 - adrian@suse.de + +- backport /proc mounting for rpmlint for factory + ------------------------------------------------------------------- Thu Sep 27 07:33:21 UTC 2012 - coolo@suse.com diff --git a/build.spec b/build.spec index d10df820..1e8cb614 100644 --- a/build.spec +++ b/build.spec @@ -24,6 +24,7 @@ Version: 20120927 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz +Patch0: master.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -87,6 +88,7 @@ for generating delta rpm packages. %prep %setup -q -n obs-build-%version +%patch0 -p1 %build diff --git a/master.diff b/master.diff new file mode 100644 index 00000000..d08c13a4 --- /dev/null +++ b/master.diff @@ -0,0 +1,25 @@ +From 7d1bfa52e9d2ffd60019481c1e3b96aa06d625ff Mon Sep 17 00:00:00 2001 +From: Andreas Jaeger +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