Accepting request 143852 from openSUSE:Tools
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/143852 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build?expand=0&rev=72
This commit is contained in:
commit
3d937ba8ae
4
PKGBUILD
4
PKGBUILD
@ -1,5 +1,5 @@
|
||||
pkgname=build
|
||||
pkgver=2012.07.19
|
||||
pkgver=20121123
|
||||
pkgrel=1
|
||||
pkgdesc="Build packages in sandbox"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0')
|
||||
groups=('base-devel')
|
||||
depends=('perl')
|
||||
source=(obs-build-${pkgver}.tar.gz)
|
||||
md5sums=('643d53f6327913eecf57fb6fa166db5e')
|
||||
md5sums=('2c66ccbe77cedb3f15d20816d6715440')
|
||||
|
||||
package() {
|
||||
msg "Installing build ..."
|
||||
|
@ -20,7 +20,7 @@ Name: build-initvm
|
||||
Summary: A Script to Build SUSE Linux RPMs
|
||||
License: GPL-2.0+
|
||||
Group: Development/Tools/Building
|
||||
Version: 20120927
|
||||
Version: 20121123
|
||||
Release: 0
|
||||
Source: obs-build-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 26 08:49:59 UTC 2012 - adrian@suse.de
|
||||
|
||||
- fixed deb building
|
||||
- collecting statistics during VM build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 5 10:58:15 UTC 2012 - adrian@suse.de
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
Format: 1.0
|
||||
Source: build
|
||||
Version: 20120927
|
||||
Version: 20121123
|
||||
Binary: build
|
||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||
Architecture: all
|
||||
|
@ -20,11 +20,10 @@ Name: build
|
||||
Summary: A Script to Build SUSE Linux RPMs
|
||||
License: GPL-2.0+ and GPL-2.0
|
||||
Group: Development/Tools/Building
|
||||
Version: 20120927
|
||||
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
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:efccb4d8b7e0f91c762ce23cea6d49753350aff5cc02683ffe080b21f1271bd7
|
||||
size 155188
|
3
obs-build-20121123.tar.gz
Normal file
3
obs-build-20121123.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:db8e258a1deaac850536108fc8537fa81b3fef074c617fc790322659bbd32e99
|
||||
size 141864
|
Loading…
Reference in New Issue
Block a user