adrianSuSE/build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 569349 from openSUSE:Tools

Browse Source 
- Fix picking of right changes file for changelog generation (boo#1077145)

- force use of bsdtar for VMs (bnc#665768, CVE-2010-4226)

OBS-URL: https://build.opensuse.org/request/show/569349
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build?expand=0&rev=112
This commit is contained in:
Dominique Leuenberger 2018-01-29 13:54:50 +00:00 committed by Git OBS Bridge
commit 830a7c078a
8 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

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

12
build-mkbaselibs-sle.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package build-mkbaselibs-sle
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# 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
@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle
Summary: Tools to generate base lib packages
License: GPL-2.0+
Group: Development/Tools/Building
Version: 20171128
Version: 20180124
Release: 0
#!BuildIgnore: build-mkbaselibs
#!BuildIgnore: build-mkbaselibs-sle
@ -45,13 +45,13 @@ This is the SLE variant including IA64 binary generation.
%build
%install
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build
install -m 0755 -d %{buildroot}/usr/lib/build
install -m 0755 mkbaselibs \
$RPM_BUILD_ROOT/usr/lib/build/mkbaselibs
%{buildroot}/usr/lib/build/mkbaselibs
install -m 0644 baselibs_configs/baselibs_global-deb.conf \
$RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf
%{buildroot}/usr/lib/build/baselibs_global-deb.conf
install -m 0644 baselibs_configs/baselibs_global.conf \
$RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf
%{buildroot}/usr/lib/build/baselibs_global.conf
%files
%defattr(-,root,root)

10
build.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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
@ -684,6 +689,11 @@ Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de
- support new cross build initvm. Done by James Perkins from LinuxFoundation
- do not use loop device anymore when using block devices directly
-------------------------------------------------------------------
Thu Jan 20 10:18:09 UTC 2011 - lnussel@suse.de
- force use of bsdtar for VMs (bnc#665768, CVE-2010-4226)
-------------------------------------------------------------------
Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de

2
build.dsc
View File

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

20
build.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package build
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# 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
@ -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: 20171128
Version: 20180124
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -124,18 +124,18 @@ make CFLAGS="$RPM_BUILD_FLAGS" initvm-all
%install
# initvm
%if 0%{?suse_version}
make DESTDIR=$RPM_BUILD_ROOT initvm-install
strip $RPM_BUILD_ROOT/usr/lib/build/initvm.*
make DESTDIR=%{buildroot} initvm-install
strip %{buildroot}/usr/lib/build/initvm.*
export NO_BRP_STRIP_DEBUG="true"
chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.*
chmod 0644 %{buildroot}/usr/lib/build/initvm.*
%endif
# main
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=%{buildroot} install
# tweak default config on suse
%if 0%{?suse_version}
cd $RPM_BUILD_ROOT/usr/lib/build/configs/
cd %{buildroot}/usr/lib/build/configs/
SUSE_V=%{?suse_version}
SLE_V=%{?sle_version}
%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315
@ -164,7 +164,7 @@ test -e default.conf || exit 1
# tweak baselibs config on suse
%if 0%{?suse_version}
cd $RPM_BUILD_ROOT/usr/lib/build
cd %{buildroot}/usr/lib/build
%if %suse_version == 1500
# SLE 15 / Leap 15
ln -sf baselibs_configs/baselibs_global-sle15.conf baselibs_global.conf
@ -181,12 +181,12 @@ 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
if [ ! -f "%{buildroot}/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/
cp -av %{buildroot}/usr/lib/build/configs/default.conf configs/
# do not get confused when building this already with build:
export BUILD_IGNORE_2ND_STAGE=1
# use our own build code

2
debian.changelog
View File

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

3
obs-build-20171128.tar.gz
View File

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

3
obs-build-20180124.tar.gz Normal file
View File

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