From 063f70f02d626b3cb3b71d48c6c0ccfe867b5554f51b512a572414b00be05da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 31 Jan 2018 13:40:03 +0000 Subject: [PATCH 1/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=348 --- PKGBUILD | 2 +- _service | 2 -- build-mkbaselibs-sle.changes | 26 --------------- build-mkbaselibs-sle.spec | 62 ------------------------------------ build.changes | 4 +-- build.dsc | 2 +- build.spec | 10 ++++-- debian.changelog | 2 +- obs-build-20180124.tar.gz | 3 -- obs-build-20180131.tar.gz | 3 ++ 10 files changed, 15 insertions(+), 101 deletions(-) delete mode 100644 build-mkbaselibs-sle.changes delete mode 100644 build-mkbaselibs-sle.spec delete mode 100644 obs-build-20180124.tar.gz create mode 100644 obs-build-20180131.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a2afea0..8d0546d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20180124 +pkgver=20180131 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 8423ad0..13edd30 100644 --- a/_service +++ b/_service @@ -5,8 +5,6 @@ git dist/build.changes dist/build.spec - dist/build-mkbaselibs-sle.changes - dist/build-mkbaselibs-sle.spec dist/build.dsc dist/debian.changelog dist/debian.compat diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes deleted file mode 100644 index f4d3d1a..0000000 --- a/build-mkbaselibs-sle.changes +++ /dev/null @@ -1,26 +0,0 @@ -------------------------------------------------------------------- -Wed Aug 23 10:44:57 UTC 2017 - dimstar@opensuse.org - -- Conflict with other implementations of mkbaselibs (packages - conflict on file level). - -------------------------------------------------------------------- -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 - -- 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 deleted file mode 100644 index 44a0022..0000000 --- a/build-mkbaselibs-sle.spec +++ /dev/null @@ -1,62 +0,0 @@ -# -# spec file for package build-mkbaselibs-sle -# -# Copyright (c) 2018 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: 20180124 -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 -for generating base lib packages. - -This is the SLE variant including IA64 binary generation. - -%prep -%setup -q -n obs-build-%{version} - -%build - -%install -install -m 0755 -d %{buildroot}/usr/lib/build -install -m 0755 mkbaselibs \ - %{buildroot}/usr/lib/build/mkbaselibs -install -m 0644 baselibs_configs/baselibs_global-deb.conf \ - %{buildroot}/usr/lib/build/baselibs_global-deb.conf -install -m 0644 baselibs_configs/baselibs_global.conf \ - %{buildroot}/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 8702e0a..33142f1 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de +Wed Jan 31 13:37:35 UTC 2018 - adrian@suse.de -- Fix picking of right changes file for changelog generation (boo#1077145) +- add own baselibs config for SLE 11 ------------------------------------------------------------------- Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 7ad811e..6ffd98c 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20180124 +Version: 20180131 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 85e0092..47b963c 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: 20180124 +Version: 20180131 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -169,10 +169,14 @@ cd %{buildroot}/usr/lib/build # 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 +%if %suse_version == 1315 +# SLE 12 / Leap 42 ln -sf baselibs_configs/baselibs_global-sle12.conf baselibs_global.conf %endif +%if %suse_version <= 1110 +# SLE 11 +ln -sf baselibs_configs/baselibs_global-sle11.conf baselibs_global.conf +%endif test -e baselibs_global.conf || exit 1 %endif diff --git a/debian.changelog b/debian.changelog index ee6c6f5..ccb1313 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20180124) unstable; urgency=low +build (20180131) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20180124.tar.gz b/obs-build-20180124.tar.gz deleted file mode 100644 index edde242..0000000 --- a/obs-build-20180124.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d5f3d1e390ef1b16014590f15b78936a2341ecf5d8a9cd3e70e170722237127 -size 331007 diff --git a/obs-build-20180131.tar.gz b/obs-build-20180131.tar.gz new file mode 100644 index 0000000..483c487 --- /dev/null +++ b/obs-build-20180131.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8ca4380a5b565c1f8d8e7ea279b8580809aeb59aa0a902913bf6d4c900fc0bb +size 312584 From 1db980a548eb49a8bf57eb8f17eb98acb671b339f656f13bd17f82b4a6935b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Feb 2018 15:19:40 +0000 Subject: [PATCH 2/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=349 --- PKGBUILD | 2 +- build.changes | 12 +++++++++++- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20180131.tar.gz | 3 --- obs-build-20180209.tar.gz | 3 +++ 7 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20180131.tar.gz create mode 100644 obs-build-20180209.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8d0546d..c3fe032 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20180131 +pkgver=20180209 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 33142f1..f1049dd 100644 --- a/build.changes +++ b/build.changes @@ -1,8 +1,18 @@ +------------------------------------------------------------------- +Fri Feb 9 15:17:38 UTC 2018 - adrian@suse.de + +- add sysrq functionality for KVM builds + ------------------------------------------------------------------- Wed Jan 31 13:37:35 UTC 2018 - adrian@suse.de - + - add own baselibs config for SLE 11 +------------------------------------------------------------------- +Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de + +- Fix picking of right changes file for changelog generation (boo#1077145) + ------------------------------------------------------------------- Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 6ffd98c..1a63de9 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20180131 +Version: 20180209 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 47b963c..8b8d616 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: 20180131 +Version: 20180209 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index ccb1313..38daa88 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20180131) unstable; urgency=low +build (20180209) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20180131.tar.gz b/obs-build-20180131.tar.gz deleted file mode 100644 index 483c487..0000000 --- a/obs-build-20180131.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8ca4380a5b565c1f8d8e7ea279b8580809aeb59aa0a902913bf6d4c900fc0bb -size 312584 diff --git a/obs-build-20180209.tar.gz b/obs-build-20180209.tar.gz new file mode 100644 index 0000000..cab84c1 --- /dev/null +++ b/obs-build-20180209.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4466126b0ff70b603d82ce5545ba51f52ecdf8492b4bae6c2418db2c444f297d +size 313248 From 1e5bd4ef8b6733a949fc01058864acc002f5565855e9906048b5f9879fb218fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Feb 2018 16:01:51 +0000 Subject: [PATCH 3/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=350 --- build.changes | 1 + obs-build-20180209.tar.gz | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.changes b/build.changes index f1049dd..7beedcc 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,7 @@ Fri Feb 9 15:17:38 UTC 2018 - adrian@suse.de - add sysrq functionality for KVM builds +- add initial SLES 15 config ------------------------------------------------------------------- Wed Jan 31 13:37:35 UTC 2018 - adrian@suse.de diff --git a/obs-build-20180209.tar.gz b/obs-build-20180209.tar.gz index cab84c1..ad40782 100644 --- a/obs-build-20180209.tar.gz +++ b/obs-build-20180209.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4466126b0ff70b603d82ce5545ba51f52ecdf8492b4bae6c2418db2c444f297d -size 313248 +oid sha256:d017767bc499ceea18458016baf4506cfff8b408d2518cc1e4c8786b9810363c +size 322116