From f78fded2af9e6845050acc84bd262752ab8ddc57 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 21 Nov 2017 09:16:57 +0000 Subject: [PATCH 1/5] - buildignore the sle flavor of mkbaselibs for sle OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=339 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 6 +++++- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 5 ++++- debian.changelog | 2 +- obs-build-20171117.tar.gz | 3 --- obs-build-20171121.tar.gz | 3 +++ 8 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20171117.tar.gz create mode 100644 obs-build-20171121.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 69726831..e22c1089 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171117 +pkgver=20171121 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 58d6f62a..470d71de 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,14 +20,18 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20171117 +Version: 20171121 Release: 0 #!BuildIgnore: build-mkbaselibs +#!BuildIgnore: build-mkbaselibs-sle Provides: build-mkbaselibs Conflicts: otherproviders(build-mkbaselibs) Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if 0%{?is_opensuse} +ExclusiveArch: do-not-build +%endif %description This package contains the parts which may be installed in the inner build system diff --git a/build.changes b/build.changes index 4f06801a..14f810c3 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 21 09:12:41 UTC 2017 - coolo@suse.com + +- buildignore the sle flavor of mkbaselibs for sle + ------------------------------------------------------------------- Fri Nov 17 09:36:04 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 8fbf2aab..9e4ac1ae 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171117 +Version: 20171121 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 8f48002b..394affd1 100644 --- a/build.spec +++ b/build.spec @@ -22,13 +22,16 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20171117 +Version: 20171121 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +# mkbaselibs is pulled in by prjconf, but since we only build it here, does not exist when bootstrapping +#!BuildIgnore: build-mkbaselibs %if 0%{?suse_version} > 1200 # required for test suite +#!BuildIgnore: build-mkbaselibs-sle BuildRequires: build-mkbaselibs %endif # Keep the following dependencies in sync with obs-worker package diff --git a/debian.changelog b/debian.changelog index b8ae2d1e..dfcf55e8 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171117) unstable; urgency=low +build (20171121) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171117.tar.gz b/obs-build-20171117.tar.gz deleted file mode 100644 index 7e358889..00000000 --- a/obs-build-20171117.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23fd600470e5bfc557800132206b9ba96d1a47373229dec91beb6318b9fdda48 -size 311395 diff --git a/obs-build-20171121.tar.gz b/obs-build-20171121.tar.gz new file mode 100644 index 00000000..72a669f2 --- /dev/null +++ b/obs-build-20171121.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fce27b91b8c5b983921c6d5b79bb61da1866c72ef41fbb799565405cb041ac5 +size 288485 From 9ef75d93384444b500d245d258cb51d8b10542b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 22 Nov 2017 13:55:48 +0000 Subject: [PATCH 2/5] don't use debian/ folder anymore OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=340 --- PKGBUILD | 2 +- _service | 2 ++ build-mkbaselibs-sle.spec | 2 +- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- debian.compat | 1 + debian.rules | 65 +++++++++++++++++++++++++++++++++++++++ obs-build-20171121.tar.gz | 3 -- obs-build-20171122.tar.gz | 3 ++ 10 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 debian.compat create mode 100644 debian.rules delete mode 100644 obs-build-20171121.tar.gz create mode 100644 obs-build-20171122.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e22c1089..8203acb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171121 +pkgver=20171122 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index ded47635..5375fa1e 100644 --- a/_service +++ b/_service @@ -9,7 +9,9 @@ dist/build-mkbaselibs-sle.spec dist/build.dsc dist/debian.changelog + dist/debian.compat dist/debian.control + dist/debian.rules dist/PKGBUILD diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 470d71de..839bf5b9 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: 20171121 +Version: 20171122 Release: 0 #!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs-sle diff --git a/build.dsc b/build.dsc index 9e4ac1ae..7ce96c44 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171121 +Version: 20171122 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 394affd1..3ad4b72a 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: 20171121 +Version: 20171122 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index dfcf55e8..91353e62 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171121) unstable; urgency=low +build (20171122) 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 00000000..7ed6ff82 --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +5 diff --git a/debian.rules b/debian.rules new file mode 100644 index 00000000..fe59bc6a --- /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/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 diff --git a/obs-build-20171121.tar.gz b/obs-build-20171121.tar.gz deleted file mode 100644 index 72a669f2..00000000 --- a/obs-build-20171121.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fce27b91b8c5b983921c6d5b79bb61da1866c72ef41fbb799565405cb041ac5 -size 288485 diff --git a/obs-build-20171122.tar.gz b/obs-build-20171122.tar.gz new file mode 100644 index 00000000..ce24ac8f --- /dev/null +++ b/obs-build-20171122.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b3b3fa40c650d5c8762e1b4aac2ba82bbeb745f21ddde15c7968ce9acced084 +size 329410 From 580c5e93e62f904f6e68f0affd6cb3e3050b9bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 23 Nov 2017 08:19:17 +0000 Subject: [PATCH 3/5] fix build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=341 --- build.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build.spec b/build.spec index 3ad4b72a..01861b63 100644 --- a/build.spec +++ b/build.spec @@ -27,13 +27,7 @@ Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# mkbaselibs is pulled in by prjconf, but since we only build it here, does not exist when bootstrapping -#!BuildIgnore: build-mkbaselibs -%if 0%{?suse_version} > 1200 -# required for test suite -#!BuildIgnore: build-mkbaselibs-sle -BuildRequires: build-mkbaselibs -%endif +#!BuildIgnore: build-mkbaselibs build-mkbaselibs-sle # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: binutils @@ -209,6 +203,8 @@ echo "test suite is not prepared to run using qemu linux user" echo "Skipping test case" exit 0 %endif +# we need to patch the not packaged configs, due to the buildignore +sed -i 's,build-mkbaselibs,,' ../configs/*.conf ./testbuild.sh /.build.binaries/ %files From feea843e518dff1e323d053a5718c0a6b4600ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 28 Nov 2017 13:22:04 +0000 Subject: [PATCH 4/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=342 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20171122.tar.gz | 3 --- obs-build-20171127.tar.gz | 3 +++ 7 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20171122.tar.gz create mode 100644 obs-build-20171127.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8203acb2..7ba09eb3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171122 +pkgver=20171126 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 839bf5b9..8f4612e7 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: 20171122 +Version: 20171126 Release: 0 #!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs-sle diff --git a/build.dsc b/build.dsc index 7ce96c44..030609a5 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171122 +Version: 20171126 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 01861b63..00733b46 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: 20171122 +Version: 20171126 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 91353e62..3a4cab87 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171122) unstable; urgency=low +build (20171126) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171122.tar.gz b/obs-build-20171122.tar.gz deleted file mode 100644 index ce24ac8f..00000000 --- a/obs-build-20171122.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b3b3fa40c650d5c8762e1b4aac2ba82bbeb745f21ddde15c7968ce9acced084 -size 329410 diff --git a/obs-build-20171127.tar.gz b/obs-build-20171127.tar.gz new file mode 100644 index 00000000..76288ad6 --- /dev/null +++ b/obs-build-20171127.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e422bf8ac131ecaf0748a06b91cb27776b866b68f40a8f8a6b72094ffc43844a +size 311666 From 78d160828125f4ec84b1687d7bda3cee7cf83ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 28 Nov 2017 13:37:00 +0000 Subject: [PATCH 5/5] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=343 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20171127.tar.gz | 3 --- obs-build-20171128.tar.gz | 3 +++ 8 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20171127.tar.gz create mode 100644 obs-build-20171128.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 7ba09eb3..1a2f07fd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171126 +pkgver=20171128 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 8f4612e7..06eae72e 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: 20171126 +Version: 20171128 Release: 0 #!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs-sle diff --git a/build.changes b/build.changes index 14f810c3..c67f598c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de + +- Fixed Dockerfile repository parsing +- Improve file name check extractbuild +- track release number of containers +- Define SOURCEURL and PATCHURL macros +- Keep preinstalled packages +- add libidn2 and libunistring to preinstall for archlinux + ------------------------------------------------------------------- Tue Nov 21 09:12:41 UTC 2017 - coolo@suse.com diff --git a/build.dsc b/build.dsc index 030609a5..af7a7c3d 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171126 +Version: 20171128 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 00733b46..bfe89b26 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: 20171126 +Version: 20171128 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 3a4cab87..62a2b46c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171126) unstable; urgency=low +build (20171128) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171127.tar.gz b/obs-build-20171127.tar.gz deleted file mode 100644 index 76288ad6..00000000 --- a/obs-build-20171127.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e422bf8ac131ecaf0748a06b91cb27776b866b68f40a8f8a6b72094ffc43844a -size 311666 diff --git a/obs-build-20171128.tar.gz b/obs-build-20171128.tar.gz new file mode 100644 index 00000000..70bb41d4 --- /dev/null +++ b/obs-build-20171128.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:698a72371ef207fe4891514d8d7c544cddaffa10c3713844b7cc683b0fab8556 +size 312292