Hello community,
here is the log from the commit of package build for openSUSE:Factory
checked in at Fri Jun 24 10:45:53 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build-mkbaselibs-sle.changes 2011-06-07 21:19:23.000000000 +0200
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+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
+
--- build/build.changes 2011-05-25 14:15:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build.changes 2011-06-17 10:35:37.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jun 17 08:35:15 UTC 2011 - adrian@suse.de
+
+- support new kiwi command line mode
+
+-------------------------------------------------------------------
+Mon Jun 6 14:57:47 UTC 2011 - adrian@suse.de
+
+- do not build ia64 baselibs packages for openSUSE anymore
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-2011.05.24.tar.gz
New:
----
build-2011.06.17.tar.gz
build-mkbaselibs-sle.changes
build-mkbaselibs-sle.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-mkbaselibs-sle.spec ++++++
#
# spec file for package build-mkbaselibs-sle
#
# Copyright (c) 2011 SUSE LINUX Products 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/
#
# norootforbuild
Name: build-mkbaselibs-sle
License: GPLv2+
Group: Development/Tools/Building
AutoReqProv: on
Summary: Tools to generate base lib packages
Version: 2011.06.17
Release: 1
#!BuildIgnore: 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.
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 \
$RPM_BUILD_ROOT/usr/lib/build/mkbaselibs
install -m 0644 baselibs_global-deb.conf \
$RPM_BUILD_ROOT/usr/lib/build/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
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.yKuNxm/_old 2011-06-24 10:44:12.000000000 +0200
+++ /var/tmp/diff_new_pack.yKuNxm/_new 2011-06-24 10:44:12.000000000 +0200
@@ -23,7 +23,7 @@
Group: Development/Tools/Building
AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs
-Version: 2011.05.24
+Version: 2011.06.17
Release: 1
#!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.yKuNxm/_old 2011-06-24 10:44:12.000000000 +0200
+++ /var/tmp/diff_new_pack.yKuNxm/_new 2011-06-24 10:44:12.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">2011.05.24</param>
+ <param name="version">2011.06.17</param>
<param name="url">git://gitorious.org/opensuse/build.git</param>
<param name="scm">git</param>
</service>
++++++ build-2011.05.24.tar.gz -> build-2011.06.17.tar.gz ++++++
Files old/build-2011.05.24/.git/index and new/build-2011.06.17/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/.git/logs/HEAD new/build-2011.06.17/.git/logs/HEAD
--- old/build-2011.05.24/.git/logs/HEAD 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/.git/logs/HEAD 2011-06-17 10:35:03.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 eedb8df37bb6c0b70e9de233ac8b9a87d5b0dfaa Adrian Schröter 1306325663 +0200 clone: from git://gitorious.org/opensuse/build.git
+0000000000000000000000000000000000000000 f16b074840249b48a15abb34418ed7d260e238d8 Adrian Schröter 1308299703 +0200 clone: from git://gitorious.org/opensuse/build.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/.git/logs/refs/heads/master new/build-2011.06.17/.git/logs/refs/heads/master
--- old/build-2011.05.24/.git/logs/refs/heads/master 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/.git/logs/refs/heads/master 2011-06-17 10:35:03.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 eedb8df37bb6c0b70e9de233ac8b9a87d5b0dfaa Adrian Schröter 1306325663 +0200 clone: from git://gitorious.org/opensuse/build.git
+0000000000000000000000000000000000000000 f16b074840249b48a15abb34418ed7d260e238d8 Adrian Schröter 1308299703 +0200 clone: from git://gitorious.org/opensuse/build.git
Files old/build-2011.05.24/.git/objects/pack/pack-39fc1d27cf631a259cf9d76c860af9b999bf395d.idx and new/build-2011.06.17/.git/objects/pack/pack-39fc1d27cf631a259cf9d76c860af9b999bf395d.idx differ
Files old/build-2011.05.24/.git/objects/pack/pack-39fc1d27cf631a259cf9d76c860af9b999bf395d.pack and new/build-2011.06.17/.git/objects/pack/pack-39fc1d27cf631a259cf9d76c860af9b999bf395d.pack differ
Files old/build-2011.05.24/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.idx and new/build-2011.06.17/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.idx differ
Files old/build-2011.05.24/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.pack and new/build-2011.06.17/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/.git/packed-refs new/build-2011.06.17/.git/packed-refs
--- old/build-2011.05.24/.git/packed-refs 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/.git/packed-refs 2011-06-17 10:35:03.000000000 +0200
@@ -1,4 +1,4 @@
# pack-refs with: peeled
4e616df18f2805b6cdb4d674cf6e0cb27798a73a refs/tags/obs_2.0
4acd145bf4dbff921f1d16977d5a707e3234cead refs/remotes/origin/obs_2.0
-eedb8df37bb6c0b70e9de233ac8b9a87d5b0dfaa refs/remotes/origin/master
+f16b074840249b48a15abb34418ed7d260e238d8 refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/.git/refs/heads/master new/build-2011.06.17/.git/refs/heads/master
--- old/build-2011.05.24/.git/refs/heads/master 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/.git/refs/heads/master 2011-06-17 10:35:03.000000000 +0200
@@ -1 +1 @@
-eedb8df37bb6c0b70e9de233ac8b9a87d5b0dfaa
+f16b074840249b48a15abb34418ed7d260e238d8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/.git/shallow new/build-2011.06.17/.git/shallow
--- old/build-2011.05.24/.git/shallow 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/.git/shallow 2011-06-17 10:35:03.000000000 +0200
@@ -1,3 +1,3 @@
23bfa1b1ab1db2f2b4f999a04ff2cdc7e9f29005
59d713d8bd77fa846a540bdcc8b67a89b0de3263
-c4c70f3d9c516cf2cf057fc60814228f5ae3f3aa
+8cdbb668339862aa5a0c51fd310606a23f09b124
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/Makefile new/build-2011.06.17/Makefile
--- old/build-2011.05.24/Makefile 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/Makefile 2011-06-17 10:35:03.000000000 +0200
@@ -60,7 +60,7 @@
$(DESTDIR)$(pkglibdir)
install -m644 Build/*.pm $(DESTDIR)$(pkglibdir)/Build
install -m644 qemu-reg $(DESTDIR)$(pkglibdir)
- install -m644 *.pm baselibs_global*.conf $(DESTDIR)$(pkglibdir)
+ install -m644 *.pm baselibs_global*.conf lxc.conf $(DESTDIR)$(pkglibdir)
install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs
install -m644 build.1 $(DESTDIR)$(man1dir)
ln -sf $(pkglibdir)/build $(DESTDIR)$(bindir)/build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/baselibs_global-sle.conf new/build-2011.06.17/baselibs_global-sle.conf
--- old/build-2011.05.24/baselibs_global-sle.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2011.06.17/baselibs_global-sle.conf 2011-06-17 10:35:03.000000000 +0200
@@ -0,0 +1,45 @@
+arch i586 targets x86_64:32bit ia64:x86
+arch i686 targets x86_64:32bit ia64:x86
+arch s390 targets s390x:32bit
+arch ppc targets ppc64:32bit
+arch ppc64 targets ppc:64bit
+arch sparc targets sparc64:32bit
+arch sparcv8 targets sparc64:32bit
+arch sparcv9 targets sparc64:32bit
+arch sparcv9v targets sparc64v:32bit
+arch sparc64 targets sparcv9:64bit
+arch sparc64v targets sparcv9v:64bit
+
+configdir /usr/lib/baselibs-<targettype>/bin
+
+targettype x86 prefix /emul/ia32-linux
+
+targettype x86 extension -x86
+targettype 32bit extension 32
+targettype 64bit extension 64
+
+targetname <name>-<targettype>
+
++.*/lib(64)?/.*\.(so.*|o|a|la)$
+
+targettype 64bit -^(/usr)?/lib/lib
+targettype 32bit -/lib64/
+targettype x86 -/lib64/
+
+config +.*bin.*-config$
+config -/kde-config$
+
+targettype x86 requires "ia32el"
+targettype x86 prereq "glibc-x86"
+
+package /.(?/dev/null | grep -q "100%"; then
+ set 3
+ fi
+ fi
if test -n "$RUNNING_IN_VM" ; then
chown $browner $BUILD_ROOT
cd /
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.05.24/build_kiwi.sh new/build-2011.06.17/build_kiwi.sh
--- old/build-2011.05.24/build_kiwi.sh 2011-05-25 14:14:23.000000000 +0200
+++ new/build-2011.06.17/build_kiwi.sh 2011-06-17 10:35:03.000000000 +0200
@@ -70,16 +70,24 @@
# runs always as abuild user
mkdir -p "$BUILD_ROOT/$TOPDIR/KIWIROOT"
chroot "$BUILD_ROOT" chown -R abuild.abuild "$TOPDIR"
- # --instsource-local is only needed for openSUSE 11.1 and SLE 11 SP0 kiwi.
- chroot "$BUILD_ROOT" su -c "APPID=- LANG=POSIX /usr/sbin/kiwi --root $TOPDIR/KIWIROOT -v -v --logfile terminal -p $TOPDIR/SOURCES --instsource-local --create-instsource $TOPDIR/SOURCES" - abuild < /dev/null && BUILD_SUCCEEDED=true
-### This block is obsolete with current kiwi versions, only needed for kiwi 3.01 version
-# for i in $BUILD_ROOT/$TOPDIR/KIWIROOT/main/* ; do
-# test -d "$i" || continue
-# n="${i##*/}"
-# test "$n" = scripts && continue
-# test "$n" != "${n%0}" && continue
-# chroot $BUILD_ROOT su -c "suse-isolinux $TOPDIR/KIWIROOT/main/$n $TOPDIR/KIWI/$n.iso" - $BUILD_USER
-# done
+ ver=`chroot "$BUILD_ROOT" su -c "/usr/sbin/kiwi --version | sed -n 's,.*kiwi version v\(.*\),\1,p'"`
+ if [ ${ver:0:1} == "3" ]; then
+ # old style kiwi 3 builds
+ chroot "$BUILD_ROOT" su -c "APPID=- LANG=POSIX /usr/sbin/kiwi --root $TOPDIR/KIWIROOT -v --logfile terminal -p $TOPDIR/SOURCES --instsource-local --create-instsource $TOPDIR/SOURCES" - abuild < /dev/null && BUILD_SUCCEEDED=true
+ if [ ${ver:2:2} == "01" ]; then
+ ## This block is obsolete with current kiwi versions, only needed for kiwi 3.01 version
+ for i in $BUILD_ROOT/$TOPDIR/KIWIROOT/main/* ; do
+ test -d "$i" || continue
+ n="${i##*/}"
+ test "$n" = scripts && continue
+ test "$n" != "${n%0}" && continue
+ chroot $BUILD_ROOT su -c "suse-isolinux $TOPDIR/KIWIROOT/main/$n $TOPDIR/KIWI/$n.iso" - $BUILD_USER
+ done
+ fi
+ else
+ # current default
+ chroot "$BUILD_ROOT" su -c "APPID=- LANG=POSIX /usr/sbin/kiwi --root $TOPDIR/KIWIROOT -v 2 --logfile terminal -p $TOPDIR/SOURCES --create-instsource $TOPDIR/SOURCES" - abuild < /dev/null && BUILD_SUCCEEDED=true
+ fi
# move created product to correct destination
for i in $BUILD_ROOT/$TOPDIR/KIWIROOT/main/* ; do
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.yKuNxm/_old 2011-06-24 10:44:12.000000000 +0200
+++ /var/tmp/diff_new_pack.yKuNxm/_new 2011-06-24 10:44:12.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 2011.05.24
+Version: 2011.06.17
Binary: build
Maintainer: Adrian Schroeter
Architecture: all
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org