fix
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=192
This commit is contained in:
parent
e0c4526ba8
commit
7f5693caba
@ -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
|
Thu Sep 27 07:33:21 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ Version: 20120927
|
|||||||
Release: 0
|
Release: 0
|
||||||
#!BuildIgnore: build-mkbaselibs
|
#!BuildIgnore: build-mkbaselibs
|
||||||
Source: obs-build-%{version}.tar.gz
|
Source: obs-build-%{version}.tar.gz
|
||||||
|
Patch0: master.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
# Manual requires to avoid hard require to bash-static
|
# Manual requires to avoid hard require to bash-static
|
||||||
@ -87,6 +88,7 @@ for generating delta rpm packages.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n obs-build-%version
|
%setup -q -n obs-build-%version
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
25
master.diff
Normal file
25
master.diff
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
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
|
Loading…
Reference in New Issue
Block a user