Accepting request 574760: fixing changelog, includes also the SLE 11 change, you need to drop build-mkbaselibs-sle package link and prjconf entries. Also in Leap and SLE 15

- add sysrq functionality for KVM builds
- add initial SLES 15 config

 
- add own baselibs config for SLE 11

Rev openSUSE:Factory/113 Md5 dfbaebe5dca0af79ede10250d14d19e6 2018-02-14 08:17:12 dimstar_suse 574760
This commit is contained in:
OBS User dimstar_suse 2018-02-14 08:17:12 +00:00 committed by Git OBS Bridge
commit f572b779d8
10 changed files with 24 additions and 99 deletions

View File

@ -1,5 +1,5 @@
pkgname=build
pkgver=20180124
pkgver=20180209
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')

View File

@ -5,8 +5,6 @@
<param name="scm">git</param>
<param name="extract">dist/build.changes</param>
<param name="extract">dist/build.spec</param>
<param name="extract">dist/build-mkbaselibs-sle.changes</param>
<param name="extract">dist/build-mkbaselibs-sle.spec</param>
<param name="extract">dist/build.dsc</param>
<param name="extract">dist/debian.changelog</param>
<param name="extract">dist/debian.compat</param>

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- add own baselibs config for SLE 11
-------------------------------------------------------------------
Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de

View File

@ -1,6 +1,6 @@
Format: 1.0
Source: build
Version: 20180124
Version: 20180209
Binary: build
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all

View File

@ -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: 20180209
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

View File

@ -1,4 +1,4 @@
build (20180124) unstable; urgency=low
build (20180209) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d5f3d1e390ef1b16014590f15b78936a2341ecf5d8a9cd3e70e170722237127
size 331007

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d017767bc499ceea18458016baf4506cfff8b408d2518cc1e4c8786b9810363c
size 322116