Hello community,
here is the log from the commit of package build for openSUSE:Factory
checked in at Fri Oct 15 16:45:36 CEST 2010.
--------
--- build/build.changes 2010-07-28 15:48:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build.changes 2010-10-15 12:39:46.000000000 +0200
@@ -1,0 +2,28 @@
+Fri Oct 15 10:27:08 UTC 2010 - adrian@suse.de
+
+- update to current git
+ * export also fallback archs as exclusive archs for kiwi product
+ building, fixes factory dvd5 64bit media
+ * cross build fixes by Martin Mohring
+ * correct disk image file creation, it was one byte too large by James Perkins
+
+-------------------------------------------------------------------
+Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de
+
+- update to current git
+ * workaround for supporting rpm install on cross build with native
+ acceleration
+
+-------------------------------------------------------------------
+Tue Aug 24 08:32:05 UTC 2010 - adrian@suse.de
+
+- update to current git
+ * support for mips cross build
+
+-------------------------------------------------------------------
+Wed Aug 4 15:31:41 UTC 2010 - adrian@suse.de
+
+- update to current git
+ * replace release number macros with 0 if not specified
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-2010.07.28.tar.gz
New:
----
build-2010.10.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.Y9T3g4/_old 2010-10-15 16:44:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Y9T3g4/_new 2010-10-15 16:44:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package build (Version 2010.07.28)
+# spec file for package build (Version 2010.10.12)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
Group: Development/Tools/Building
AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs
-Version: 2010.07.28
+Version: 2010.10.12
Release: 1
# osc rm build-*tar.bz2
# REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p")
++++++ build-2010.07.28.tar.gz -> build-2010.10.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/HEAD new/build-2010.10.12/.git/HEAD
--- old/build-2010.07.28/.git/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/HEAD 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/config new/build-2010.10.12/.git/config
--- old/build-2010.07.28/.git/config 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/config 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1,11 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ fetch = +refs/heads/*:refs/remotes/origin/*
+ url = git://gitorious.org/opensuse/build.git
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/description new/build-2010.10.12/.git/description
--- old/build-2010.07.28/.git/description 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/description 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/applypatch-msg.sample new/build-2010.10.12/.git/hooks/applypatch-msg.sample
--- old/build-2010.07.28/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/applypatch-msg.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit. The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/commit-msg.sample new/build-2010.10.12/.git/hooks/commit-msg.sample
--- old/build-2010.07.28/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/commit-msg.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message. The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit. The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
+ echo >&2 Duplicate Signed-off-by lines.
+ exit 1
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/post-commit.sample new/build-2010.10.12/.git/hooks/post-commit.sample
--- old/build-2010.07.28/.git/hooks/post-commit.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/post-commit.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/post-receive.sample new/build-2010.10.12/.git/hooks/post-receive.sample
--- old/build-2010.07.28/.git/hooks/post-receive.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/post-receive.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated. It is passed arguments in through
+# stdin in the form
+# <oldrev> <newrev> <refname>
+# For example:
+# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/post-update.sample new/build-2010.10.12/.git/hooks/post-update.sample
--- old/build-2010.07.28/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/post-update.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/pre-applypatch.sample new/build-2010.10.12/.git/hooks/pre-applypatch.sample
--- old/build-2010.07.28/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/pre-applypatch.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/pre-commit.sample new/build-2010.10.12/.git/hooks/pre-commit.sample
--- old/build-2010.07.28/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/pre-commit.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+ against=HEAD
+else
+ # Initial commit: diff against an empty tree object
+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+ # Note that the use of brackets around a tr range is ok here, (it's
+ # even required, for portability to Solaris 10's /usr/bin/tr), since
+ # the square bracket bytes happen to fall in the designated range.
+ test "$(git diff --cached --name-only --diff-filter=A -z $against |
+ LC_ALL=C tr -d '[ -~]\0')"
+then
+ echo "Error: Attempt to add a non-ascii file name."
+ echo
+ echo "This can cause problems if you want to work"
+ echo "with people on other platforms."
+ echo
+ echo "To be portable it is advisable to rename the file ..."
+ echo
+ echo "If you know what you are doing you can disable this"
+ echo "check using:"
+ echo
+ echo " git config hooks.allownonascii true"
+ echo
+ exit 1
+fi
+
+exec git diff-index --check --cached $against --
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/pre-rebase.sample new/build-2010.10.12/.git/hooks/pre-rebase.sample
--- old/build-2010.07.28/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/pre-rebase.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+ topic="refs/heads/$2"
+else
+ topic=`git symbolic-ref HEAD` ||
+ exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+ ;;
+*)
+ exit 0 ;# we do not interrupt others.
+ ;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master. Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+ echo >&2 "No such branch $topic"
+ exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+ echo >&2 "$topic is fully merged to master; better remove it."
+ exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next? If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+ not_in_topic=`git rev-list "^$topic" master`
+ if test -z "$not_in_topic"
+ then
+ echo >&2 "$topic is already up-to-date with master"
+ exit 1 ;# we could allow it, but there is no point.
+ else
+ exit 0
+ fi
+else
+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+ /usr/bin/perl -e '
+ my $topic = $ARGV[0];
+ my $msg = "* $topic has commits already merged to public branch:\n";
+ my (%not_in_next) = map {
+ /^([0-9a-f]+) /;
+ ($1 => 1);
+ } split(/\n/, $ARGV[1]);
+ for my $elem (map {
+ /^([0-9a-f]+) (.*)$/;
+ [$1 => $2];
+ } split(/\n/, $ARGV[2])) {
+ if (!exists $not_in_next{$elem->[0]}) {
+ if ($msg) {
+ print STDERR $msg;
+ undef $msg;
+ }
+ print STDERR " $elem->[1]\n";
+ }
+ }
+ ' "$topic" "$not_in_next" "$not_in_master"
+ exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+ merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+ it is deleted. If you need to build on top of it to correct
+ earlier mistakes, a new topic branch is created by forking at
+ the tip of the "master". This is not strictly necessary, but
+ it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+ branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next". Young
+ topic branches can have stupid mistakes you would rather
+ clean up before publishing, and things that have not been
+ merged into other branches can be easily rebased without
+ affecting other people. But once it is published, you would
+ not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+ Then you can delete it. More importantly, you should not
+ build on top of it -- other people may already want to
+ change things related to the topic as patches against your
+ "master", so if you need further changes, it is better to
+ fork the topic (perhaps with the same name) afresh from the
+ tip of "master".
+
+Let's look at this example:
+
+ o---o---o---o---o---o---o---o---o---o "next"
+ / / / /
+ / a---a---b A / /
+ / / / /
+ / / c---c---c---c B /
+ / / / \ /
+ / / / b---b C \ /
+ / / / / \ /
+ ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished. It has been fully merged up to "master" and "next",
+ and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+ git rev-list ^master ^topic next
+ git rev-list ^master next
+
+ if these match, topic has not merged in next at all.
+
+To compute (2):
+
+ git rev-list master..topic
+
+ if this is empty, it is fully merged to "master".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/prepare-commit-msg.sample new/build-2010.10.12/.git/hooks/prepare-commit-msg.sample
--- old/build-2010.07.28/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/prepare-commit-msg.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source. The hook's purpose is to edit the commit
+# message file. If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output. It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited. This is rarely a good idea.
+
+case "$2,$3" in
+ merge,)
+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$1" ;;
+
+ *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/hooks/update.sample new/build-2010.10.12/.git/hooks/update.sample
--- old/build-2010.07.28/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/hooks/update.sample 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+# This boolean sets whether unannotated tags will be allowed into the
+# repository. By default they won't be.
+# hooks.allowdeletetag
+# This boolean sets whether deleting tags will be allowed in the
+# repository. By default they won't be.
+# hooks.allowmodifytag
+# This boolean sets whether a tag may be modified after creation. By default
+# it won't be.
+# hooks.allowdeletebranch
+# This boolean sets whether deleting branches will be allowed in the
+# repository. By default they won't be.
+# hooks.denycreatebranch
+# This boolean sets whether remotely creating branches will be denied
+# in the repository. By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+ echo "Don't run this script from the command line." >&2
+ echo " (if you want, you could supply GIT_DIR then run" >&2
+ echo " $0 <ref> <oldrev> <newrev>)" >&2
+ exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+ echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+ exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+ echo "*** Project description file hasn't been set" >&2
+ exit 1
+ ;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+ newrev_type=delete
+else
+ newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+ refs/tags/*,commit)
+ # un-annotated tag
+ short_refname=${refname##refs/tags/}
+ if [ "$allowunannotated" != "true" ]; then
+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,delete)
+ # delete tag
+ if [ "$allowdeletetag" != "true" ]; then
+ echo "*** Deleting a tag is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,tag)
+ # annotated tag
+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+ then
+ echo "*** Tag '$refname' already exists." >&2
+ echo "*** Modifying a tag is not allowed in this repository." >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,commit)
+ # branch
+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+ echo "*** Creating a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,delete)
+ # delete branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/remotes/*,commit)
+ # tracking branch
+ ;;
+ refs/remotes/*,delete)
+ # delete tracking branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ *)
+ # Anything else (is there anything else?)
+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+ exit 1
+ ;;
+esac
+
+# --- Finished
+exit 0
Files old/build-2010.07.28/.git/index and new/build-2010.10.12/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/info/exclude new/build-2010.10.12/.git/info/exclude
--- old/build-2010.07.28/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/info/exclude 2010-10-15 12:23:01.000000000 +0200
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/logs/HEAD new/build-2010.10.12/.git/logs/HEAD
--- old/build-2010.07.28/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/logs/HEAD 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 859771251659e7ca1a45865d32322c6214fb7f48 nobody 1287138194 +0200 clone: from git://gitorious.org/opensuse/build.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/logs/refs/heads/master new/build-2010.10.12/.git/logs/refs/heads/master
--- old/build-2010.07.28/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/logs/refs/heads/master 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 859771251659e7ca1a45865d32322c6214fb7f48 nobody 1287138194 +0200 clone: from git://gitorious.org/opensuse/build.git
Files old/build-2010.07.28/.git/objects/pack/pack-dfbb778082bd878d7a4e3a38f12b7146e10178b1.idx and new/build-2010.10.12/.git/objects/pack/pack-dfbb778082bd878d7a4e3a38f12b7146e10178b1.idx differ
Files old/build-2010.07.28/.git/objects/pack/pack-dfbb778082bd878d7a4e3a38f12b7146e10178b1.pack and new/build-2010.10.12/.git/objects/pack/pack-dfbb778082bd878d7a4e3a38f12b7146e10178b1.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/packed-refs new/build-2010.10.12/.git/packed-refs
--- old/build-2010.07.28/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/packed-refs 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1,4 @@
+# pack-refs with: peeled
+4e616df18f2805b6cdb4d674cf6e0cb27798a73a refs/tags/obs_2.0
+4acd145bf4dbff921f1d16977d5a707e3234cead refs/remotes/origin/obs_2.0
+859771251659e7ca1a45865d32322c6214fb7f48 refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/refs/heads/master new/build-2010.10.12/.git/refs/heads/master
--- old/build-2010.07.28/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/refs/heads/master 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1 @@
+859771251659e7ca1a45865d32322c6214fb7f48
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/.git/refs/remotes/origin/HEAD new/build-2010.10.12/.git/refs/remotes/origin/HEAD
--- old/build-2010.07.28/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/.git/refs/remotes/origin/HEAD 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/Build/Kiwi.pm new/build-2010.10.12/Build/Kiwi.pm
--- old/build-2010.07.28/Build/Kiwi.pm 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/Build/Kiwi.pm 2010-10-15 12:23:14.000000000 +0200
@@ -86,6 +86,19 @@
return grep(delete($h{$_}), @_);
}
+sub findFallBackArchs($$) {
+ my ($fallbackArchXML, $arch) = @_;
+ my @fa;
+
+ for my $a (@{$fallbackArchXML->{'arch'}||[]}) {
+ if ( $a->{'id'} eq $arch && $a->{'fallback'} ) {
+ @fa = unify( $a->{'fallback'}, findFallBackArchs($fallbackArchXML, $a->{'fallback'}));
+ }
+ }
+
+ return @fa
+};
+
sub kiwiparse {
my ($xml, $arch, $count) = @_;
$count ||= 0;
@@ -217,6 +230,12 @@
push @additionalarchs, split(',', $package->{'onlyarch'}) if $package->{'onlyarch'};
}
@requiredarch = unify(@requiredarch, @additionalarchs);
+
+ my @fallbackarchs;
+ for my $arch (@requiredarch) {
+ push @fallbackarchs, findFallBackArchs($instsource->{'architectures'}[0], $arch) if $instsource->{'architectures'}[0];
+ }
+ @requiredarch = unify(@requiredarch, @fallbackarchs);
if (!$instsource) {
my $packman = $preferences->{'packagemanager'}->[0]->{'_content'};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/Build/Rpm.pm new/build-2010.10.12/Build/Rpm.pm
--- old/build-2010.07.28/Build/Rpm.pm 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/Build/Rpm.pm 2010-10-15 12:23:14.000000000 +0200
@@ -334,6 +334,9 @@
push @$badarch, split(' ', $1);
}
}
+ if (@subpacks && $preamble && exists($ret->{'version'}) && $line =~ /^Version\s*:\s*(\S+)/i) {
+ $ret->{'multiversion'} = 1 if $ret->{'version'} ne $1;
+ }
if ($line =~ /^(?:Requires\(pre\)|Requires\(post\)|PreReq)\s*:\s*(\S.*)$/i) {
my $deps = $1;
my @deps = $deps =~ /([^\s\[,]+)(\s+[<=>]+\s+[^\s\[,]+)?(\s+\[[^\]]+\])?[\s,]*/g;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/Build/Susetags.pm new/build-2010.10.12/Build/Susetags.pm
--- old/build-2010.07.28/Build/Susetags.pm 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/Build/Susetags.pm 2010-10-15 12:23:14.000000000 +0200
@@ -33,7 +33,7 @@
my $r = '(' . join('|', @needed) . '|Pkg):\s*(.*)';
if (!open(F, '<', $file)) {
- if (!open(F, '-|', "gzip -dc $file".'.gz')) {
+ if (!open(F, '-|', "gzip", "-dc", $file.'.gz')) {
die "$file: $!";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/Build.pm new/build-2010.10.12/Build.pm
--- old/build-2010.07.28/Build.pm 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/Build.pm 2010-10-15 12:23:14.000000000 +0200
@@ -77,6 +77,38 @@
$config->{'conflicth'} = \%conflicts;
}
+# 'canonicalize' dist string as found in rpm dist tags
+sub dist_canon($$) {
+ my ($rpmdist, $arch) = @_;
+ $rpmdist = lc($rpmdist);
+ $rpmdist =~ s/-/_/g;
+ $rpmdist =~ s/opensuse/suse linux/;
+ my $rpmdista;
+ if ($rpmdist =~ /\(/) {
+ $rpmdista = $rpmdist;
+ $rpmdista =~ s/.*\(//;
+ $rpmdista =~ s/\).*//;
+ } else {
+ $rpmdista = $arch;
+ }
+ $rpmdista =~ s/i[456]86/i386/;
+ $rpmdist = '' unless $rpmdista =~ /^(i386|x86_64|ia64|ppc|ppc64|s390|s390x)$/;
+ my $dist = 'default';
+ if ($rpmdist =~ /unitedlinux 1\.0.*/) {
+ $dist = "ul1-$rpmdista";
+ } elsif ($rpmdist =~ /suse sles_(\d+)/) {
+ $dist = "sles$1-$rpmdista";
+ } elsif ($rpmdist =~ /suse linux enterprise (\d+)/) {
+ $dist = "sles$1-$rpmdista";
+ } elsif ($rpmdist =~ /suse linux (\d+)\.(\d+)\.[4-9]\d/) {
+ # alpha version
+ $dist = "$1.".($2 + 1)."-$rpmdista";
+ } elsif ($rpmdist =~ /suse linux (\d+\.\d+)/) {
+ $dist = "$1-$rpmdista";
+ }
+ return $dist;
+}
+
sub read_config_dist {
my ($dist, $archpath, $configdir) = @_;
@@ -86,11 +118,20 @@
$arch = 'noarch' if $arch eq '';
die("Please specify a distribution!\n") unless defined $dist;
if ($dist !~ /\//) {
+ my $saved = $dist;
$configdir = '.' unless defined $configdir;
$dist =~ s/-.*//;
$dist = "sl$dist" if $dist =~ /^\d/;
$dist = "$configdir/$dist.conf";
- $dist = "$configdir/default.conf" unless -e $dist;
+ if (! -e $dist) {
+ $dist =~ s/-.*//;
+ $dist = "sl$dist" if $dist =~ /^\d/;
+ $dist = "$configdir/$dist.conf";
+ }
+ if (! -e $dist) {
+ warn "$saved.conf not found, using default.conf\n" unless $saved eq 'default';
+ $dist = "$configdir/default.conf";
+ }
}
die("$dist: $!\n") unless -e $dist;
my $cf = read_config($arch, $dist);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/Makefile new/build-2010.10.12/Makefile
--- old/build-2010.07.28/Makefile 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/Makefile 2010-10-15 12:23:14.000000000 +0200
@@ -46,6 +46,7 @@
substitutedeps \
debtransform \
mkbaselibs \
+ makedeltarpms \
createrepomddeps \
createyastdeps \
changelog2spec \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/build new/build-2010.10.12/build
--- old/build-2010.07.28/build 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/build 2010-10-15 12:23:14.000000000 +0200
@@ -11,6 +11,7 @@
test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
export BUILD_ARCH BUILD_HOST_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR BUILD_DEBUG
+export BUILD_DIST
ccache=0
icecream=0
@@ -81,11 +82,18 @@
RSYNCSRC=
RSYNCDEST=
RSYNCDONE=
-: ${EMULATOR_ARCHS:="armv4l armv5el armv6el armv7el sh4 ppc ppc64 mips mipsel"}
-: ${CACHE_DIR:=/var/cache/build}
+SIGNDUMMY=
+# list of archs which need emulator initialization
+: ${EMULATOR_ARCHS:="armv4l armv5el armv6el armv7el armv8el mips mipsel mips64 mips64el ppc ppc64 sh4"}
export EMULATOR_ARCHS
+# list of devices registered by binfmt handlers in /proc/sys/fs/binfmt_misc
+: ${EMULATOR_DEVS:="arm mips mipsel mips64 mips64el ppc sh4 sparc"}
+export EMULATOR_DEVS
+
+: ${CACHE_DIR:=/var/cache/build}
+
# This is for insserv
export YAST_IS_RUNNING=instsys
@@ -774,7 +782,6 @@
*-dist)
needarg
BUILD_DIST="$ARG"
- export BUILD_DIST
shift
;;
*-xen|*-kvm|--uml|--qemu)
@@ -953,6 +960,9 @@
shell=1
shift
;;
+ --signdummy)
+ SIGNDUMMY=1
+ ;;
-*)
echo Unknown Option "$PARAM". Exit.
cleanup_and_exit 1
@@ -1133,7 +1143,7 @@
if test ! -e "$VM_IMAGE"; then
echo "Creating $VM_IMAGE (${VMDISK_ROOTSIZE}M)"
mkdir -p "${VM_IMAGE%/*}"
- dd if=/dev/zero of="$VM_IMAGE" bs=1 count=1 seek=$(( ${VMDISK_ROOTSIZE} * 1024 * 1024 )) || cleanup_and_exit 3
+ dd if=/dev/zero of="$VM_IMAGE" bs=1 count=1 seek=$(( ${VMDISK_ROOTSIZE} * 1024 * 1024 - 1 )) || cleanup_and_exit 3
if test -z "$CLEAN_BUILD" ; then
vm_img_mkfs "$VMDISK_FILESYSTEM" "$VM_IMAGE" || cleanup_and_exit 3
fi
@@ -1142,7 +1152,7 @@
# setup VM_SWAP
echo "Creating $VM_SWAP (${VMDISK_SWAPSIZE}M)"
mkdir -p "${VM_SWAP%/*}"
- dd if=/dev/zero of="$VM_SWAP" bs=1 count=1 seek=$(( ${VMDISK_SWAPSIZE} * 1024 * 1024 )) || cleanup_and_exit 3
+ dd if=/dev/zero of="$VM_SWAP" bs=1 count=1 seek=$(( ${VMDISK_SWAPSIZE} * 1024 * 1024 - 1 )) || cleanup_and_exit 3
fi
if test ! -e "$VM_IMAGE" ; then
echo "you need to create $VM_IMAGE first"
@@ -1353,6 +1363,7 @@
echo "BUILD_DIST='${BUILD_DIST//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "RELEASE='${RELEASE//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "BUILD_DEBUG='${BUILD_DEBUG//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
+ echo "SIGNDUMMY='${SIGNDUMMY//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "DO_LINT='${DO_LINT//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "DO_CHECKS='${DO_CHECKS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "NOROOTFORBUILD='${NOROOTFORBUILD//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
@@ -1560,6 +1571,16 @@
fi
#
+ # install dummy sign program if needed
+ #
+ test -f $BUILD_ROOT/usr/bin/sign_installed && mv $BUILD_ROOT/usr/bin/sign_installed $BUILD_ROOT/usr/bin/sign
+ if test -n "$SIGNDUMMY" ; then
+ test -f $BUILD_ROOT/usr/bin/sign && mv $BUILD_ROOT/usr/bin/sign $BUILD_ROOT/usr/bin/sign_installed
+ cp $BUILD_DIR/signdummy $BUILD_ROOT/usr/bin/sign
+ chmod 755 $BUILD_ROOT/usr/bin/sign
+ fi
+
+ #
# check if we want to build with the abuild user
#
BUILD_USER=abuild
@@ -1788,7 +1809,7 @@
BUILD_SUCCEEDED=false
if test -n "$OVERLAY" ; then
- if -d "$OVERLAY"; then
+ if test -d "$OVERLAY"; then
pushd $OVERLAY
echo "Copying overlay to BUILD_ROOT"
tar -cpf - . | (cd $BUILD_ROOT ; tar -xvf -)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/build.1 new/build-2010.10.12/build.1
--- old/build-2010.07.28/build.1 2010-07-28 15:44:18.000000000 +0200
+++ new/build-2010.10.12/build.1 2010-10-15 12:23:14.000000000 +0200
@@ -157,7 +157,7 @@
You can use this to add more options to RPM.
.SH SEE ALSO
-.BR rpm (1),
+.BR rpm (8),
.TP
.BR "Maximum RPM":
.I http://www.rpm.org/max-rpm/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/computeblocklists new/build-2010.10.12/computeblocklists
--- old/build-2010.07.28/computeblocklists 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/computeblocklists 2010-10-15 12:23:14.000000000 +0200
@@ -52,7 +52,7 @@
}
my $bsize = 'xxxx';
- ioctl(F, 2, $bsize) || die("FIGETBSZ: $!\n");
+ ioctl(F, 2, $bsize) || ioctl(F, 536870914, $bsize) || die("FIGETBSZ: $!\n");
$bsize = unpack("L", $bsize);
my @stat = stat(F);
@@ -66,7 +66,9 @@
for ($b = 0; $b < $blocks; ++$b) {
my $block = pack('I', $b);
if(not defined ioctl(F, 1, $block)) {
- die "$file: $!";
+ if(not defined ioctl(F, 536870913, $block)) {
+ die "$file: $!";
+ }
}
$block = unpack('I', $block);
if($b == 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/createrepomddeps new/build-2010.10.12/createrepomddeps
--- old/build-2010.07.28/createrepomddeps 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/createrepomddeps 2010-10-15 12:23:14.000000000 +0200
@@ -424,11 +424,15 @@
die("download failed\n");
}
}
+ if ($] > 5.007) {
+ require Encode;
+ utf8::downgrade($u);
+ }
my $fh;
+ open($fh, '<', $u) or die "Error opening $u: $!\n";
if ($u =~ /\.gz$/) {
- open($fh, '-|', 'gzip', '-cd', $u) or next; # XXX
- } else {
- open($fh, '<', $u) or next;
+ use IO::Uncompress::Gunzip qw($GunzipError);
+ $fh = new IO::Uncompress::Gunzip $fh or die "Error opening $u: $GunzipError\n";
}
$p->parse($fh);
close($fh);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/download new/build-2010.10.12/download
--- old/build-2010.07.28/download 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/download 2010-10-15 12:23:14.000000000 +0200
@@ -35,8 +35,14 @@
}
my $dest = "$dir/".basename($url->path);
unlink($dest); # just in case
- my $res = $ua->mirror($url, $dest);
- die "reqesting $url failed: ".$res->status_line."\n" unless $res->is_success;
+ my $retry = 3;
+ while ($retry--) {
+ my $res = $ua->mirror($url, $dest);
+ last if $res->is_success;
+ # if it's a redirect we probably got a bad mirror and should just retry
+ die "reqesting $url failed: ".$res->status_line."\n" unless $retry && $res->previous;
+ warn "retrying $url\n";
+ }
}
# vim:sw=2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/expanddeps new/build-2010.10.12/expanddeps
--- old/build-2010.07.28/expanddeps 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/expanddeps 2010-10-15 12:23:14.000000000 +0200
@@ -101,6 +101,7 @@
$packs{$_} ||= "$_.$arch" for @{$packs_arch{$arch} || []};
}
+# XXX: move to separate tool
if (!defined($dist) || $dist eq '') {
my $rpmarch = (grep {$fn{"rpm.$_"}} @archs)[0];
if (!$rpmarch) {
@@ -117,33 +118,7 @@
my %res = Build::Rpm::rpmq($rpmfn, 1010);
$rpmdist = $res{1010}->[0] || '';
}
- $rpmdist = lc($rpmdist);
- $rpmdist =~ s/-/_/g;
- $rpmdist =~ s/opensuse/suse linux/;
- my $rpmdista;
- if ($rpmdist =~ /\(/) {
- $rpmdista = $rpmdist;
- $rpmdista =~ s/.*\(//;
- $rpmdista =~ s/\).*//;
- } else {
- $rpmdista = $archs[0];
- }
- $rpmdista =~ s/i[456]86/i386/;
- $rpmdist = '' unless $rpmdista =~ /^(i386|x86_64|ia64|ppc|ppc64|s390|s390x)$/;
- if ($rpmdist =~ /unitedlinux 1\.0.*/) {
- $dist = "ul1-$rpmdista";
- } elsif ($rpmdist =~ /suse sles_(\d+)/) {
- $dist = "sles$1-$rpmdista";
- } elsif ($rpmdist =~ /suse linux enterprise (\d+)/) {
- $dist = "sles$1-$rpmdista";
- } elsif ($rpmdist =~ /suse linux (\d+)\.(\d+)\.[4-9]\d/) {
- # alpha version
- $dist = "$1.".($2 + 1)."-$rpmdista";
- } elsif ($rpmdist =~ /suse linux (\d+\.\d+)/) {
- $dist = "$1-$rpmdista";
- } else {
- $dist = 'default';
- }
+ $dist = Build::dist_canon($rpmdist, $archs[0]);
}
print STDERR "Warning: distribution not specified, assuming '$dist' (see $configdir).\n";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/init_buildsystem new/build-2010.10.12/init_buildsystem
--- old/build-2010.07.28/init_buildsystem 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/init_buildsystem 2010-10-15 12:23:14.000000000 +0200
@@ -271,10 +271,10 @@
r=()
for i in "${repos[@]}"; do
if [ "$i" = "zypp://" ]; then
- for j in `grep -l enabled=1 /etc/zypp/repos.d/*.repo`; do
+ while read j; do
j="${j#/etc/zypp/repos.d/}"
r=("${r[@]}" "zypp://${j%.repo}")
- done
+ done < <(grep -l enabled=1 /etc/zypp/repos.d/*.repo)
else
r=("${r[@]}" "$i")
fi
@@ -286,12 +286,21 @@
{
local findonly=''
maybe_add_all_zypp_repos
- test "${repos[*]} ${BUILD_RPMS//:/ /}" != "$(cat $CACHE_FILE.id 2>/dev/null)" && rm -f $CACHE_FILE.id
- test -f $CACHE_FILE || rm -f $CACHE_FILE.id
- for SRC in "${repos[@]}" ${BUILD_RPMS//:/ /}; do
- test -z "$SRC" && SRC=.
- test "$SRC" -nt $CACHE_FILE && rm -f $CACHE_FILE.id
- done
+ if ! test -f $CACHE_FILE || ! test -f $CACHE_FILE.id || \
+ test "${repos[*]} ${BUILD_RPMS//:/ /}" != "$(cat $CACHE_FILE.id 2>/dev/null)"; then
+ rm -f $CACHE_FILE.id
+ else
+ for SRC in "${repos[@]}" ${BUILD_RPMS//:/ /}; do
+ test -n "$SRC" || SRC=.
+ if [ "${SRC#zypp://}" != "$SRC" ]; then
+ SRC="/var/cache/zypp/raw" # XXX can't use name here as we'd need to parse the file
+ fi
+ if test "$SRC" -nt $CACHE_FILE; then
+ rm -f $CACHE_FILE.id
+ break
+ fi
+ done
+ fi
if ! test -f $CACHE_FILE.id ; then
test -z "$LIST_STATE" && echo initializing $CACHE_FILE ...
for SRC in "${repos[@]}" -- ${BUILD_RPMS//:/ /}; do
@@ -369,7 +378,7 @@
if [ "${url:0:7}" == "zypp://" ] ; then
cachedir="/var/cache/zypp/packages/"
SRC="$cachedir${url#zypp://}"
- mkdir -p "$(dirname $SRC)"
+ mkdir -p "${SRC%/*}" || cleanup_and_exit 1
elif [ "${url:0:7}" == "http://" -o "${url:0:8}" == "https://" -o "${url:0:6}" == "ftp://" -o "${url:0:7}" == "ftps://" ] ; then
cachedir="$(getcachedir "$url")"
local name="$(basename "$url")"
@@ -605,6 +614,7 @@
test -z "$RUNSCRIPTS_SEEN" && PACKAGES_TO_RUNSCRIPTS="$PACKAGES_TO_PREINSTALL"
echo "$GUESSED_DIST" > $BUILD_ROOT/.guessed_dist
+ test -n "$BUILD_DIST" || BUILD_DIST="$GUESSED_DIST"
PSUF=rpm
test -L $BUILD_ROOT/.init_b_cache/rpms/rpm.rpm || PSUF=deb
fi
@@ -851,6 +861,12 @@
if test "$USE_FORCE" = true ; then
export ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --force"
fi
+ # work around for cross-build installs, we must not overwrite the running rpm
+ if test "$PKG" = rpm ; then
+ for i in $BUILD_ROOT/.init_b_cache/preinstalls/rpm-x86-* ; do
+ test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb"
+ done
+ fi
echo "installing ${PKGID%% *}"
if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm" -ef "$BUILD_ROOT/.init_b_cache/$PKG.rpm" ; then
rm -f $BUILD_ROOT/.init_b_cache/$PKG.rpm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/initscript_qemu_vm new/build-2010.10.12/initscript_qemu_vm
--- old/build-2010.07.28/initscript_qemu_vm 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/initscript_qemu_vm 2010-10-15 12:23:14.000000000 +0200
@@ -11,12 +11,18 @@
echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register
echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
+
echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+
echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register
echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register
-echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register
-echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register
-echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register
-echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register
+#echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register
+#echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register
+#echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register
+#echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register
+
+echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register
+echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register
-exec /.build/build
+#exec /.build/build
+/bin/bash-static /.build/build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/mkbaselibs new/build-2010.10.12/mkbaselibs
--- old/build-2010.07.28/mkbaselibs 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/mkbaselibs 2010-10-15 12:23:14.000000000 +0200
@@ -1092,6 +1092,10 @@
my @debugrpms;
for my $rpm (@pkgs) {
my $rpmn = $rpm;
+ unless (-f $rpm) {
+ warn ("$rpm does not exist, skipping\n");
+ next;
+ }
next if $rpm =~ /\.(no)?src\.rpm$/; # ignore source rpms
next if $rpm =~ /\.spm$/;
$rpmn =~ s/.*\///; # Remove leading path info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/signdummy new/build-2010.10.12/signdummy
--- old/build-2010.07.28/signdummy 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/signdummy 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+# simple "sign" replacement that does nothing but
+# write a 2048 byte file with a fixed signature.
+# sign is used in kiwi builds to sign repositories
+
+my $mode;
+
+while (@ARGV) {
+ if ($ARGV[0] =~ /^-([cdr])$/) {
+ $mode = $1;
+ shift @ARGV;
+ next;
+ }
+ if ($ARGV[0] eq '--') {
+ shift @ARGV;
+ last;
+ }
+ if ($ARGV[0] =~ /^-/) {
+ die("unsupported option $ARGV[0]\n");
+ }
+ last;
+}
+die("only detached mode possible\n") if !$mode || $mode ne 'd';
+die("filter mode not supported\n") unless @ARGV;
+
+for my $file (@ARGV) {
+ local *F;
+ open(F, '<', $file) || die("$file: $!\n");
+ my $buf = '';
+ 1 while sysread(F, $buf, 16384, length($buf));
+ close(F) || die("$file: $!\n");
+ my $block = "sIGnMe!\n";
+ $block .= sprintf("%08x%08x\n", length($buf), unpack("%32C*", $buf));
+ $block .= "\0" x (2048 - length($block));
+ open(F, '>', "$file.asc") || die("$file.asc: $!\n");
+ (syswrite(F, $block) || 0) == 2048 || die("$file.asc: $!\n");
+ close(F) || die("$file.asc: $!\n");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/spectool new/build-2010.10.12/spectool
--- old/build-2010.07.28/spectool 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/spectool 2010-10-15 12:23:14.000000000 +0200
@@ -170,16 +170,19 @@
}
push @archs, 'noarch' unless grep {$_ eq 'noarch'} @archs;
-$dist = 'default' unless $dist;
+unless ($dist) {
+ $dist = `rpm -q --qf '%{DISTRIBUTION}' rpm 2>/dev/null`;
+ $dist = Build::dist_canon($dist||'', $archs[0]);
+}
if($dist !~ /\// && !defined $configdir) {
if($0 =~ /^\//) {
use File::Basename qw/dirname/;
$configdir = dirname($0).'/configs';
- undef $configdir unless -e $configdir.'/default.conf';
+ undef $configdir unless -e $configdir.'/sl11.3.conf';
} else {
$configdir = $builddir.'/configs';
- undef $configdir unless -e $configdir.'/default.conf';
+ undef $configdir unless -e $configdir.'/sl11.3.conf';
}
if(!defined $configdir) {
print STDERR "please specify config dir\n";
@@ -274,7 +277,7 @@
for my $t (keys %$parsed) {
next unless ($t =~ /^(?:source|patch)\d*/);
my $url = $parsed->{$t};
- next unless $url =~ /^(?:http|ftp):\/\//;
+ next unless $url =~ /^(?:https?|ftp):\/\//;
my $file = $url;
$file =~ s/.*\///;
next if -e $file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/substitutedeps new/build-2010.10.12/substitutedeps
--- old/build-2010.07.28/substitutedeps 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/substitutedeps 2010-10-15 12:23:14.000000000 +0200
@@ -125,12 +125,18 @@
$l =~ s//$b/;
} elsif ($release =~ /(\d+)$/) {
my $b = $1;
- $l =~ s//$b/ unless $l =~ s//$b/;
+ $b = '0' if $l =~ s//$b/;
+ $l =~ s//$b/;
}
} else {
$l =~ s/^(Release:\s*).*/$1$release/i;
}
}
+ } else {
+ # remove macros, as rpm doesn't like them
+ $l =~ s//0/;
+ $l =~ s//0/;
+ $l =~ s//0/;
}
# this is to be compatible to legacy autobuild.
# you can specify a releaseprg in the project configuration,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/t/dist new/build-2010.10.12/t/dist
--- old/build-2010.07.28/t/dist 1970-01-01 01:00:00.000000000 +0100
+++ new/build-2010.10.12/t/dist 2010-10-15 12:23:14.000000000 +0200
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Test::More tests => 9;
+use Build;
+
+sub d {
+ Build::dist_canon($_[0], $_[1]||'i586');
+}
+
+is(d("UnitedLinux 1.0 (x86-64)"), "ul1-x86_64");
+is(d("SuSE SLES-8 (ia64)"), "sles8-ia64");
+is(d("SuSE Linux 8.2 (x86-64)"), "8.2-x86_64");
+is(d("SuSE SLES-9 (x86-64)"), "sles9-x86_64");
+is(d("SUSE Linux 10.1 (PPC64)"), "10.1-ppc64");
+is(d("SUSE Linux Enterprise 10 (PPC)"), "sles10-ppc");
+is(d("openSUSE 10.3 (X86-64)"), "10.3-x86_64");
+is(d("SUSE Linux Enterprise 11"), "sles11-i386");
+is(d("openSUSE 11.3"), "11.3-i386");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.07.28/vc new/build-2010.10.12/vc
--- old/build-2010.07.28/vc 2010-07-28 15:14:43.000000000 +0200
+++ new/build-2010.10.12/vc 2010-10-15 12:23:14.000000000 +0200
@@ -109,7 +109,7 @@
touch $changelog
fi
-tmpfile=`mktemp -q $changelog.XXXXXX`
+tmpfile=`mktemp -q $changelog.vctmp.XXXXXX`
if [ $? -ne 0 ]; then
echo "$0: Can't create temp file, exiting..."
exit 1
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.Y9T3g4/_old 2010-10-15 16:44:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Y9T3g4/_new 2010-10-15 16:44:57.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 2010.07.28
+Version: 2010.10.12
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