From c212128307dca3882dcc75a07caca3b5461d0c5760dd218556dc4881c7f50f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 24 May 2017 12:23:10 +0000 Subject: [PATCH 01/20] use build descriptions from git OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=305 --- PKGBUILD | 2 +- _service | 10 ++++++ build.dsc | 2 +- build.spec | 21 +++---------- debian.changelog | 2 +- debian.compat | 1 + debian.control | 15 +++++++++ debian.copyright | 21 +++++++++++++ debian.docs | 1 + debian.rules | 65 +++++++++++++++++++++++++++++++++++++++ debian.tar.gz | 3 -- obs-build-20170320.tar.gz | 3 -- obs-build-20170524.tar.gz | 3 ++ 13 files changed, 123 insertions(+), 26 deletions(-) create mode 100644 debian.compat create mode 100644 debian.control create mode 100644 debian.copyright create mode 100644 debian.docs create mode 100644 debian.rules delete mode 100644 debian.tar.gz delete mode 100644 obs-build-20170320.tar.gz create mode 100644 obs-build-20170524.tar.gz diff --git a/PKGBUILD b/PKGBUILD index eb71cef..c4383c3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170320 +pkgver=20170524 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 49f8439..a80dd2b 100644 --- a/_service +++ b/_service @@ -3,6 +3,16 @@ %ad git://github.com/openSUSE/obs-build.git git + dist/build.changes + dist/build.dsc + dist/build.spec + dist/debian.changelog + dist/debian.compat + dist/debian.control + dist/debian.copyright + dist/debian.docs + dist/debian.rules + dist/PKGBUILD gz diff --git a/build.dsc b/build.dsc index 9495362..24339f7 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170320 +Version: 20170524-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 0d6d6ec..47a3c3a 100644 --- a/build.spec +++ b/build.spec @@ -18,13 +18,11 @@ # needsbinariesforbuild -%define version_unconverted 20170320 - Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170320 +Version: 20170524 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -140,11 +138,9 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%{?sle_version} && 0%{?is_opensuse} - # super special leap distro - major="$[%sle_version/10000+30]" - minor="$[%sle_version/100-1200]" - ln -s sl$major.$minor.conf default.conf +%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} +# super special leap distro + ln -s sl42.1.conf default.conf %else %if 0%{?suse_version} %if 0%{?sles_version} @@ -162,15 +158,6 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi -if [ ! -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then -%if 0%{?suse_version} - echo "ERROR: No default build conf, tests did not run!" - exit 1 -%else - echo "WARNING: No default build conf, tests did not run!" - exit 0 -%endif -fi # get back the default.conf link cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/ # do not get confused when building this already with build: diff --git a/debian.changelog b/debian.changelog index 4ced8ee..6baed3e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170320) unstable; urgency=low +build (20170524-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/debian.compat b/debian.compat new file mode 100644 index 0000000..fa10bb9 --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +4 diff --git a/debian.control b/debian.control new file mode 100644 index 0000000..0a7443a --- /dev/null +++ b/debian.control @@ -0,0 +1,15 @@ +Source: build +Section: devel +Priority: optional +Maintainer: Adrian Schroeter +Build-Depends: debhelper (>= 4) +Standards-Version: 3.7.2 + +Package: build +Architecture: all +Depends: ${perl:Depends}, rpm +Recommends: rpm2cpio +Description: A script to build SUSE Linux RPMs + This package provides a script for building RPMs for SUSE Linux + in a chroot environment. + diff --git a/debian.copyright b/debian.copyright new file mode 100644 index 0000000..084f24e --- /dev/null +++ b/debian.copyright @@ -0,0 +1,21 @@ +This package was debianized by Rene Engelhard on +Thu, 22 Jun 2006 12:01:08 +0200. + +It was downloaded from http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src + +Upstream authors: Thorsten Kukuk + Michael Schröter + Bernhard Kaindl + Mad Martin Jorgensen + Andreas Schwab + Rüdiger Oertel + Andreas Gruenbacher + +Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany + +License: + +GPL + +The Debian packaging is (C) 2006, Rene Engelhard and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian.docs b/debian.docs new file mode 100644 index 0000000..0960002 --- /dev/null +++ b/debian.docs @@ -0,0 +1 @@ +README diff --git a/debian.rules b/debian.rules new file mode 100644 index 0000000..a14b7d0 --- /dev/null +++ b/debian.rules @@ -0,0 +1,65 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany +# This file and all modifications and additions to the pristine package +# are under the same license as the package itself. +# +# Please submit bugfixes or commens via http://bugs.opensuse.org + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL=/bin/bash + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + make DESTDIR=$(CURDIR)/debian/build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index 0eeb55b..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9046961c3e5f2f0f18a2d8bcd83e83dbb84953ee5fbbf45c01ba3c217a9c6eb3 -size 1561 diff --git a/obs-build-20170320.tar.gz b/obs-build-20170320.tar.gz deleted file mode 100644 index b2e2d86..0000000 --- a/obs-build-20170320.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5840e93399c30643bf5f24749b08dd5068951b92c053f3389cb6f64f71bef719 -size 259476 diff --git a/obs-build-20170524.tar.gz b/obs-build-20170524.tar.gz new file mode 100644 index 0000000..e0c150a --- /dev/null +++ b/obs-build-20170524.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f79dcb812c6b91936cd95dbc748bc9f71b26dd15e2b8a5c3c966db56a45584af +size 285225 From 17d37f5d10e08af11ac4852aa56c0f24a9a4265230fd4d5a8b08a807af1bf602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 11 Jun 2017 12:09:50 +0000 Subject: [PATCH 02/20] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=306 --- PKGBUILD | 2 +- build.changes | 11 +++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20170524.tar.gz | 3 --- obs-build-20170611.tar.gz | 3 +++ 7 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 obs-build-20170524.tar.gz create mode 100644 obs-build-20170611.tar.gz diff --git a/PKGBUILD b/PKGBUILD index c4383c3..8c2b6a0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170524 +pkgver=20170611 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 3ab3621..00bd25b 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Jun 11 12:06:17 UTC 2017 - adrian@suse.de + +- added initial leap 15.0 config +- drop %opensuse_bs from the configs which are only used outside of OBS +- fixed kvm detection for newer Ubuntu versions +- Kiwi: Fix versionstring function +- Make repoprioritoes opt-in +- Normalize arch repository dependencies +- initial native docker container build support + ------------------------------------------------------------------- Fri Mar 17 12:57:03 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 24339f7..639320a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170524-0 +Version: 20170611-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 47a3c3a..27f7311 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170524 +Version: 20170611 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 6baed3e..4145a4e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170524-0) unstable; urgency=low +build (20170611-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170524.tar.gz b/obs-build-20170524.tar.gz deleted file mode 100644 index e0c150a..0000000 --- a/obs-build-20170524.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f79dcb812c6b91936cd95dbc748bc9f71b26dd15e2b8a5c3c966db56a45584af -size 285225 diff --git a/obs-build-20170611.tar.gz b/obs-build-20170611.tar.gz new file mode 100644 index 0000000..2c53670 --- /dev/null +++ b/obs-build-20170611.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd33787c8bd0a6725a36449d3d5dff3eac8d14339e6801381d09c2a62683630e +size 299205 From 33c1a88042cb4f14c9422b805576eadfb17c4acd2d5bfd3370da72344618f2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 13 Jun 2017 09:54:09 +0000 Subject: [PATCH 03/20] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=308 --- PKGBUILD | 2 +- _multibuild | 6 ++++ _service | 4 ++- build-mkbaselibs-sle.changes | 15 +++++++++ build-mkbaselibs-sle.spec | 59 ++++++++++++++++++++++++++++++++++++ build.changes | 11 ------- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20170611.tar.gz | 3 -- obs-build-20170613.tar.gz | 3 ++ 11 files changed, 90 insertions(+), 19 deletions(-) create mode 100644 _multibuild create mode 100644 build-mkbaselibs-sle.changes create mode 100644 build-mkbaselibs-sle.spec delete mode 100644 obs-build-20170611.tar.gz create mode 100644 obs-build-20170613.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8c2b6a0..bb6d380 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170611 +pkgver=20170613 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..aa629ab --- /dev/null +++ b/_multibuild @@ -0,0 +1,6 @@ + + + build + + diff --git a/_service b/_service index a80dd2b..4dee565 100644 --- a/_service +++ b/_service @@ -4,8 +4,10 @@ git://github.com/openSUSE/obs-build.git git dist/build.changes - dist/build.dsc dist/build.spec + dist/build-mkbaselibs-sle.changes + dist/build-mkbaselibs-sle.spec + dist/build.dsc dist/debian.changelog dist/debian.compat dist/debian.control diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes new file mode 100644 index 0000000..f7e3e58 --- /dev/null +++ b/build-mkbaselibs-sle.changes @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de + +- provide build-mkbaselibs so this can really be used + +------------------------------------------------------------------- +Tue Jun 7 09:31:51 UTC 2011 - k0da@opensuse.org + +- fix build + +------------------------------------------------------------------- +Mon Jun 6 15:12:13 UTC 2011 - adrian@suse.de + +- new package for SLE baselibsconf, including ia64 arch defaults + diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec new file mode 100644 index 0000000..3a58033 --- /dev/null +++ b/build-mkbaselibs-sle.spec @@ -0,0 +1,59 @@ +# +# spec file for package build-mkbaselibs-sle +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: build-mkbaselibs-sle +Summary: Tools to generate base lib packages +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 20170613 +Release: 0 +#!BuildIgnore: build-mkbaselibs +Provides: build-mkbaselibs +Source: build-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +# Manual requires to avoid hard require to bash-static +AutoReqProv: off + +%description +This package contains the parts which may be installed in the inner build system +for generating base lib packages. + +This is the SLE variant including IA64 binary generation. + +%prep +%setup -q -n build-%{version} + +%build + +%install +install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build +install -m 0755 mkbaselibs \ + $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs +install -m 0644 baselibs_global-deb.conf \ + $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf +install -m 0644 baselibs_global-sle.conf \ + $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf + +%files +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkbaselibs +/usr/lib/build/baselibs* + +%changelog diff --git a/build.changes b/build.changes index 00bd25b..3ab3621 100644 --- a/build.changes +++ b/build.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Sun Jun 11 12:06:17 UTC 2017 - adrian@suse.de - -- added initial leap 15.0 config -- drop %opensuse_bs from the configs which are only used outside of OBS -- fixed kvm detection for newer Ubuntu versions -- Kiwi: Fix versionstring function -- Make repoprioritoes opt-in -- Normalize arch repository dependencies -- initial native docker container build support - ------------------------------------------------------------------- Fri Mar 17 12:57:03 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 639320a..cf1d445 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170611-0 +Version: 20170613-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 27f7311..f2e0494 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170611 +Version: 20170613 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 4145a4e..3402874 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170611-0) unstable; urgency=low +build (20170613-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170611.tar.gz b/obs-build-20170611.tar.gz deleted file mode 100644 index 2c53670..0000000 --- a/obs-build-20170611.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd33787c8bd0a6725a36449d3d5dff3eac8d14339e6801381d09c2a62683630e -size 299205 diff --git a/obs-build-20170613.tar.gz b/obs-build-20170613.tar.gz new file mode 100644 index 0000000..22c6b35 --- /dev/null +++ b/obs-build-20170613.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea468a8c5ecd04070070226fa235a289047262d28515c249cb40e8a857cfc43 +size 299151 From 2a62681a28ce0c3ef9145ca1a3e0e205990cbef9aa444a000d49e526a9cc688d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Jul 2017 11:32:17 +0000 Subject: [PATCH 04/20] Accepting request 510272 from home:bluca:branches:openSUSE:Tools Extract new dist/debian.links added by https://github.com/openSUSE/obs-build/pull/368 OBS-URL: https://build.opensuse.org/request/show/510272 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=309 --- _service | 1 + 1 file changed, 1 insertion(+) diff --git a/_service b/_service index 4dee565..4c4396d 100644 --- a/_service +++ b/_service @@ -14,6 +14,7 @@ dist/debian.copyright dist/debian.docs dist/debian.rules + dist/debian.links dist/PKGBUILD From 97b1d3c4875b483200acb8a59fbf41dcd340ec7fa2c1a9a1d9a6210f0ffa8d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 19 Jul 2017 17:23:42 +0000 Subject: [PATCH 05/20] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=310 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 4 +--- build.changes | 15 +++++++++++++++ build.dsc | 2 +- build.spec | 4 +--- debian.changelog | 2 +- debian.compat | 2 +- debian.control | 7 +++++-- debian.rules | 2 +- obs-build-20170613.tar.gz | 3 --- obs-build-20170719.tar.gz | 3 +++ 11 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 obs-build-20170613.tar.gz create mode 100644 obs-build-20170719.tar.gz diff --git a/PKGBUILD b/PKGBUILD index bb6d380..1703bd5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170613 +pkgver=20170719 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 3a58033..a481f4d 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,15 +20,13 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170613 +Version: 20170719 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off %description This package contains the parts which may be installed in the inner build system diff --git a/build.changes b/build.changes index 3ab3621..bd49dbf 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jul 19 17:16:31 UTC 2017 - adrian@suse.de + +- Initial support for layered kiwi docker image builds +- Initial support of native docker format build support +- debootstrap: generate apt caches +- debtransform: use + for release version suffix +- support full timestamps in rpm changelog +- sync default architecture macros with current rpm 4.13.0 +- support release number handling for AppImage +- drop %opensuse_bs macros for standalone builds +- fix kvm detection for newer ubuntu systems +- build config updates +- lot's of smaller improvements + ------------------------------------------------------------------- Fri Mar 17 12:57:03 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index cf1d445..f1d5353 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170613-0 +Version: 20170719-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index f2e0494..2f2ca97 100644 --- a/build.spec +++ b/build.spec @@ -22,13 +22,11 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170613 +Version: 20170719 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off %if 0%{?suse_version} > 1200 # required for test suite BuildRequires: build-mkbaselibs diff --git a/debian.changelog b/debian.changelog index 3402874..280131d 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170613-0) unstable; urgency=low +build (20170719-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/debian.compat b/debian.compat index fa10bb9..2445c5e 100644 --- a/debian.compat +++ b/debian.compat @@ -1 +1 @@ -4 +5 diff --git a/debian.control b/debian.control index 0a7443a..b833e24 100644 --- a/debian.control +++ b/debian.control @@ -2,13 +2,16 @@ Source: build Section: devel Priority: optional Maintainer: Adrian Schroeter -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 -Package: build +Package: obs-build Architecture: all Depends: ${perl:Depends}, rpm Recommends: rpm2cpio +Conflicts: build +Replaces: build +Provides: build Description: A script to build SUSE Linux RPMs This package provides a script for building RPMs for SUSE Linux in a chroot environment. diff --git a/debian.rules b/debian.rules index a14b7d0..652314a 100644 --- a/debian.rules +++ b/debian.rules @@ -41,7 +41,7 @@ install: build dh_testroot dh_clean -k dh_installdirs - make DESTDIR=$(CURDIR)/debian/build install + make DESTDIR=$(CURDIR)/debian/obs-build install binary-arch: build install dh_testdir diff --git a/obs-build-20170613.tar.gz b/obs-build-20170613.tar.gz deleted file mode 100644 index 22c6b35..0000000 --- a/obs-build-20170613.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ea468a8c5ecd04070070226fa235a289047262d28515c249cb40e8a857cfc43 -size 299151 diff --git a/obs-build-20170719.tar.gz b/obs-build-20170719.tar.gz new file mode 100644 index 0000000..1ce04c8 --- /dev/null +++ b/obs-build-20170719.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ed40bb4fcc8bf567f8fa9dda67baed210f44b565b90a10637bfe7830cbfa3be +size 302897 From e5ee4609eaa764afcb8c4458dc89577457530f8745274329eef2d97e5d079ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 19 Jul 2017 17:51:02 +0000 Subject: [PATCH 06/20] Accepting request 511464 from home:bluca:branches:openSUSE:Tools Extract debian.links - was added to the _service by this request: https://build.opensuse.org/package/rdiff/openSUSE:Tools/build?linkrev=base&rev=309 but it wasn't extracted in the last upload OBS-URL: https://build.opensuse.org/request/show/511464 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=311 --- debian.links | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian.links diff --git a/debian.links b/debian.links new file mode 100644 index 0000000..0bee0d0 --- /dev/null +++ b/debian.links @@ -0,0 +1,2 @@ +usr/bin/build usr/bin/obs-build +usr/lib/build usr/lib/obs-build From ffeeb40f9de160cd46b027d6c0dabb76ecc80a28c09c44a465f78466c7993751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 19 Jul 2017 18:06:21 +0000 Subject: [PATCH 07/20] skip test on fedory and friends OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=312 --- build.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.spec b/build.spec index 2f2ca97..51b2052 100644 --- a/build.spec +++ b/build.spec @@ -156,6 +156,10 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi +if [ ! -f "$RPM_BUILD_ROOT/usr/lib/build/configs/default.conf" ]; then + echo "WARNING: No default config, tests did not run!" + exit 0 +fi # get back the default.conf link cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/ # do not get confused when building this already with build: From 397b6288bf3695940ec5aa12fb1c74a99d9b4e4162d0c0a98bc154d23f8ed82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 19 Jul 2017 18:13:43 +0000 Subject: [PATCH 08/20] doesn't work this way OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=313 --- _multibuild | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 _multibuild diff --git a/_multibuild b/_multibuild deleted file mode 100644 index aa629ab..0000000 --- a/_multibuild +++ /dev/null @@ -1,6 +0,0 @@ - - - build - - From 3237392518dda2f328f70b5fb1f7f3da3138643bdf7f89134a8ddc1383b136d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 16:29:47 +0000 Subject: [PATCH 09/20] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=314 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 15 +++---------- build.dsc | 2 +- build.spec | 46 +++++++++++++++++++++++++++++---------- debian.changelog | 2 +- obs-build-20170719.tar.gz | 3 --- obs-build-20170720.tar.gz | 3 +++ 8 files changed, 45 insertions(+), 30 deletions(-) delete mode 100644 obs-build-20170719.tar.gz create mode 100644 obs-build-20170720.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 1703bd5..2b671f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170719 +pkgver=20170720 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index a481f4d..acf7347 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170719 +Version: 20170720 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index bd49dbf..20a6a88 100644 --- a/build.changes +++ b/build.changes @@ -1,17 +1,8 @@ ------------------------------------------------------------------- -Wed Jul 19 17:16:31 UTC 2017 - adrian@suse.de +Thu Jul 20 13:59:20 CEST 2017 - mls@suse.de -- Initial support for layered kiwi docker image builds -- Initial support of native docker format build support -- debootstrap: generate apt caches -- debtransform: use + for release version suffix -- support full timestamps in rpm changelog -- sync default architecture macros with current rpm 4.13.0 -- support release number handling for AppImage -- drop %opensuse_bs macros for standalone builds -- fix kvm detection for newer ubuntu systems -- build config updates -- lot's of smaller improvements +- switch baselibs scheme for debuginfo packages from + foo-debuginfo-32bit to foo-32bit-debuginfo [fate#323217] ------------------------------------------------------------------- Fri Mar 17 12:57:03 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index f1d5353..92fd3d2 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170719-0 +Version: 20170720-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 51b2052..fce0b9f 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170719 +Version: 20170720 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -135,20 +135,44 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install -cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} -# super special leap distro - ln -s sl42.1.conf default.conf -%else + +# tweak default config on suse %if 0%{?suse_version} -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf -%else - V=%suse_version - ln -s sl${V:0:2}.${V:2:1}.conf default.conf +cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +SUSE_V=%{?suse_version} +SLE_V=%{?sle_version} +%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315 +# this is SUSE Leap 42.X +ln -s sl42.${SLE_V:3:1}.conf default.conf %endif +%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version > 1315 +# this is SUSE Leap 15 and higher +ln -s sl${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf +%endif +%if !0%{?sle_version} && 0%{?is_opensuse} +# this is old openSUSE releases and Factory +ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf +%endif +%if 0%{?sle_version} && !0%{?is_opensuse} +# this is SUSE SLE 12 and higher +ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf +%endif +# make sure that we have a config test -e default.conf || exit 1 %endif + +# tweak baselibs config on suse +%if 0%{?suse_version} +cd $RPM_BUILD_ROOT/usr/lib/build +%if %suse_version == 1500 +# SLE 15 / Leap 15 +ln -sf baselibs_configs/baselibs_global-sle15.conf baselibs_global.conf +%endif +%if %suse_version <= 1315 +# SLE 12 / Leap 42 and older +ln -sf baselibs_configs/baselibs_global-sle12.conf baselibs_global.conf +%endif +test -e baselibs_global.conf || exit 1 %endif %check diff --git a/debian.changelog b/debian.changelog index 280131d..bcb88b0 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170719-0) unstable; urgency=low +build (20170720-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170719.tar.gz b/obs-build-20170719.tar.gz deleted file mode 100644 index 1ce04c8..0000000 --- a/obs-build-20170719.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ed40bb4fcc8bf567f8fa9dda67baed210f44b565b90a10637bfe7830cbfa3be -size 302897 diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz new file mode 100644 index 0000000..25a1265 --- /dev/null +++ b/obs-build-20170720.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0218b60bee43846aca4734548a257cc7267fd792046e3f3c3806367bea7ceeb0 +size 304052 From d45d4546a3c221a9e33e0c5a84b8f19a12f8f4704896f82300f6989f90d2c58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 16:41:00 +0000 Subject: [PATCH 10/20] old sle 11 and opensuse fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=315 --- build.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.spec b/build.spec index fce0b9f..50ef265 100644 --- a/build.spec +++ b/build.spec @@ -149,7 +149,7 @@ ln -s sl42.${SLE_V:3:1}.conf default.conf # this is SUSE Leap 15 and higher ln -s sl${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif -%if !0%{?sle_version} && 0%{?is_opensuse} +%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 ) # this is old openSUSE releases and Factory ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf %endif @@ -157,6 +157,10 @@ ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf # this is SUSE SLE 12 and higher ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif +%if 0%{?sles_version} == 1110 +# this is SUSE SLE 11 +ln -s sles11sp2.conf default.conf +%endif # make sure that we have a config test -e default.conf || exit 1 %endif From 066ea2ebfdf7cb0d0031ae983c37800514836014742bb3290c0c81b1b93167e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 16:57:48 +0000 Subject: [PATCH 11/20] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=316 --- obs-build-20170720.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz index 25a1265..891a03b 100644 --- a/obs-build-20170720.tar.gz +++ b/obs-build-20170720.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0218b60bee43846aca4734548a257cc7267fd792046e3f3c3806367bea7ceeb0 -size 304052 +oid sha256:759c3f6aa536d5f0c4e532478a9c06c5c95fb02e1d8aeacfc9400cc08c0364bf +size 303721 From 7c33787018440dcc96bbb90f84f0184c9b94b8ce328fc82c7b61fd0f62130bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 17:17:10 +0000 Subject: [PATCH 12/20] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=317 --- build-mkbaselibs-sle.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index acf7347..59e60aa 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -24,7 +24,7 @@ Version: 20170720 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -35,7 +35,7 @@ for generating base lib packages. This is the SLE variant including IA64 binary generation. %prep -%setup -q -n build-%{version} +%setup -q -n obs-build-%{version} %build From 13c604f226d202068407a5e3d9c92e18b4de94b59085baa7ab60240c7afb8945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 17:22:11 +0000 Subject: [PATCH 13/20] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=318 --- _service | 7 ------- obs-build-20170720.tar.gz | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/_service b/_service index 4c4396d..da1cb58 100644 --- a/_service +++ b/_service @@ -8,13 +8,6 @@ dist/build-mkbaselibs-sle.changes dist/build-mkbaselibs-sle.spec dist/build.dsc - dist/debian.changelog - dist/debian.compat - dist/debian.control - dist/debian.copyright - dist/debian.docs - dist/debian.rules - dist/debian.links dist/PKGBUILD diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz index 891a03b..bc7e3f1 100644 --- a/obs-build-20170720.tar.gz +++ b/obs-build-20170720.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:759c3f6aa536d5f0c4e532478a9c06c5c95fb02e1d8aeacfc9400cc08c0364bf -size 303721 +oid sha256:8da6b3954deb088639510e970b92d25ea7b4465316a7b5fcbedaaa4a688449da +size 304823 From 7e74cd9acf3d567c41c2629f1e3f851fbc18212befab5728d8c803233d8aa93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 17:25:52 +0000 Subject: [PATCH 14/20] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=319 --- debian.changelog | 201 ----------------------------------------------- debian.compat | 1 - debian.control | 18 ----- debian.copyright | 21 ----- debian.docs | 1 - debian.links | 2 - debian.rules | 65 --------------- 7 files changed, 309 deletions(-) delete mode 100644 debian.changelog delete mode 100644 debian.compat delete mode 100644 debian.control delete mode 100644 debian.copyright delete mode 100644 debian.docs delete mode 100644 debian.links delete mode 100644 debian.rules diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index bcb88b0..0000000 --- a/debian.changelog +++ /dev/null @@ -1,201 +0,0 @@ -build (20170720-0) unstable; urgency=low - - * Update to current git trunk - - add sles11sp2 build config and adapt autodetection - - -- Michael Schroeder Mon, 10 Oct 2011 19:30:22 +0200 - -build (2011.09.26-1) unstable; urgency=low - - * Update to current git trunk - - -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 - -build (2011.07.01-1) unstable; urgency=low - - * Update to current git trunk - - -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 - -build (2010.12.15-1) unstable; urgency=low - - * Update to current git trunk - - support bsdtar for setting up build enviroment - - make expanddeps use the highest version of a package if multiple - versions aver available in a repository [bnc#656599] - - -- Michael Schroeder Wed, 15 Dec 2010 14:08:29 +0200 - -build (2010.07.28-1) unstable; urgency=low - - * Update to current git trunk - - document --repo and --dist - - update wiki links - - fix bugs in repo handling - - fix distribution autodetection code - - -- Michael Schroeder Wed, 28 Jul 2010 12:46:52 +0200 - -build (2010.07.08-1) unstable; urgency=low - - * Update to current git trunk - - -- Adrian Schroeter Wed, 08 Jul 2010 10:03:54 +0200 - -build (2010.06.29-1) unstable; urgency=low - - * Update to current git trunk - - add 11.3 config - - fix repo creation in --noinit case - - support ovf files directly - - allow multiple --oldpackages - - delta rpm support - - -- Adrian Schroeter Tue, 29 Jun 2010 10:03:54 +0200 - -build (2010.02.02-1) unstable; urgency=low - - * Update to current git trunk - - Support new kiwi 4.1 schema files - - -- Adrian Schroeter Tue, 02 Feb 2010 10:03:54 +0200 - -build (2009.09.23-1) unstable; urgency=low - - * Update to current svn trunk - - -- Michael Schroeder Wed, 23 Sep 2009 12:03:54 +0200 - -build (2009.04.20-1) unstable; urgency=low - - * Update to current svn trunk - - -- Adrian Schroeter Mon, 20 Feb 2009 08:27:13 +0200 - -build (2009.02.20-1) unstable; urgency=low - - * Fix kvm support together with Alexander - * Support for new disturl containing a complete pointer to build - service instance resource - * add support for package compare to allow Build Service to drop - same packages after build - * image repack support from Christoph - - -- Adrian Schroeter Fri, 20 Feb 2009 08:27:13 +0200 - -build (2007.09.14-1) unstable; urgency=low - - * update to 2173: - - add sl10.3 config [#310089] - - also look for BuildRequires in subpackage definitions [#305568] - - allow removal of more config parameters - - -- Michael Schroeder Fri, 14 Sep 2007 18:27:13 +0200 - -build (2007.08.02-1) unstable; urgency=low - - * update to 1902: - - support 'order' config option - - support 'patterntype' config option - - new setdeps() method - - support for flexible query options - - support 'description' query - - fix bug in changelog2spec time cutoff - - make debtransform understand Debtransform-Tar/Debtransform-Files-Tar/ - Debtransform-Series - - fix bug in substitutedeps - - -- Michael Schroeder Thu, 2 Aug 2007 15:58:48 +0200 - -build (2007.06.13-1) unstable; urgency=low - - * update to 1727: - - implement rpm installation order calculation in perl - - make substitute code modify requires, too - - add filelist query support - - add prereq parsing support - - speed up version comparison a bit - - -- Michael Schroeder Wed, 13 Jun 2007 17:18:17 +0100 - -build (2007.05.10-1) unstable; urgency=low - - * update to 1653: - - add _vendor to configs - - fix deban dependency compare - - allow not operator in configs - - fix build from source rpms - - -- Michael Schroeder Thu, 10 May 2007 20:02:29 +0100 - -build (2007.04.12-1) unstable; urgency=low - - * update to 1575: - - add --root to rpm call in rpm to work around a bug in rpm [#255720] - - -- Michael Schroeder Thu, 12 Apr 2007 16:22:51 +0100 - -build (2007.04.05-1) unstable; urgency=low - - * update to 1561: - - support architecture dependand requires in dsc files - - support "global" definitions for rpm - - support vminstall config option - - -- Michael Schroeder Thu, 5 Apr 2007 16:01:51 +0100 - -build (2007.03.12-1) unstable; urgency=low - - * update to r1419: - - fix buildroot in debtransform call - - obey version numbers when expanding - - -- Michael Schroeder Mon, 12 Mar 2007 15:42:48 +0100 - -build (2007.03.02-1) unstable; urgency=low - - * update - - transform suse changes file to rpm specfile format - - improved debian support - - -- Michael Schroeder Fri, 2 Mar 2007 21:22:41 +0100 - -build (2007.01.26-1) unstable; urgency=low - - * update to r1114 - - re-add the lost unrpm script - - make exclarch an array - - remount root rw in xen case, needed if root is not reiserfs - - add repotype/runscripts options - - remove devs in sl10.1/10.2 - - fix boolean test to make "00" false like rpm does - - add rpm_verscmp for version comparison - - runscripts - - macro blocks - - read_config_dist - - useful xen exit status - - add --kill - - update 10.2 config - - extend spec/dsc parser - - fixed two bugs in the specfile parser - - -- Peter Poeml Fri, 26 Jan 2007 14:15:22 +0100 - -build (2006.10.5-1) unstable; urgency=low - - * update for fixed XEN build - - -- Michael Schroeder Thu, 5 Oct 2006 10:58:42 +0200 - -build (2006.8.10-1) unstable; urgency=low - - * update for fixed XEN build and proc mounting - - -- Adrian Schroeter Thu, 10 Aug 2006 12:01:08 +0200 - -build (2006.6.14-1) unstable; urgency=low - - * Initial release based on build-2006.6.14-5.1.src.rpm - - -- Rene Engelhard Thu, 22 Jun 2006 12:01:08 +0200 - diff --git a/debian.compat b/debian.compat deleted file mode 100644 index 2445c5e..0000000 --- a/debian.compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian.control b/debian.control deleted file mode 100644 index b833e24..0000000 --- a/debian.control +++ /dev/null @@ -1,18 +0,0 @@ -Source: build -Section: devel -Priority: optional -Maintainer: Adrian Schroeter -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 - -Package: obs-build -Architecture: all -Depends: ${perl:Depends}, rpm -Recommends: rpm2cpio -Conflicts: build -Replaces: build -Provides: build -Description: A script to build SUSE Linux RPMs - This package provides a script for building RPMs for SUSE Linux - in a chroot environment. - diff --git a/debian.copyright b/debian.copyright deleted file mode 100644 index 084f24e..0000000 --- a/debian.copyright +++ /dev/null @@ -1,21 +0,0 @@ -This package was debianized by Rene Engelhard on -Thu, 22 Jun 2006 12:01:08 +0200. - -It was downloaded from http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src - -Upstream authors: Thorsten Kukuk - Michael Schröter - Bernhard Kaindl - Mad Martin Jorgensen - Andreas Schwab - Rüdiger Oertel - Andreas Gruenbacher - -Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany - -License: - -GPL - -The Debian packaging is (C) 2006, Rene Engelhard and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian.docs b/debian.docs deleted file mode 100644 index 0960002..0000000 --- a/debian.docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian.links b/debian.links deleted file mode 100644 index 0bee0d0..0000000 --- a/debian.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/build usr/bin/obs-build -usr/lib/build usr/lib/obs-build diff --git a/debian.rules b/debian.rules deleted file mode 100644 index 652314a..0000000 --- a/debian.rules +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany -# This file and all modifications and additions to the pristine package -# are under the same license as the package itself. -# -# Please submit bugfixes or commens via http://bugs.opensuse.org - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -SHELL=/bin/bash - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - make DESTDIR=$(CURDIR)/debian/obs-build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure From a3fbafd0ded4a22c104f7815c1202bd917f0649772b583879297468742a60f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 17:43:25 +0000 Subject: [PATCH 15/20] try OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=320 --- _service | 1 + debian.control | 18 ++++++++++++++++++ obs-build-20170720.tar.gz | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian.control diff --git a/_service b/_service index da1cb58..7e88fe2 100644 --- a/_service +++ b/_service @@ -8,6 +8,7 @@ dist/build-mkbaselibs-sle.changes dist/build-mkbaselibs-sle.spec dist/build.dsc + dist/debian.control dist/PKGBUILD diff --git a/debian.control b/debian.control new file mode 100644 index 0000000..b833e24 --- /dev/null +++ b/debian.control @@ -0,0 +1,18 @@ +Source: build +Section: devel +Priority: optional +Maintainer: Adrian Schroeter +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 + +Package: obs-build +Architecture: all +Depends: ${perl:Depends}, rpm +Recommends: rpm2cpio +Conflicts: build +Replaces: build +Provides: build +Description: A script to build SUSE Linux RPMs + This package provides a script for building RPMs for SUSE Linux + in a chroot environment. + diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz index bc7e3f1..3f223a9 100644 --- a/obs-build-20170720.tar.gz +++ b/obs-build-20170720.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da6b3954deb088639510e970b92d25ea7b4465316a7b5fcbedaaa4a688449da -size 304823 +oid sha256:778e6a7d2e474ee6c37ae61e6d7bac42d60683eddfcfe7eed5c742641bb2bf0d +size 304862 From 6e05f9ca83ed15122db463f98e7b5e56727dc57e24e49e55437c3ca84ae74582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 17:51:51 +0000 Subject: [PATCH 16/20] add debian.changelog again OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=321 --- _service | 1 + debian.changelog | 201 ++++++++++++++++++++++++++++++++++++++ obs-build-20170720.tar.gz | 4 +- 3 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 debian.changelog diff --git a/_service b/_service index 7e88fe2..aa42839 100644 --- a/_service +++ b/_service @@ -8,6 +8,7 @@ dist/build-mkbaselibs-sle.changes dist/build-mkbaselibs-sle.spec dist/build.dsc + dist/debian.changelog dist/debian.control dist/PKGBUILD diff --git a/debian.changelog b/debian.changelog new file mode 100644 index 0000000..bcb88b0 --- /dev/null +++ b/debian.changelog @@ -0,0 +1,201 @@ +build (20170720-0) unstable; urgency=low + + * Update to current git trunk + - add sles11sp2 build config and adapt autodetection + + -- Michael Schroeder Mon, 10 Oct 2011 19:30:22 +0200 + +build (2011.09.26-1) unstable; urgency=low + + * Update to current git trunk + + -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 + +build (2011.07.01-1) unstable; urgency=low + + * Update to current git trunk + + -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 + +build (2010.12.15-1) unstable; urgency=low + + * Update to current git trunk + - support bsdtar for setting up build enviroment + - make expanddeps use the highest version of a package if multiple + versions aver available in a repository [bnc#656599] + + -- Michael Schroeder Wed, 15 Dec 2010 14:08:29 +0200 + +build (2010.07.28-1) unstable; urgency=low + + * Update to current git trunk + - document --repo and --dist + - update wiki links + - fix bugs in repo handling + - fix distribution autodetection code + + -- Michael Schroeder Wed, 28 Jul 2010 12:46:52 +0200 + +build (2010.07.08-1) unstable; urgency=low + + * Update to current git trunk + + -- Adrian Schroeter Wed, 08 Jul 2010 10:03:54 +0200 + +build (2010.06.29-1) unstable; urgency=low + + * Update to current git trunk + - add 11.3 config + - fix repo creation in --noinit case + - support ovf files directly + - allow multiple --oldpackages + - delta rpm support + + -- Adrian Schroeter Tue, 29 Jun 2010 10:03:54 +0200 + +build (2010.02.02-1) unstable; urgency=low + + * Update to current git trunk + - Support new kiwi 4.1 schema files + + -- Adrian Schroeter Tue, 02 Feb 2010 10:03:54 +0200 + +build (2009.09.23-1) unstable; urgency=low + + * Update to current svn trunk + + -- Michael Schroeder Wed, 23 Sep 2009 12:03:54 +0200 + +build (2009.04.20-1) unstable; urgency=low + + * Update to current svn trunk + + -- Adrian Schroeter Mon, 20 Feb 2009 08:27:13 +0200 + +build (2009.02.20-1) unstable; urgency=low + + * Fix kvm support together with Alexander + * Support for new disturl containing a complete pointer to build + service instance resource + * add support for package compare to allow Build Service to drop + same packages after build + * image repack support from Christoph + + -- Adrian Schroeter Fri, 20 Feb 2009 08:27:13 +0200 + +build (2007.09.14-1) unstable; urgency=low + + * update to 2173: + - add sl10.3 config [#310089] + - also look for BuildRequires in subpackage definitions [#305568] + - allow removal of more config parameters + + -- Michael Schroeder Fri, 14 Sep 2007 18:27:13 +0200 + +build (2007.08.02-1) unstable; urgency=low + + * update to 1902: + - support 'order' config option + - support 'patterntype' config option + - new setdeps() method + - support for flexible query options + - support 'description' query + - fix bug in changelog2spec time cutoff + - make debtransform understand Debtransform-Tar/Debtransform-Files-Tar/ + Debtransform-Series + - fix bug in substitutedeps + + -- Michael Schroeder Thu, 2 Aug 2007 15:58:48 +0200 + +build (2007.06.13-1) unstable; urgency=low + + * update to 1727: + - implement rpm installation order calculation in perl + - make substitute code modify requires, too + - add filelist query support + - add prereq parsing support + - speed up version comparison a bit + + -- Michael Schroeder Wed, 13 Jun 2007 17:18:17 +0100 + +build (2007.05.10-1) unstable; urgency=low + + * update to 1653: + - add _vendor to configs + - fix deban dependency compare + - allow not operator in configs + - fix build from source rpms + + -- Michael Schroeder Thu, 10 May 2007 20:02:29 +0100 + +build (2007.04.12-1) unstable; urgency=low + + * update to 1575: + - add --root to rpm call in rpm to work around a bug in rpm [#255720] + + -- Michael Schroeder Thu, 12 Apr 2007 16:22:51 +0100 + +build (2007.04.05-1) unstable; urgency=low + + * update to 1561: + - support architecture dependand requires in dsc files + - support "global" definitions for rpm + - support vminstall config option + + -- Michael Schroeder Thu, 5 Apr 2007 16:01:51 +0100 + +build (2007.03.12-1) unstable; urgency=low + + * update to r1419: + - fix buildroot in debtransform call + - obey version numbers when expanding + + -- Michael Schroeder Mon, 12 Mar 2007 15:42:48 +0100 + +build (2007.03.02-1) unstable; urgency=low + + * update + - transform suse changes file to rpm specfile format + - improved debian support + + -- Michael Schroeder Fri, 2 Mar 2007 21:22:41 +0100 + +build (2007.01.26-1) unstable; urgency=low + + * update to r1114 + - re-add the lost unrpm script + - make exclarch an array + - remount root rw in xen case, needed if root is not reiserfs + - add repotype/runscripts options + - remove devs in sl10.1/10.2 + - fix boolean test to make "00" false like rpm does + - add rpm_verscmp for version comparison + - runscripts + - macro blocks + - read_config_dist + - useful xen exit status + - add --kill + - update 10.2 config + - extend spec/dsc parser + - fixed two bugs in the specfile parser + + -- Peter Poeml Fri, 26 Jan 2007 14:15:22 +0100 + +build (2006.10.5-1) unstable; urgency=low + + * update for fixed XEN build + + -- Michael Schroeder Thu, 5 Oct 2006 10:58:42 +0200 + +build (2006.8.10-1) unstable; urgency=low + + * update for fixed XEN build and proc mounting + + -- Adrian Schroeter Thu, 10 Aug 2006 12:01:08 +0200 + +build (2006.6.14-1) unstable; urgency=low + + * Initial release based on build-2006.6.14-5.1.src.rpm + + -- Rene Engelhard Thu, 22 Jun 2006 12:01:08 +0200 + diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz index 3f223a9..cbec0e5 100644 --- a/obs-build-20170720.tar.gz +++ b/obs-build-20170720.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778e6a7d2e474ee6c37ae61e6d7bac42d60683eddfcfe7eed5c742641bb2bf0d -size 304862 +oid sha256:dd2e81a5704541c48a5541f040da1c0bcd64fceaead702c9836071986236d01b +size 303973 From 2eed913edad20d944ab1e9b62460b61c4e5394e4dc802fcbf03e9d4d1ebe1309 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 2 Aug 2017 15:00:21 +0000 Subject: [PATCH 17/20] - Fix path to files - Temporary hack to aid liblua5_3 -> liblua5_3-5 renam OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=322 --- PKGBUILD | 2 +- build-mkbaselibs-sle.changes | 5 +++++ build-mkbaselibs-sle.spec | 6 +++--- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 7 ++++++- debian.changelog | 2 +- obs-build-20170720.tar.gz | 3 --- obs-build-20170802.tar.gz | 3 +++ 9 files changed, 25 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20170720.tar.gz create mode 100644 obs-build-20170802.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 2b671f8..ffd0d1f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170720 +pkgver=20170802 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index f7e3e58..0f6e237 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 2 14:58:59 UTC 2017 - lnussel@suse.de + +- Fix path to files + ------------------------------------------------------------------- Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 59e60aa..13dec99 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170720 +Version: 20170802 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs @@ -43,9 +43,9 @@ This is the SLE variant including IA64 binary generation. install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build install -m 0755 mkbaselibs \ $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs -install -m 0644 baselibs_global-deb.conf \ +install -m 0644 baselibs_configs/baselibs_global-deb.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf -install -m 0644 baselibs_global-sle.conf \ +install -m 0644 baselibs_configs/baselibs_global-sle.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %files diff --git a/build.changes b/build.changes index 20a6a88..e42e32c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de + +- Temporary hack to aid liblua5_3 -> liblua5_3-5 renam + ------------------------------------------------------------------- Thu Jul 20 13:59:20 CEST 2017 - mls@suse.de diff --git a/build.dsc b/build.dsc index 92fd3d2..b3b4ba9 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170720-0 +Version: 20170802-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 50ef265..f8555e8 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170720 +Version: 20170802 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,6 +122,11 @@ chroot or a secure virtualized %if 0%{?suse_version} # initvm make CFLAGS="$RPM_BUILD_FLAGS" initvm-all +#XXX temporary hack until lua is actually in +%if 0%{?suse_version} == 1330 + V=%suse_version + sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf +%endif %endif %install diff --git a/debian.changelog b/debian.changelog index bcb88b0..714736a 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170720-0) unstable; urgency=low +build (20170802-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz deleted file mode 100644 index cbec0e5..0000000 --- a/obs-build-20170720.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd2e81a5704541c48a5541f040da1c0bcd64fceaead702c9836071986236d01b -size 303973 diff --git a/obs-build-20170802.tar.gz b/obs-build-20170802.tar.gz new file mode 100644 index 0000000..b8c109d --- /dev/null +++ b/obs-build-20170802.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd3884dbba43347a793771938d1c8cf0c86eb766402aa718ba65b5f356a50dca +size 283909 From 4afeb177db2c5bb912c5b7f9bfd2996511d78ac65cce1410ee99309a3d8acac2 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 3 Aug 2017 12:59:19 +0000 Subject: [PATCH 18/20] Fix build in devel project OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=323 --- build.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.spec b/build.spec index f8555e8..94a2843 100644 --- a/build.spec +++ b/build.spec @@ -124,8 +124,10 @@ chroot or a secure virtualized make CFLAGS="$RPM_BUILD_FLAGS" initvm-all #XXX temporary hack until lua is actually in %if 0%{?suse_version} == 1330 - V=%suse_version - sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf +if rpm -q liblua5_3-5; then + V=%suse_version + sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf +fi %endif %endif From 0c8ae630459a889a5015b70f62720cb33f91d344542091781894462dff9de9d3 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 4 Aug 2017 06:27:08 +0000 Subject: [PATCH 19/20] - Temporary hack to aid liblua5_3 -> liblua5_3-5 rename OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=324 --- build.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.changes b/build.changes index e42e32c..2c3ed97 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de -- Temporary hack to aid liblua5_3 -> liblua5_3-5 renam +- Temporary hack to aid liblua5_3 -> liblua5_3-5 rename ------------------------------------------------------------------- Thu Jul 20 13:59:20 CEST 2017 - mls@suse.de From 69f2312f38f17c6c419e2118aa09fded48eac29657ea53aee6f38323b17d1e71 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 4 Aug 2017 07:51:19 +0000 Subject: [PATCH 20/20] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=326 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 4 ++-- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20170802.tar.gz | 3 --- obs-build-20170804.tar.gz | 3 +++ 7 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20170802.tar.gz create mode 100644 obs-build-20170804.tar.gz diff --git a/PKGBUILD b/PKGBUILD index ffd0d1f..9b5d819 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170802 +pkgver=20170804 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 13dec99..5489326 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170802 +Version: 20170804 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs @@ -45,7 +45,7 @@ install -m 0755 mkbaselibs \ $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs install -m 0644 baselibs_configs/baselibs_global-deb.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf -install -m 0644 baselibs_configs/baselibs_global-sle.conf \ +install -m 0644 baselibs_configs/baselibs_global.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %files diff --git a/build.dsc b/build.dsc index b3b4ba9..27456d2 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170802-0 +Version: 20170804-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 94a2843..e22bb7f 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170802 +Version: 20170804 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 714736a..9886167 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170802-0) unstable; urgency=low +build (20170804-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170802.tar.gz b/obs-build-20170802.tar.gz deleted file mode 100644 index b8c109d..0000000 --- a/obs-build-20170802.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd3884dbba43347a793771938d1c8cf0c86eb766402aa718ba65b5f356a50dca -size 283909 diff --git a/obs-build-20170804.tar.gz b/obs-build-20170804.tar.gz new file mode 100644 index 0000000..01ecc9a --- /dev/null +++ b/obs-build-20170804.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86f9e08880031b39a7ffbc8a889587710c09262fef747c5427a901a7a955edc0 +size 281132