drop patch
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=197
This commit is contained in:
parent
3697ada9c5
commit
6e72711703
@ -24,7 +24,6 @@ Version: 20121123
|
||||
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
|
||||
@ -88,7 +87,6 @@ for generating delta rpm packages.
|
||||
|
||||
%prep
|
||||
%setup -q -n obs-build-%version
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
|
||||
|
25
master.diff
25
master.diff
@ -1,25 +0,0 @@
|
||||
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