update
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=345
This commit is contained in:
parent
ba25b857f9
commit
9afae53e78
2
PKGBUILD
2
PKGBUILD
@ -1,5 +1,5 @@
|
|||||||
pkgname=build
|
pkgname=build
|
||||||
pkgver=20171128
|
pkgver=20180123
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="Build packages in sandbox"
|
pkgdesc="Build packages in sandbox"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package build-mkbaselibs-sle
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# 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
|
Summary: Tools to generate base lib packages
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
Version: 20171128
|
Version: 20180123
|
||||||
Release: 0
|
Release: 0
|
||||||
#!BuildIgnore: build-mkbaselibs
|
#!BuildIgnore: build-mkbaselibs
|
||||||
#!BuildIgnore: build-mkbaselibs-sle
|
#!BuildIgnore: build-mkbaselibs-sle
|
||||||
@ -45,13 +45,13 @@ This is the SLE variant including IA64 binary generation.
|
|||||||
%build
|
%build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build
|
install -m 0755 -d %{buildroot}/usr/lib/build
|
||||||
install -m 0755 mkbaselibs \
|
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 \
|
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 \
|
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
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 23 14:03:50 UTC 2018 - adrian@suse.de
|
||||||
|
|
||||||
|
- Remove pam-modules for SLE and Leap 15
|
||||||
|
- Do not leak conflicts/obsoletes into the next package for skipped packages
|
||||||
|
- Fix rpm detection and createrepo code in build-recipe-appimage
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de
|
Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de
|
||||||
|
|
||||||
@ -684,6 +691,11 @@ Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de
|
|||||||
- support new cross build initvm. Done by James Perkins from LinuxFoundation
|
- support new cross build initvm. Done by James Perkins from LinuxFoundation
|
||||||
- do not use loop device anymore when using block devices directly
|
- 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
|
Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: build
|
Source: build
|
||||||
Version: 20171128
|
Version: 20180123
|
||||||
Binary: build
|
Binary: build
|
||||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
|
20
build.spec
20
build.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package build
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -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: 20171128
|
Version: 20180123
|
||||||
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
|
||||||
@ -124,18 +124,18 @@ make CFLAGS="$RPM_BUILD_FLAGS" initvm-all
|
|||||||
%install
|
%install
|
||||||
# initvm
|
# initvm
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
make DESTDIR=$RPM_BUILD_ROOT initvm-install
|
make DESTDIR=%{buildroot} initvm-install
|
||||||
strip $RPM_BUILD_ROOT/usr/lib/build/initvm.*
|
strip %{buildroot}/usr/lib/build/initvm.*
|
||||||
export NO_BRP_STRIP_DEBUG="true"
|
export NO_BRP_STRIP_DEBUG="true"
|
||||||
chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.*
|
chmod 0644 %{buildroot}/usr/lib/build/initvm.*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# main
|
# main
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
make DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
# tweak default config on suse
|
# tweak default config on suse
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
cd $RPM_BUILD_ROOT/usr/lib/build/configs/
|
cd %{buildroot}/usr/lib/build/configs/
|
||||||
SUSE_V=%{?suse_version}
|
SUSE_V=%{?suse_version}
|
||||||
SLE_V=%{?sle_version}
|
SLE_V=%{?sle_version}
|
||||||
%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315
|
%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
|
# tweak baselibs config on suse
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
cd $RPM_BUILD_ROOT/usr/lib/build
|
cd %{buildroot}/usr/lib/build
|
||||||
%if %suse_version == 1500
|
%if %suse_version == 1500
|
||||||
# SLE 15 / Leap 15
|
# SLE 15 / Leap 15
|
||||||
ln -sf baselibs_configs/baselibs_global-sle15.conf baselibs_global.conf
|
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!"
|
echo "WARNING: Not building as root, tests did not run!"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
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!"
|
echo "WARNING: No default config, tests did not run!"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
# get back the default.conf link
|
# 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:
|
# do not get confused when building this already with build:
|
||||||
export BUILD_IGNORE_2ND_STAGE=1
|
export BUILD_IGNORE_2ND_STAGE=1
|
||||||
# use our own build code
|
# use our own build code
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
build (20171128) unstable; urgency=low
|
build (20180123) 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
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:698a72371ef207fe4891514d8d7c544cddaffa10c3713844b7cc683b0fab8556
|
|
||||||
size 312292
|
|
3
obs-build-20180123.tar.gz
Normal file
3
obs-build-20180123.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:85d8afd36739867228884826597a43d20090f3ead45a605433a2e1036ab2729f
|
||||||
|
size 312820
|
Loading…
Reference in New Issue
Block a user