pool/build
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CONFLICT Accepting request 74947: fix kiwi handling

Browse Source 
Rev openSUSE:Factory/54 Md5 37a4d12f247cdb4dfa163c0a272e3e87 2011-07-01 14:54:01 saschpe 74947
This commit is contained in:
OBS User saschpe 2011-07-01 14:54:01 +00:00 committed by Git OBS Bridge
commit 2ddba46736
10 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="version">2011.06.17</param>
<param name="version">2011.07.01</param>
<param name="url">git://gitorious.org/opensuse/build.git</param>
<param name="scm">git</param>
</service>

3
build-2011.06.17.tar.gz
View File

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

3
build-2011.07.01.tar.gz Normal file
View File

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

5
build-mkbaselibs-sle.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

11
build-mkbaselibs-sle.spec
View File

@ -23,15 +23,17 @@ License: GPLv2+
Group: Development/Tools/Building
AutoReqProv: on
Summary: Tools to generate base lib packages
Version: 2011.06.17
Release: 1
Version: 2011.07.01
Release: 0
#!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs
Source: build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
# Manual requires to avoid hard require to bash-static
AutoReqProv: off
%description
This package contains the parts which may be installed in the inner build system
for generating base lib packages.
@ -41,8 +43,10 @@ This is the SLE variant including IA64 binary generation.
%prep
%setup -q -n build-%{version}
%build
%install
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build
install -m 0755 mkbaselibs \
@ -52,10 +56,13 @@ install -m 0644 baselibs_global-deb.conf \
install -m 0644 baselibs_global-sle.conf \
$RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf
%files
%defattr(-,root,root)
%dir /usr/lib/build
/usr/lib/build/mkbaselibs
/usr/lib/build/baselibs*
%changelog

10
build.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jul 1 07:26:34 UTC 2011 - adrian@suse.de
- compat mode for broken kiwi of openSUSE 11.4
-------------------------------------------------------------------
Thu Jun 30 10:42:15 UTC 2011 - adrian@suse.de
- fixed kiwi execution call for some versions
-------------------------------------------------------------------
Fri Jun 17 08:35:15 UTC 2011 - adrian@suse.de

2
build.dsc
View File

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

16
build.spec
View File

@ -23,8 +23,8 @@ License: GPLv2+
Group: Development/Tools/Building
AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs
Version: 2011.06.17
Release: 1
Version: 2011.07.01
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -50,6 +50,7 @@ Recommends: perl(XML::Parser)
Recommends: bsdtar
%endif
%description
This package provides a script for building RPMs for SUSE Linux in a
chroot environment.
@ -59,12 +60,14 @@ chroot environment.
Requires: build-mkbaselibs
Recommends: build-mkdrpms
%package mkbaselibs
License: GPLv2+
Group: Development/Tools/Building
Summary: Tools to generate base lib packages
# NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules)
%description mkbaselibs
This package contains the parts which may be installed in the inner build system
for generating base lib packages.
@ -77,17 +80,21 @@ Requires: deltarpm
# XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq
Requires: build
%description mkdrpms
This package contains the parts which may be installed in the inner build system
for generating delta rpm packages.
%endif
%prep
%setup -q
%build
%install
make DESTDIR=$RPM_BUILD_ROOT install
cd $RPM_BUILD_ROOT/usr/lib/build/configs/
@ -101,6 +108,7 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/
test -e default.conf
%endif
%files
%defattr(-,root,root)
%doc README
@ -115,16 +123,20 @@ test -e default.conf
%exclude /usr/lib/build/baselibs*
%exclude /usr/lib/build/mkdrpms
%files mkbaselibs
%defattr(-,root,root)
%dir /usr/lib/build
/usr/lib/build/mkbaselibs
/usr/lib/build/baselibs*
%files mkdrpms
%defattr(-,root,root)
%dir /usr/lib/build
/usr/lib/build/mkdrpms
%endif
%changelog

6
debian.changelog
View File

@ -1,3 +1,9 @@
build (2011.07.01-1) unstable; urgency=low
* Update to current git trunk
-- Adrian Schroeter <adrian@suse.de> Fri, 01 Jul 2010 10:03:54 +0200
build (2010.12.15-1) unstable; urgency=low
* Update to current git trunk

3
debian.tar.gz
View File

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