From 0963e40c7bed686fdf8ed7cd978295eb1f90a0b6 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 28 Aug 2020 13:54:37 +0000 Subject: [PATCH 1/2] update Rev openSUSE:Tools/424 Md5 dbb1bfc3c070374de716663595ec599f 2020-08-28 13:54:37 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 8 +++++++- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200520.tar.gz | 3 --- obs-build-20200828.tar.gz | 3 +++ 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20200520.tar.gz create mode 100644 obs-build-20200828.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 4cfaba93..22e0fb2d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200520 +pkgver=20200828 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index aa7e3506..446c78ff 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200520 - 20200520 + 20200828 + 20200828 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 2e0c6c42..ab5fa038 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 28 13:48:06 UTC 2020 - Adrian Schröter + +- support rpmlint installed in /usr/bin/ as well +- Extract generated chart from the tarball instead of using the recipe + ------------------------------------------------------------------- Thu Aug 20 08:07:30 UTC 2020 - Adrian Schröter @@ -28,7 +34,7 @@ Thu Jul 23 05:38:24 UTC 2020 - Frank Schreiner - Control disk-space consumption while creating ccache archive - cleaning ccache - create folders before trying to copy ccache.tar -- Genreadte .packages and .basepackages files for docker builds +- Generate .packages and .basepackages files for docker builds ------------------------------------------------------------------- Sun May 17 14:32:52 UTC 2020 - coolo@suse.com diff --git a/build.dsc b/build.dsc index 6258ca8d..e861b9fe 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200520 +Version: 20200828 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index a46831ac..72802907 100644 --- a/build.spec +++ b/build.spec @@ -28,7 +28,7 @@ Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20200520 +Version: 20200828 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index fc5ef003..70f73a14 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200520) unstable; urgency=low +build (20200828) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200520.tar.gz b/obs-build-20200520.tar.gz deleted file mode 100644 index 65dc309f..00000000 --- a/obs-build-20200520.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6d55aaec553e144e5fb3bb207e4f1092215bb0a8779b4c13e4bd1a7f36fd41f -size 350782 diff --git a/obs-build-20200828.tar.gz b/obs-build-20200828.tar.gz new file mode 100644 index 00000000..8ed24e80 --- /dev/null +++ b/obs-build-20200828.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09119347c72e16af3a3ee485f7c4b9e2ce9cf65af53edb112d4b50cdb6eceac8 +size 350935 From dbc60ee2bac254439b619c8231b03ab72d8b1b92 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 28 Aug 2020 14:36:03 +0000 Subject: [PATCH 2/2] fix armv6 Rev openSUSE:Tools/425 Md5 f298e57d7dd19eb8d64c6b7677f4580b 2020-08-28 14:36:03 adrianSuSE None --- build.changes | 1 + obs-build-20200828.tar.gz | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.changes b/build.changes index ab5fa038..a45fc5ad 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,7 @@ Fri Aug 28 13:48:06 UTC 2020 - Adrian Schröter - support rpmlint installed in /usr/bin/ as well +- fix local build for armv6hl - Extract generated chart from the tarball instead of using the recipe ------------------------------------------------------------------- diff --git a/obs-build-20200828.tar.gz b/obs-build-20200828.tar.gz index 8ed24e80..c015d6da 100644 --- a/obs-build-20200828.tar.gz +++ b/obs-build-20200828.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09119347c72e16af3a3ee485f7c4b9e2ce9cf65af53edb112d4b50cdb6eceac8 -size 350935 +oid sha256:c935768d95da9726433508d1330167eba3983cb3e15963b68a3b40f181cb3d3d +size 350761