Adrian Schröter 2017-07-20 16:29:47 +00:00 committed by Git OBS Bridge
parent 397b6288bf
commit 3237392518
8 changed files with 45 additions and 30 deletions

View File

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

View File

@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle
Summary: Tools to generate base lib packages Summary: Tools to generate base lib packages
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Version: 20170719 Version: 20170720
Release: 0 Release: 0
#!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs Provides: build-mkbaselibs

View File

@ -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 - switch baselibs scheme for debuginfo packages from
- Initial support of native docker format build support foo-debuginfo-32bit to foo-32bit-debuginfo [fate#323217]
- 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 Fri Mar 17 12:57:03 UTC 2017 - adrian@suse.de

View File

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

View File

@ -22,7 +22,7 @@ Name: build
Summary: A Script to Build SUSE Linux RPMs Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0 License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Version: 20170719 Version: 20170720
Release: 0 Release: 0
Source: obs-build-%{version}.tar.gz Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -135,20 +135,44 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.*
# main # main
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
cd $RPM_BUILD_ROOT/usr/lib/build/configs/
%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} # tweak default config on suse
# super special leap distro
ln -s sl42.1.conf default.conf
%else
%if 0%{?suse_version} %if 0%{?suse_version}
%if 0%{?sles_version} cd $RPM_BUILD_ROOT/usr/lib/build/configs/
ln -s sles%{sles_version}.conf default.conf SUSE_V=%{?suse_version}
%else SLE_V=%{?sle_version}
V=%suse_version %if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315
ln -s sl${V:0:2}.${V:2:1}.conf default.conf # this is SUSE Leap 42.X
ln -s sl42.${SLE_V:3:1}.conf default.conf
%endif %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 test -e default.conf || exit 1
%endif %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 %endif
%check %check

View File

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

View File

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

View File

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