Hello community,
here is the log from the commit of package build for openSUSE:Factory
checked in at Fri Jul 1 16:54:21 CEST 2011.
--------
--- build/build-mkbaselibs-sle.changes 2011-06-07 21:19:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build-mkbaselibs-sle.changes 2011-06-30 19:06:56.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de
+
+- provide build-mkbaselibs so this can really be used
+
+-------------------------------------------------------------------
--- build/build.changes 2011-06-17 10:35:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build.changes 2011-07-01 09:27:45.000000000 +0200
@@ -1,0 +2,10 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-2011.06.17.tar.gz
debian.tar.gz
New:
----
build-2011.07.01.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-mkbaselibs-sle.spec ++++++
--- /var/tmp/diff_new_pack.4jDyW8/_old 2011-07-01 16:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.4jDyW8/_new 2011-07-01 16:53:44.000000000 +0200
@@ -23,9 +23,10 @@
Group: Development/Tools/Building
AutoReqProv: on
Summary: Tools to generate base lib packages
-Version: 2011.06.17
+Version: 2011.07.01
Release: 1
#!BuildIgnore: build-mkbaselibs
+Provides: build-mkbaselibs
Source: build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.4jDyW8/_old 2011-07-01 16:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.4jDyW8/_new 2011-07-01 16:53:44.000000000 +0200
@@ -23,7 +23,7 @@
Group: Development/Tools/Building
AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs
-Version: 2011.06.17
+Version: 2011.07.01
Release: 1
#!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.4jDyW8/_old 2011-07-01 16:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.4jDyW8/_new 2011-07-01 16:53:44.000000000 +0200
@@ -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>
++++++ build-2011.06.17.tar.gz -> build-2011.07.01.tar.gz ++++++
Files old/build-2011.06.17/.git/index and new/build-2011.07.01/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/.git/logs/HEAD new/build-2011.07.01/.git/logs/HEAD
--- old/build-2011.06.17/.git/logs/HEAD 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/.git/logs/HEAD 2011-07-01 09:25:57.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 f16b074840249b48a15abb34418ed7d260e238d8 Adrian Schröter 1308299703 +0200 clone: from git://gitorious.org/opensuse/build.git
+0000000000000000000000000000000000000000 b037032674406bc2935cb65115b8e2aad98e3974 Adrian Schröter 1309505157 +0200 clone: from git://gitorious.org/opensuse/build.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/.git/logs/refs/heads/master new/build-2011.07.01/.git/logs/refs/heads/master
--- old/build-2011.06.17/.git/logs/refs/heads/master 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/.git/logs/refs/heads/master 2011-07-01 09:25:57.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 f16b074840249b48a15abb34418ed7d260e238d8 Adrian Schröter 1308299703 +0200 clone: from git://gitorious.org/opensuse/build.git
+0000000000000000000000000000000000000000 b037032674406bc2935cb65115b8e2aad98e3974 Adrian Schröter 1309505157 +0200 clone: from git://gitorious.org/opensuse/build.git
Files old/build-2011.06.17/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.idx and new/build-2011.07.01/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.idx differ
Files old/build-2011.06.17/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.pack and new/build-2011.07.01/.git/objects/pack/pack-c0d2ead062c8960bd7f7456a2c1bd0a5063dd87f.pack differ
Files old/build-2011.06.17/.git/objects/pack/pack-c697ee5263143be6fe2b42cc58a04ce39673e511.idx and new/build-2011.07.01/.git/objects/pack/pack-c697ee5263143be6fe2b42cc58a04ce39673e511.idx differ
Files old/build-2011.06.17/.git/objects/pack/pack-c697ee5263143be6fe2b42cc58a04ce39673e511.pack and new/build-2011.07.01/.git/objects/pack/pack-c697ee5263143be6fe2b42cc58a04ce39673e511.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/.git/packed-refs new/build-2011.07.01/.git/packed-refs
--- old/build-2011.06.17/.git/packed-refs 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/.git/packed-refs 2011-07-01 09:25:57.000000000 +0200
@@ -1,4 +1,4 @@
# pack-refs with: peeled
4e616df18f2805b6cdb4d674cf6e0cb27798a73a refs/tags/obs_2.0
4acd145bf4dbff921f1d16977d5a707e3234cead refs/remotes/origin/obs_2.0
-f16b074840249b48a15abb34418ed7d260e238d8 refs/remotes/origin/master
+b037032674406bc2935cb65115b8e2aad98e3974 refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/.git/refs/heads/master new/build-2011.07.01/.git/refs/heads/master
--- old/build-2011.06.17/.git/refs/heads/master 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/.git/refs/heads/master 2011-07-01 09:25:57.000000000 +0200
@@ -1 +1 @@
-f16b074840249b48a15abb34418ed7d260e238d8
+b037032674406bc2935cb65115b8e2aad98e3974
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/.git/shallow new/build-2011.07.01/.git/shallow
--- old/build-2011.06.17/.git/shallow 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/.git/shallow 2011-07-01 09:25:57.000000000 +0200
@@ -1,3 +1,3 @@
23bfa1b1ab1db2f2b4f999a04ff2cdc7e9f29005
59d713d8bd77fa846a540bdcc8b67a89b0de3263
-8cdbb668339862aa5a0c51fd310606a23f09b124
+f88c00cc11e5ee612d6fc38d89c4d7250a9b89c0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2011.06.17/build_kiwi.sh new/build-2011.07.01/build_kiwi.sh
--- old/build-2011.06.17/build_kiwi.sh 2011-06-17 10:35:03.000000000 +0200
+++ new/build-2011.07.01/build_kiwi.sh 2011-07-01 09:25:57.000000000 +0200
@@ -64,7 +64,6 @@
fi
rm -f $BUILD_ROOT/$TOPDIR/SOURCES/config.xml
ln -s $SPECFILE $BUILD_ROOT/$TOPDIR/SOURCES/config.xml
- chroot $BUILD_ROOT su -c "kiwi --version" -
if test "$imagetype" = product ; then
echo "running kiwi --create-instsource..."
# runs always as abuild user
@@ -85,8 +84,13 @@
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
+ if [ ${ver:0:1} == "4" -a ${ver:2:2} -lt 90 ]; then
+ # broken kiwi version, not accepting verbose level
+ chroot "$BUILD_ROOT" su -c "APPID=- LANG=POSIX /usr/sbin/kiwi --root $TOPDIR/KIWIROOT -v --logfile terminal -p $TOPDIR/SOURCES --create-instsource $TOPDIR/SOURCES" - abuild < /dev/null && BUILD_SUCCEEDED=true
+ 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
fi
# move created product to correct destination
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.4jDyW8/_old 2011-07-01 16:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.4jDyW8/_new 2011-07-01 16:53:44.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 2011.06.17
+Version: 2011.07.01
Binary: build
Maintainer: Adrian Schroeter
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.4jDyW8/_old 2011-07-01 16:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.4jDyW8/_new 2011-07-01 16:53:44.000000000 +0200
@@ -1,3 +1,9 @@
+build (2011.07.01-1) unstable; urgency=low
+
+ * Update to current git trunk
+
+ -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200
+
build (2010.12.15-1) unstable; urgency=low
* Update to current git trunk
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org