diff --git a/PKGBUILD b/PKGBUILD index 135ca4e..4250f25 100644 --- a/PKGBUILD +++ b/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 ..." diff --git a/build-initvm.spec b/build-initvm.spec index cef4a23..56e5a6a 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -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 diff --git a/build.changes b/build.changes index f28cbc5..811e8fc 100644 --- a/build.changes +++ b/build.changes @@ -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 diff --git a/build.dsc b/build.dsc index 61262b9..d287193 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20120927 +Version: 20121123 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 1e8cb61..c96ae49 100644 --- a/build.spec +++ b/build.spec @@ -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 diff --git a/master.diff b/master.diff deleted file mode 100644 index d08c13a..0000000 --- a/master.diff +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/obs-build-20120927.tar.gz b/obs-build-20120927.tar.gz deleted file mode 100644 index 8e8dd1d..0000000 --- a/obs-build-20120927.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efccb4d8b7e0f91c762ce23cea6d49753350aff5cc02683ffe080b21f1271bd7 -size 155188 diff --git a/obs-build-20121123.tar.gz b/obs-build-20121123.tar.gz new file mode 100644 index 0000000..1faec18 --- /dev/null +++ b/obs-build-20121123.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db8e258a1deaac850536108fc8537fa81b3fef074c617fc790322659bbd32e99 +size 141864 diff --git a/osc b/osc new file mode 100644 index 0000000..e69de29