Hello community,
here is the log from the commit of package build for openSUSE:13.1 checked in at 2013-10-17 14:50:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/build (Old)
and /work/SRC/openSUSE:13.1/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Changes:
--------
--- /work/SRC/openSUSE:13.1/build/build.changes 2013-09-23 10:48:06.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.build.new/build.changes 2013-10-19 16:48:19.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Oct 15 09:37:05 UTC 2013 - adrian@suse.de
+
+- update openSUSE 13.1 build configuration
+- add openSUSE 13.2 build configuration
+- add support for m86k
+- add support for Tizen changelog date format
+- export .packages, .verified and .ova files for kiwi
+- initvm code cleanup
+- Do not specify compression format for Arch packages when extracting
+- export kiwi-image:$type for kiwi files with schemaversion 5.6 or newer
+- mount tmpfs on $BUILD_ROOT/dev/shm
+- Create devices nodes if udev is not running
+- more arm architectures
+- make version '0' a valid version
+- fix the call to lintian, lintian gets a dsc file as input
+- adding generic parameter to hand over kiwi parameters
+
+-------------------------------------------------------------------
Old:
----
obs-build-20130517.tar.gz
New:
----
obs-build-20131015.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.RyZLno/_old 2013-10-19 16:48:20.000000000 +0200
+++ /var/tmp/diff_new_pack.RyZLno/_new 2013-10-19 16:48:20.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 20130517
+Version: 20131015
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: obs-build-%{version}.tar.gz
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.RyZLno/_old 2013-10-19 16:48:20.000000000 +0200
+++ /var/tmp/diff_new_pack.RyZLno/_new 2013-10-19 16:48:20.000000000 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20130517
+pkgver=20131015
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
@@ -8,7 +8,7 @@
groups=('base-devel')
depends=('perl')
source=(obs-build-${pkgver}.tar.gz)
-md5sums=('3c25d0531aec60b2b984138a566799f8')
+md5sums=('b0c023cc1613e14e84934e0f395b3dd0')
package() {
msg "Installing build ..."
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.RyZLno/_old 2013-10-19 16:48:20.000000000 +0200
+++ /var/tmp/diff_new_pack.RyZLno/_new 2013-10-19 16:48:20.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20130517
+Version: 20131015
Binary: build
Maintainer: Adrian Schroeter
Architecture: all
++++++ obs-build-20130517.tar.gz -> obs-build-20131015.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/Build/Kiwi.pm new/obs-build-20131015/Build/Kiwi.pm
--- old/obs-build-20130517/Build/Kiwi.pm 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/Build/Kiwi.pm 2013-10-15 11:43:49.000000000 +0200
@@ -100,6 +100,19 @@
return @fa
}
+# sles10 perl does not have the version.pm
+# implement own hack
+sub versionstring {
+ my ($str) = @_;
+ my @xstr = split (/\./,$str);
+ my $result = 0;
+ while (my $digit = shift(@xstr)) {
+ $result = $result * 100;
+ $result += $digit;
+ }
+ return $result;
+}
+
sub kiwiparse {
my ($xml, $arch, $count) = @_;
$count ||= 0;
@@ -112,9 +125,12 @@
my @packages;
my @extrasources;
my @requiredarch;
+ my $schemaversion = 0;
+ my $schemaversion56 = versionstring("5.6");
my $kiwi = parsexml($xml);
die("not a kiwi config\n") unless $kiwi && $kiwi->{'image'};
$kiwi = $kiwi->{'image'}->[0];
+ $schemaversion = versionstring($kiwi->{'schemaversion'}) if $kiwi->{'schemaversion'};
$ret->{'filename'} = $kiwi->{'name'} if $kiwi->{'name'};
my $description = (($kiwi->{'description'} || [])->[0]) || {};
if ($description->{'specification'}) {
@@ -131,6 +147,7 @@
if (defined $type->{'image'}) {
# for kiwi 4.1 and 5.x
push @types, $type->{'image'};
+ push @packages, "kiwi-image:$type->{'image'}" if $schemaversion >= $schemaversion56;
} else {
# for kiwi 3.8 and before
push @types, $type->{'_content'};
@@ -158,6 +175,11 @@
if ($instsource) {
foreach my $repository(sort {$a->{priority} <=> $b->{priority}} @{$instsource->{'instrepo'} || []}) {
my $kiwisource = ($repository->{'source'} || [])->[0];
+ if ($kiwisource->{'path'} eq 'obsrepositories:/') {
+ # special case, OBS will expand it.
+ push @repos, '_obsrepositories';
+ next;
+ }
die("bad instsource path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/;
push @repos, "$1/$2";
}
@@ -191,6 +213,10 @@
for my $repository (@repositories) {
my $kiwisource = ($repository->{'source'} || [])->[0];
next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr
+ if ($kiwisource->{'path'} eq 'obsrepositories:/') {
+ push @repos, '_obsrepositories';
+ next;
+ };
die("bad path using not obs:/ URL: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/;
push @repos, "$1/$2";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/Build.pm new/obs-build-20131015/Build.pm
--- old/obs-build-20130517/Build.pm 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/Build.pm 2013-10-15 11:43:49.000000000 +0200
@@ -38,8 +38,8 @@
my $std_macros = q{
%define nil
%define ix86 i386 i486 i586 i686 athlon
-%define arm armv4l armv5l armv6l armv7l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6el armv6eb armv7el armv7eb armv7hl armv7nhl armv8el
-%define arml armv4l armv5l armv6l armv7l armv5tel armv5el armv6el armv7el armv7hl armv7nhl armv8el
+%define arm armv4l armv5l armv6l armv7l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6hl armv6el armv6eb armv7el armv7eb armv7hl armv7nhl armv8el
+%define arml armv4l armv5l armv6l armv7l armv5tel armv5el armv6el armv6hl armv7el armv7hl armv7nhl armv8el
%define armb armv4b armv5b armv5teb armv5eb armv6eb armv7eb
%define sparc sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
};
@@ -530,7 +530,7 @@
if ($pkginfo) {
# extract ver and rel from self provides
my ($v, $r) = map { /\Q$pkgid\E = ([^-]+)(?:-(.+))?$/ } @ss;
- die("$pkgid: no self provides\n") unless $v;
+ die("$pkgid: no self provides\n") unless defined($v) && $v ne '';
$pkginfo->{$pkgid}->{'name'} = $pkgid;
$pkginfo->{$pkgid}->{'version'} = $v;
$pkginfo->{$pkgid}->{'release'} = $r if defined($r);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/build new/obs-build-20131015/build
--- old/obs-build-20130517/build 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/build 2013-10-15 11:43:49.000000000 +0200
@@ -65,6 +65,9 @@
# need to restore build root owner for non-root builds
browner=
+# additional kiwi parameters, used for appliance builds with obsrepositories:/ directive
+KIWI_PARAMETERS=
+
# Default uid:gid for the build user
ABUILD_UID=399
ABUILD_GID=399
@@ -417,6 +420,7 @@
umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true
umount -n $BUILD_ROOT/proc 2>/dev/null || true
umount -n $BUILD_ROOT/dev/pts 2>/dev/null || true
+ umount -n $BUILD_ROOT/dev/shm 2>/dev/null || true
test "$VM_IMAGE" = 1 && VM_IMAGE=
[ -n "$VM_IMAGE" ] && umount $BUILD_ROOT 2>/dev/null || true
fi
@@ -809,6 +813,12 @@
background_monitor_process &
fi
+ if [ ! -e /dev/.udev ]; then
+ echo "WARNING: udev not running, creating extra device nodes"
+ test -e /dev/fd || ln -sf /proc/self/fd /dev/fd
+ test -e /etc/mtab || ln -sf /proc/mounts /etc/mtab
+ fi
+
# set date to build start on broken systems (now < build start)
if [ $(date '+%s') -lt $(date -r /.build/.date '+%s') ]; then
echo -n "WARNING: system has a broken clock, setting it to a newer time: "
@@ -1004,13 +1014,17 @@
export kvm_bin="/usr/bin/qemu-system-arm"
export console=ttyAMA0
export KVM_OPTIONS="-enable-kvm -M vexpress-a15 -dtb /boot/a15-guest.dtb -cpu cortex-a15"
- export VM_KERNEL=/boot/zImage.vexpress
- # prefer the vexpress initrd
- if [ -e /boot/initrd.vexpress ]; then
- VM_INITRD=/boot/initrd.vexpress
- else
- VM_INITRD=/boot/initrd
+ VM_KERNEL=/boot/zImage
+ VM_INITRD=/boot/initrd
+ # prefer the guest kernel
+ if [ -e /boot/zImage.guest ]; then
+ VM_KERNEL=/boot/zImage.guest
+ fi
+ # prefer the guest initrd
+ if [ -e /boot/initrd.guest ]; then
+ VM_INITRD=/boot/initrd.guest
fi
+ export VM_KERNEL
export VM_INITRD
}
@@ -1062,7 +1076,7 @@
alpha*) PERSONALITY_SYSCALL=324 ;;
sparc*) PERSONALITY_SYSCALL=191 ;;
ia64*) PERSONALITY_SYSCALL=1140 ;;
- i?86*|ppc*|aarch64*|arm*|sh4|cris|m68k|s390*|unicore32|microblaze) PERSONALITY_SYSCALL=136 ;;
+ i?86*|ppc*|aarch64*|arm*|sh4|cris|m68k*|s390*|unicore32|microblaze) PERSONALITY_SYSCALL=136 ;;
*) echo "ARCHITECTURE PERSONALITY IS UNKNOWN"; exit 1;;
esac
@@ -1090,6 +1104,7 @@
while test -n "$1"; do
PARAM="$1"
+ UNSTRIPPED_ARG="$2"
ARG="$2"
[ "$ARG" = "${ARG#-}" ] || ARG=""
ARG2="$3"
@@ -1152,6 +1167,10 @@
*-baselibs)
CREATE_BASELIBS=true
;;
+ --kiwi-parameter)
+ KIWI_PARAMETERS="$KIWI_PARAMETERS $UNSTRIPPED_ARG"
+ shift
+ ;;
*-baselibs-internal)
CREATE_BASELIBS=internal
;;
@@ -2097,6 +2116,7 @@
echo "INCARNATION='${INCARNATION//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "DISTURL='${DISTURL//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "DO_INIT='${DO_INIT//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
+ echo "KIWI_PARAMETERS='${KIWI_PARAMETERS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
# FIXME: this depends on the kernel and vm.
# could be hda2, sda2 for xen or hdb/sdb for qemu
test -n "$VM_SWAP" && echo "VM_SWAP='${VM_SWAPDEV:-/dev/hda2}'" >> $BUILD_ROOT/.build/build.data
@@ -2141,14 +2161,13 @@
umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true
umount -n $BUILD_ROOT/proc 2> /dev/null || true
umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true
+ umount -n $BUILD_ROOT/dev/shm 2> /dev/null || true
umount -n $BUILD_ROOT/mnt 2> /dev/null || true
if check_use_emulator; then
if [ -e $BUILD_DIR/initvm.$BUILD_HOST_ARCH -a -e "$BUILD_DIR/qemu-reg" ]; then
chmod 0755 "$BUILD_DIR/initvm.$BUILD_HOST_ARCH"
vm_init_script="/.build/initvm.$BUILD_HOST_ARCH"
- elif [ -e $BUILD_DIR/initscript_qemu_vm ]; then
- vm_init_script="/.build/initscript_qemu_vm"
else
echo "Warning: can't find initscript to register binfmts"
fi
@@ -2739,6 +2758,8 @@
mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
mount -n -tdevpts -omode=0620,gid=5 none $BUILD_ROOT/dev/pts 2> /dev/null
+ # needed for POSIX semaphores
+ mount -n -ttmpfs none $BUILD_ROOT/dev/shm 2> /dev/null
setupicecream
@@ -2989,8 +3010,8 @@
else
chroot $BUILD_ROOT su -c "cd $TOPDIR/BUILD && $DSC_BUILD_CMD" - $BUILD_USER < /dev/null && BUILD_SUCCEEDED=true
if test "$BUILD_SUCCEEDED" = true -a "$DO_CHECKS" != "false"; then
- DEB_CHANGESFILE=${SPECFILE%.dsc}_$(dpkg-architecture -qDEB_BUILD_ARCH).changes
- chroot $BUILD_ROOT su -c "which lintian > /dev/null && cd $TOPDIR && echo Running lintian && lintian -i $DEB_CHANGESFILE" - $BUILD_USER < /dev/null
+ DEB_CHANGESFILE=${SPECFILE%.dsc}_"$(chroot $BUILD_ROOT su -c 'dpkg-architecture -qDEB_BUILD_ARCH')".changes
+ chroot $BUILD_ROOT su -c "which lintian > /dev/null && cd $TOPDIR && echo Running lintian && (set -x && lintian -i $DEB_SOURCEDIR/$DEB_DSCFILE)" - $BUILD_USER < /dev/null
fi
fi
@@ -3146,6 +3167,7 @@
[ -e /dev/sda ] && device="sda"
[ -e /dev/vda ] && device="vda"
[ -e /dev/dasda ] && device="dasda" # in z/VM
+ [ -e /dev/nfhd0 ] && device="nfhd0" # in aranym
if [ -e /sys/block/${device}/stat ]; then
disk=(`cat /sys/block/${device}/stat`)
[ "0${disk[0]}" -gt 0 ] && echo "IO_requests_read: ${disk[0]}" >> $TOPDIR/OTHER/_statistics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/build_kiwi.sh new/obs-build-20131015/build_kiwi.sh
--- old/obs-build-20130517/build_kiwi.sh 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/build_kiwi.sh 2013-10-15 11:43:49.000000000 +0200
@@ -22,8 +22,8 @@
fi
if test "$imagetype" != product -a "$DO_INIT" != "false" ; then
echo "creating repodata for $repo"
- if chroot $BUILD_ROOT createrepo --simple-md-filenames --help >/dev/null 2>&1 ; then
- chroot $BUILD_ROOT createrepo --simple-md-filenames "$repo"
+ if chroot $BUILD_ROOT createrepo --no-database --simple-md-filenames --help >/dev/null 2>&1 ; then
+ chroot $BUILD_ROOT createrepo --no-database --simple-md-filenames "$repo"
else
chroot $BUILD_ROOT createrepo "$repo"
fi
@@ -99,6 +99,7 @@
f=${i##*/}
case $f in
*.iso) mv $i $BUILD_ROOT/$TOPDIR/KIWI/. ;;
+ *.packages) mv $i $BUILD_ROOT/$TOPDIR/OTHER/. ;;
scripts) ;;
*0) ;;
*) test -d $i && mv $i $BUILD_ROOT/$TOPDIR/KIWI/. ;;
@@ -114,10 +115,10 @@
for imgtype in $imagetype ; do
echo "running kiwi --prepare for $imgtype..."
# Do not use $BUILD_USER here, since we always need root permissions
- if chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT-$imgtype" - root < /dev/null ; then
+ if chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT-$imgtype $KIWI_PARAMETERS" - root < /dev/null ; then
echo "running kiwi --create for $imgtype..."
mkdir -p $BUILD_ROOT/$TOPDIR/KIWI-$imgtype
- chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --create $TOPDIR/KIWIROOT-$imgtype --logfile terminal --type $imgtype -d $TOPDIR/KIWI-$imgtype" - root < /dev/null || cleanup_and_exit 1
+ chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --create $TOPDIR/KIWIROOT-$imgtype --logfile terminal --type $imgtype -d $TOPDIR/KIWI-$imgtype $KIWI_PARAMETERS" - root < /dev/null || cleanup_and_exit 1
else
cleanup_and_exit 1
fi
@@ -214,7 +215,7 @@
cat > $BUILD_ROOT/kiwi_post.sh << EOF
echo "compressing vmx images... "
cd /$TOPDIR/KIWI-vmx
-for suffix in "ovf" "qcow2"; do
+for suffix in "ovf" "qcow2" "ova"; do
if [ -e "$imageout.\$suffix" ]; then
mv "$imageout.\$suffix" "/$TOPDIR/KIWI/$imageout$buildnum.\$suffix"
pushd /$TOPDIR/KIWI
@@ -232,9 +233,10 @@
test -e \$i && VMXFILES="\$VMXFILES \$i"
done
# take raw files as fallback
-if [ -z "\$VMXFILES" ]; then
- test -e "$imageout.raw" && VMXFILES="$imageout.raw"
-fi
+# do not do that, it may overwrite files when multiple -vmx flavors are configured
+#if [ -z "\$VMXFILES" ]; then
+# test -e "$imageout.raw" && VMXFILES="$imageout.raw"
+#fi
if [ -n "\$VMXFILES" ]; then
tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" \$VMXFILES
SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2"
@@ -334,6 +336,17 @@
EOF
;;
esac
+ cat >> $BUILD_ROOT/kiwi_post.sh << EOF
+cd /$TOPDIR/KIWI-$imgtype
+if [ -e "$imageout.packages" ]; then
+ echo "Found kiwi package list file, exporting as well..."
+ cp "$imageout.packages" "/$TOPDIR/OTHER/$imageout$buildnum-$imgtype.packages"
+fi
+if [ -e "$imageout.verified" ]; then
+ echo "Found rpm verification report, exporting as well..."
+ cp "$imageout.verified" "/$TOPDIR/OTHER/$imageout$buildnum-$imgtype.verified"
+fi
+EOF
chroot $BUILD_ROOT su -c "sh -e /kiwi_post.sh" || cleanup_and_exit 1
rm -f $BUILD_ROOT/kiwi_post.sh
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/changelog2spec new/obs-build-20131015/changelog2spec
--- old/obs-build-20130517/changelog2spec 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/changelog2spec 2013-10-15 11:43:49.000000000 +0200
@@ -68,7 +68,7 @@
$_ = $_[0];
my $dline;
- die("bad changelog heading\n") unless /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/;
+ die("bad changelog heading\n") unless /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*?[0-9][0-9][0-9][0-9])(.*\@.*$)/;
my $dt = $1;
my $who = $2;
$dt = lc($dt);
@@ -104,7 +104,7 @@
my $change = '';
while(<>) {
chomp;
- last if /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/;
+ last if /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*?[0-9][0-9][0-9][0-9])(.*\@.*$)/;
next if (/^--------------/);
next if (/^========================/);
s/\s+$//;
@@ -163,9 +163,10 @@
next if /^\s*$/;
next if (/^--------------/);
next if (/^========================/);
- if (/^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/) {
+ if (/^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*?[0-9][0-9][0-9][0-9])(.*\@.*$)/) {
+ # suse : * Fri Jun 07 2013 First Last
+ # tizen: * Fri Jun 07 2013 First Last tagname@commitid
$format = 'suse';
-
} elsif (/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-+0-9a-z.]+)+)\;.*$/) {
$format = 'debian';
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/common_functions new/obs-build-20131015/common_functions
--- old/obs-build-20130517/common_functions 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/common_functions 2013-10-15 11:43:49.000000000 +0200
@@ -18,8 +18,10 @@
fi
case $BUILD_ARCH in
- armv7hl) BUILD_ARCH="armv7hl:armv7l:armv5tel" ;;
- armv7l) BUILD_ARCH="armv7l:armv5tel" ;;
+ armv7hl) BUILD_ARCH="armv7hl:armv7l:armv6hl:armv6l:armv5tel" ;;
+ armv7l) BUILD_ARCH="armv7l:armv6l:armv5tel" ;;
+ armv6hl) BUILD_ARCH="armv6hl:armv6l:armv5tel" ;;
+ armv6l) BUILD_ARCH="armv6l:armv5tel" ;;
armv5tel) BUILD_ARCH="armv5tel" ;;
i686) BUILD_ARCH="i686:i586:i486:i386" ;;
i586) BUILD_ARCH="i586:i486:i386" ;;
@@ -62,18 +64,13 @@
# to run the qemu initialization in the XEN chroot, we need to
# register it with a static program or shell script
- if [ -z "$VM_IMAGE" ]; then
- if [ -x /usr/sbin/qemu-binfmt-conf.sh ]; then
- return 0
- fi
- elif test -e $BUILD_DIR/initvm.$BUILD_HOST_ARCH && \
+ if test -e $BUILD_DIR/initvm.$BUILD_HOST_ARCH && \
test -e $BUILD_DIR/qemu-reg; then
- return 0 # prefer initvm to handle registration
- elif test -e /bin/bash-static \
- -a -e /bin/mount-static \
- -a -e /usr/sbin/qemu-binfmt-conf.sh; then
- echo "WARNING: using legacy static binaries to register emulator. Please use build-initvm instead."
- return 0 # as backup use /usr/sbin/qemu-binfmt.conf.sh
+ chmod 0755 "$BUILD_DIR/initvm.$BUILD_HOST_ARCH"
+ if [ -z "$PREPARE_VM" ]; then
+ return 0 # chroot build, we need to run
+ fi
+ # emulator in vm already registered during startup
else
# XXX: error?
echo "Warning: cross compile not possible due to missing static binaries. please install build-initvm package for that purpose."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/configs/sl13.1.conf new/obs-build-20131015/configs/sl13.1.conf
--- old/obs-build-20130517/configs/sl13.1.conf 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/configs/sl13.1.conf 2013-10-15 11:43:49.000000000 +0200
@@ -1,16 +1,6 @@
-%define gcc_version 47
-%define opensuse_bs 1
+%define gcc_version 48
Patterntype: rpm-md ymp
-%if "%_repository" == "images"
-Type: kiwi
-Repotype: none
-Patterntype: none
-Prefer: openSUSE-release
-%endif
-%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC"
-Repotype: none
-%endif
Substitute: kiwi-packagemanager:zypper zypper
Substitute: kiwi-packagemanager:smart smart
@@ -29,6 +19,7 @@
Substitute: kiwi-setup:image kiwi createrepo tar -kiwi-desc-isoboot-requires -kiwi-desc-oemboot-requires -kiwi-desc-netboot-requires -kiwi-desc-vmxboot-requires -kiwi-desc-xenboot-requires
Conflict: kiwi:libudev-mini1
Conflict: kiwi:systemd-mini
+Conflict: libudev1:udev-mini
FileProvides: /usr/sbin/groupadd pwdutils
@@ -44,6 +35,7 @@
Order: libopenssl0_9_8:openssl-certs
+Prefer: libdb-4_8-devel
VMinstall: util-linux libmount1 perl-base libdb-4_8 libsepol1 libblkid1 libuuid1 net-tools
ExportFilter: \.x86_64\.rpm$ x86_64
@@ -83,11 +75,6 @@
# Extracting appdata.xml from desktop files
Support: brp-extract-appdata
-# trim the desktop files when building directly in factory
-%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild"
-Support: brp-trim-desktopfiles rpmlint-Factory-strict
-%endif
-
# testing deltas (only for O:F for now!)
#Support: build-mkdrpms deltarpm
@@ -97,12 +84,14 @@
%endif
Prefer: -suse-build-key
-Prefer: krb5 krb5-devel
+Prefer: krb5-mini krb5-mini-devel
+Conflict: krb5-devel:krb5-mini
+Conflict: krb5:krb5-mini-devel
Prefer: krb5-mini-devel:krb5-mini
Prefer: libreadline5
Prefer: libdb_java-4_8 libicu
Prefer: cracklib-dict-small postfix
-Prefer: jta libpng fam mozilla mozilla-nss
+Prefer: jta fam mozilla mozilla-nss
Prefer: unixODBC libsoup glitz
Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE
Prefer: mono-nunit gecko-sharp2
@@ -113,6 +102,7 @@
Prefer: virtualbox-kmp-default virtualbox-host-kmp-default
Prefer: libstdc++6 libgcc_s1 libquadmath0
Prefer: libstdc++6-32bit libstdc++6-64bit
+Prefer: libstdc++6-x86
%ifarch s390x
Prefer: -libstdc++41
%endif
@@ -129,6 +119,7 @@
Prefer: yast2-packagemanager-devel:yast2-packagemanager
Prefer: glitz-32bit:Mesa-32bit
Prefer: poppler-tools
+Prefer: libjpeg8-devel libjpeg-turbo
Prefer: banshee:banshee-engine-gst helix-banshee:helix-banshee-engine-gst
Prefer: banshee-1:banshee-1-client-classic
Prefer: libfam0
@@ -154,6 +145,7 @@
Prefer: gnome-session:gconf2-branding-openSUSE
Prefer: yast2-qt:yast2-qt-branding-openSUSE
Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE
+Prefer: fcitx:fcitx-branding-openSUSE
Prefer: xfce4-notifyd:xfce4-notifyd-branding-upstream
Prefer: exo-data:exo-branding-upstream
Prefer: xfce4-settings:xfce4-settings-branding-upstream
@@ -196,25 +188,25 @@
# provides typelib(St)
Prefer: -cinnamon
Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es
-Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt
+Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt -bundle-lang-kde-el
Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru -bundle-lang-kde-pl
Prefer: -bundle-lang-kde-sv -bundle-lang-kde-ko -bundle-lang-kde-fi -bundle-lang-kde-da
Prefer: -bundle-lang-kde-cs -bundle-lang-kde-nl -bundle-lang-kde-hu -bundle-lang-kde-nb
Prefer: -bundle-lang-kde-it -bundle-lang-kde-ca -bundle-lang-kde-ar
Prefer: -bundle-lang-gnome-es -bundle-lang-gnome-de -bundle-lang-gnome-fr
-Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en
+Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en -bundle-lang-gnome-el
Prefer: -bundle-lang-gnome-zh -bundle-lang-gnome-ja -bundle-lang-gnome-ru -bundle-lang-gnome-cs
Prefer: -bundle-lang-gnome-ko -bundle-lang-gnome-da -bundle-lang-gnome-nl -bundle-lang-gnome-hu
Prefer: -bundle-lang-gnome-pl -bundle-lang-gnome-fi -bundle-lang-gnome-nb -bundle-lang-gnome-sv
Prefer: -bundle-lang-gnome-it -bundle-lang-gnome-ca -bundle-lang-gnome-ar
Prefer: -bundle-lang-gnome-extras-es -bundle-lang-gnome-extras-de -bundle-lang-gnome-extras-fr
-Prefer: -bundle-lang-gnome-extras-pt -bundle-lang-gnome-extras-en
+Prefer: -bundle-lang-gnome-extras-pt -bundle-lang-gnome-extras-en -bundle-lang-gnome-extras-el
Prefer: -bundle-lang-gnome-extras-zh -bundle-lang-gnome-extras-ja -bundle-lang-gnome-extras-ru -bundle-lang-gnome-extras-cs
Prefer: -bundle-lang-gnome-extras-ko -bundle-lang-gnome-extras-da -bundle-lang-gnome-extras-nl -bundle-lang-gnome-extras-hu
Prefer: -bundle-lang-gnome-extras-pl -bundle-lang-gnome-extras-fi -bundle-lang-gnome-extras-nb -bundle-lang-gnome-extras-sv
Prefer: -bundle-lang-gnome-extras-it -bundle-lang-gnome-extras-ca -bundle-lang-gnome-extras-ar
Prefer: -bundle-lang-common-es -bundle-lang-common-de -bundle-lang-common-fr
-Prefer: -bundle-lang-common-pt -bundle-lang-common-en
+Prefer: -bundle-lang-common-pt -bundle-lang-common-en -bundle-lang-common-el
Prefer: -bundle-lang-common-ja -bundle-lang-common-zh -bundle-lang-common-cs -bundle-lang-common-ru
Prefer: -bundle-lang-common-nl -bundle-lang-common-hu -bundle-lang-common-pl -bundle-lang-common-da
Prefer: -bundle-lang-common-ko -bundle-lang-common-nb -bundle-lang-common-fi -bundle-lang-common-sv
@@ -232,14 +224,15 @@
# in doubt, take xerces
Prefer: -crimson
# in doubt, take higher versions
-Prefer: -rubygem-rack-1_1 -rubygem-rack-1_2 -rubygem-rack-1_3 -rubygem-tilt-1_1
+Prefer: -rubygem-rack-1_1 -rubygem-rack-1_2 -rubygem-rack-1_3 -rubygem-tilt-1_1 -rubygem-rack-1_4
Prefer: -rubygem-method_source-0_7 -rubygem-rails-2_3 -rubygem-activerecord-2_3
+Prefer: -rubygem-json_pure-1_5
Prefer: geronimo-servlet-2_4-api
-Prefer: -libhdf5-0-openmpi -libhdf5_hl0-openmpi
+Prefer: -libhdf5-0-openmpi -libhdf5_hl0-openmpi -libhdf5_hl8-openmpi -libhdf5-8-openmpi
# for now gstream 0.10 is it
Prefer: typelib-1_0-Gst-0_10 gstreamer-0_10-utils-unversioned gstreamer-0_10-utils typelib-1_0-GstInterfaces-0_10
# prefer the small systemd for building
-Prefer: libudev-mini-devel libudev-mini1
+Prefer: libudev-mini-devel libudev-mini1 udev-debuginfo libudev1-debuginfo
Prefer: systemd-mini systemd-mini-devel
Prefer: systemd-mini-devel:systemd-mini
Prefer: udev-mini
@@ -248,10 +241,10 @@
# the -32bit stuff provides things it shouldn't (hopefully temporary)
Prefer: -typelib-1_0-GdkPixbuf-2_0-32bit -typelib-1_0-Pango-1_0-32bit
Prefer: postgresql postgresql-server
+Prefer: -unzip-rcc
# kernel bug (coolo)
Prefer: kernel-default-devel
-Prefer: -libffi43
Prefer: wxWidgets-2_9-devel
@@ -259,11 +252,12 @@
Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis
Prefer: -vmware-player
Prefer: libgcc_s1 libgcc_s1-32bit libgcc_s1-64bit
-Prefer: libgcc_s1-x86 libffi4 libffi4-devel libgcj_bc%{gcc_version}
+Prefer: libffi%{gcc_version} libffi%{gcc_version}-devel
+Prefer: libgcc_s1-x86 libffi4 libgcj_bc1
Prefer: libffi4-32bit libffi4-64bit
Prefer: libgomp1 libgomp1-32bit libgomp1-64bit
-Prefer: libmudflap%{gcc_version} libmudflap%{gcc_version}-32bit libmudflap%{gcc_version}-64bit
-Prefer: libobjc%{gcc_version} libgfortran3 libquadmath%{gcc_version}
+Prefer: libmudflap4 libmudflap4-32bit libmudflap4-64bit
+Prefer: libobjc4 libgfortran3 libquadmath0
Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini -libiso9660-7-mini -libcdio10-mini -libcdio12-mini
Prefer: -libcdio-mini -faac-mini -libcdio-mini-devel
Prefer: -seamonkey
@@ -290,7 +284,7 @@
Prefer: libgnome-keyring-devel
Prefer: linux-glibc-devel
Prefer: squid sysvinit
-Prefer: libpng15-compat-devel
+Prefer: libpng16-compat-devel
Prefer: -python3 -python3-gobject-devel -python3-gobject2-devel -x11-video-fglrxG02 -libpng12-0
Prefer: perl-Mail-SPF:perl-Error libldb0 -audit-libs mysql-community-server mysql-community-server-client
#needed because new xml-commons package
@@ -299,16 +293,20 @@
Prefer: libxfce4ui:libxfce4ui-branding-upstream
Prefer: libgarcon-1-0:libgarcon-branding-upstream
Prefer: libgarcon-data:libgarcon-branding-upstream
+Prefer: libexo-1-0:libexo-1-0-branding-upstream
Prefer: gnome-shell:mozilla-js20
Prefer: cogl-devel
Prefer: -perl-XML-SAX
# prefer module-init-tools
Prefer: -kmod-compat
+Prefer: gettext-tools-mini gettext-runtime-mini
+# choice p11-kit-nss-trust
+Prefer: mozilla-nss-certs
+# amarok dependency
+Prefer: phonon-backend-gstreamer-0_10
-Ignore: java-1_7_0-openjdk:libgif.so.6()(64bit)
-Ignore: java-1_7_0-openjdk:libgif.so.4()(64bit)
-Ignore: java-1_7_0-openjdk:libgif.so.6
-Ignore: java-1_7_0-openjdk:libgif.so.4
+Ignore: java-1_7_0-openjdk:mozilla-nss
+Ignore: java-1_7_0-openjdk:java-ca-certificates
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
Ignore: cracklib:cracklib-dict
Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,distribution-release,udev
@@ -371,6 +369,8 @@
Ignore: yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation
Ignore: yast2-bootloader:bootloader-theme
Ignore: yast2-packager:yast2-x11,libyui_pkg
+# not during build
+Ignore: yui_backend
Ignore: yast2-x11:sax2-libsax-perl
Ignore: yast2-network:yast2-inetd
Ignore: openslp-devel:openssl-devel
@@ -422,6 +422,10 @@
Ignore: bison:info
Ignore: flex:info
Ignore: help2man:info
+Ignore: man:groff-full
+Ignore: git-core:rsync
+Ignore: apache2:systemd
+Ignore: icewm-lite:icewm
Ignore: libgcc:glibc-32bit
Ignore: libgcc41:glibc-32bit
@@ -468,6 +472,7 @@
Ignore: xdg-menu:desktop-data
Ignore: nessus-libraries:nessus-core
Ignore: evolution:yelp
+Ignore: e17:e17-branding e17:e17-theme
Ignore: mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp)
Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp)
@@ -510,7 +515,8 @@
Ignore: openwbem-devel
Ignore: MozillaFirefox:MozillaFirefox-branding
Ignore: yast2:yast2-branding
-Ignore: plymouth:plymouth-branding
+Ignore: plymouth:plymouth-branding
+Ignore: plymouth:suspend
Ignore: yast2-qt:yast2-branding
Ignore: yast2-theme-SLE:yast2-branding
Ignore: yast2-registration:yast2-registration-branding
@@ -544,19 +550,17 @@
Ignore: NetworkManager:dhcp-client
Ignore: autoyast2:yast2-schema
Ignore: libgio-2_0-0:dbus-1-x11
+Ignore: weather-wallpaper:inkscape
%ifarch %arm
Prefer: java-1_7_0-icedtea java-1_7_0-icedtea-devel
%else
-%ifnarch ia64 s390 s390x
+%ifnarch s390 s390x
Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel
%endif
%ifarch s390 s390x
Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel
%endif
-%ifarch ia64
-Prefer: java-1_6_0-bea java-1_6_0-bea-devel
-%endif
%endif
Prefer: -java-1_5_0-gcj-compat-devel
@@ -606,29 +610,62 @@
Substitute: yast2-theme-SLED
Substitute: yast2-theme-SLE
-Optflags: i586 -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches
-Optflags: i686 -march=i686 -mtune=generic -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches
-Optflags: x86_64 -fmessage-length=0 -grecord-gcc-switches
-Optflags: ppc -fmessage-length=0 -grecord-gcc-switches
-Optflags: ppc64 -fmessage-length=0 -grecord-gcc-switches
-Optflags: ia64 -fmessage-length=0 -grecord-gcc-switches
-Optflags: s390 -fmessage-length=0 -grecord-gcc-switches
-Optflags: s390x -fmessage-length=0 -grecord-gcc-switches
-Optflags: armv5el -fmessage-length=0 -grecord-gcc-switches
-Optflags: armv5tel -fmessage-length=0 -grecord-gcc-switches
-Optflags: armv7l -fmessage-length=0 -grecord-gcc-switches
-Optflags: armv7hl -fmessage-length=0 -grecord-gcc-switches
+Optflags: i586 -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: i686 -march=i686 -mtune=generic -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: x86_64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ppc -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ppc64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ia64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: s390 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: s390x -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv6l -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv6hl -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv7l -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv7hl -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: aarch64 -fmessage-length=0 -grecord-gcc-switches
# need mcpu=ultrasparc to complete sparcv8plus to sparcv9 (adds, for example, atomic ops)
-Optflags: sparcv9 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc
-Optflags: sparc64 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc
+Optflags: sparcv9 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc -fstack-protector
+Optflags: sparc64 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc -fstack-protector
%ifarch sparcv9
Target: sparcv9
%endif
+# Workaround buildservice bug (scheduler arch not matching target arch)
+%ifarch armv7l armv7hl
+Target: armv7hl-suse-linux
+%endif
+%ifarch armv6l armv6hl
+Target: armv6hl-suse-linux
+%endif
-Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
+Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables -fasynchronous-unwind-tables
%define suse_version 1310
+%ifarch aarch64 armv6l armv6hl
+%define qemu_user_space_build 1
+%endif
+
+%if "%qemu_user_space_build" == "1"
+Hostarch: x86_64
+Constraint: hostlabel QEMU_ARM
+
+Macros:
+%qemu_user_space_build 1
+%_without_mono 1
+:Macros
+
+%ifarch armv6l armv6hl
+Preinstall: qemu-linux-user
+%endif
+
+%ifarch armv7l armv7hl
+Preinstall: qemu-linux-user
+%endif
+
+ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7l armv6l
+%endif
+
+
Macros:
%insserv_prereq insserv sed
%fillup_prereq fillup coreutils grep diffutils
@@ -645,7 +682,7 @@
%_vendor suse
# define which gcc package builds the system libraries
-%product_libs_gcc_ver 47
+%product_libs_gcc_ver 48
%ext_info .gz
%ext_man .gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/configs/sl13.2.conf new/obs-build-20131015/configs/sl13.2.conf
--- old/obs-build-20130517/configs/sl13.2.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/obs-build-20131015/configs/sl13.2.conf 2013-10-15 11:43:49.000000000 +0200
@@ -0,0 +1,695 @@
+%define gcc_version 48
+
+Patterntype: rpm-md ymp
+
+Substitute: kiwi-packagemanager:zypper zypper
+Substitute: kiwi-packagemanager:smart smart
+Substitute: kiwi-packagemanager:instsource kiwi-instsource cdrkit-cdrtools-compat syslinux kiwi-instsource-plugins-openSUSE-12-1
+Substitute: kiwi-filesystem:ext3 e2fsprogs
+Substitute: kiwi-filesystem:ext4 e2fsprogs
+Substitute: kiwi-filesystem:squashfs squashfs
+Substitute: kiwi-filesystem:btrfs btrfsprogs
+Substitute: kiwi-boot:usbboot kiwi
+Substitute: kiwi-boot:isoboot kiwi-desc-isoboot kiwi-desc-isoboot-requires
+Substitute: kiwi-boot:oemboot kiwi-desc-oemboot kiwi-desc-oemboot-requires
+Substitute: kiwi-boot:tbz kiwi-desc-oemboot kiwi-desc-oemboot-requires
+Substitute: kiwi-boot:netboot kiwi-desc-netboot kiwi-desc-netboot-requires
+Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot kiwi-desc-vmxboot-requires
+Substitute: kiwi-boot:xenboot kiwi-desc-xenboot kiwi-desc-xenboot-requires
+Substitute: kiwi-setup:image kiwi createrepo tar -kiwi-desc-isoboot-requires -kiwi-desc-oemboot-requires -kiwi-desc-netboot-requires -kiwi-desc-vmxboot-requires -kiwi-desc-xenboot-requires
+Conflict: kiwi:libudev-mini1
+Conflict: kiwi:systemd-mini
+Conflict: libudev1:udev-mini
+
+FileProvides: /usr/sbin/groupadd pwdutils
+
+Preinstall: aaa_base attr bash coreutils diffutils
+Preinstall: filesystem fillup glibc grep
+Preinstall: libbz2-1 libgcc_s1 m4 libncurses5 pam
+Preinstall: permissions libreadline6 rpm sed tar libz1 libselinux1
+Preinstall: liblzma5 libcap2 libacl1 libattr1
+Preinstall: libpopt0 libelf1 liblua5_1
+Preinstall: libpcre1
+
+Runscripts: aaa_base
+
+Order: libopenssl0_9_8:openssl-certs
+
+Prefer: libdb-4_8-devel
+VMinstall: util-linux libmount1 perl-base libdb-4_8 libsepol1 libblkid1 libuuid1 net-tools
+
+ExportFilter: \.x86_64\.rpm$ x86_64
+ExportFilter: \.ia64\.rpm$ ia64
+ExportFilter: \.s390x\.rpm$ s390x
+ExportFilter: \.ppc64\.rpm$ ppc64
+ExportFilter: \.ppc\.rpm$ ppc
+ExportFilter: -ia32-.*\.rpm$
+ExportFilter: -32bit-.*\.sparc64\.rpm$
+ExportFilter: -64bit-.*\.sparcv9\.rpm$
+ExportFilter: \.armv7l\.rpm$ armv7l
+ExportFilter: \.armv7hl\.rpm$ armv7l
+ExportFilter: ^glibc(?:-devel)?-32bit-.*\.sparc64\.rpm$ sparc64
+ExportFilter: ^glibc(?:-devel)?-64bit-.*\.sparcv9\.rpm$ sparcv9
+# it would be a great idea to have, but sometimes installation-images wants to build debuginfos in
+#ExportFilter: -debuginfo-.*\.rpm$
+#ExportFilter: -debugsource-.*\.rpm$
+ExportFilter: ^master-boot-code.*\.i586.rpm$ . x86_64
+ExportFilter: ^acroread.*\.i586.rpm$ . x86_64
+ExportFilter: ^avmailgate.*\.i586.rpm$ . x86_64
+ExportFilter: ^avmailgate.*\.ppc.rpm$ . ppc64
+ExportFilter: ^avmailgate.*\.s390.rpm$ . s390x
+ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64
+ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64
+ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x
+
+Required: rpm-build
+
+# needed for su's default config - perhaps we should use a simplified form?
+Support: pam-modules
+
+# the basic stuff
+Support: perl build-mkbaselibs
+Support: brp-check-suse post-build-checks rpmlint-Factory
+# remove build-compare support to disable "same result" package dropping
+Support: build-compare
+# Extracting appdata.xml from desktop files
+Support: brp-extract-appdata
+
+# testing deltas (only for O:F for now!)
+#Support: build-mkdrpms deltarpm
+
+%ifarch ia64
+Support: libunwind libunwind-devel
+Preinstall: libunwind
+%endif
+
+Prefer: -suse-build-key
+Prefer: krb5-mini krb5-mini-devel
+Conflict: krb5-devel:krb5-mini
+Conflict: krb5:krb5-mini-devel
+Prefer: krb5-mini-devel:krb5-mini
+Prefer: libreadline5
+Prefer: libdb_java-4_8 libicu
+Prefer: cracklib-dict-small postfix
+Prefer: jta fam mozilla mozilla-nss
+Prefer: unixODBC libsoup glitz
+Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE
+Prefer: mono-nunit gecko-sharp2
+Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript
+Prefer: gtk-sharp2 glib-sharp2 glade-sharp2
+Prefer: libzypp-zmd-backend novell-NLDAPsdk zaptel-kmp-default
+Prefer: hbedv-dazuko-kmp-default dazuko-kmp-default vmware-wkstnmods-kmp-default
+Prefer: virtualbox-kmp-default virtualbox-host-kmp-default
+Prefer: libstdc++6 libgcc_s1 libquadmath0
+Prefer: libstdc++6-32bit libstdc++6-64bit
+Prefer: libstdc++6-x86
+%ifarch s390x
+Prefer: -libstdc++41
+%endif
+Prefer: libstroke
+# for symbol syslog (syslogd is best as it has the least dependencies)
+Prefer: syslog-service syslogd
+Prefer: gnome-sharp2:art-sharp2 gnome-sharp:art-sharp
+Prefer: ifolder3:gnome-sharp2 ifolder3:gconf-sharp2
+Prefer: nautilus-ifolder3:gnome-sharp2 inkscape:gtkmm24
+Prefer: gconf-sharp2:glade-sharp2 gconf-sharp:glade-sharp
+Prefer: gjdoc:antlr-bootstrap
+Prefer: tomboy:gconf-sharp2 tomboy:gnome-sharp2
+Prefer: zmd:libzypp-zmd-backend
+Prefer: yast2-packagemanager-devel:yast2-packagemanager
+Prefer: glitz-32bit:Mesa-32bit
+Prefer: poppler-tools
+Prefer: libjpeg8-devel libjpeg-turbo
+Prefer: banshee:banshee-engine-gst helix-banshee:helix-banshee-engine-gst
+Prefer: banshee-1:banshee-1-client-classic
+Prefer: libfam0
+Prefer: java-1_5_0-ibm:java-1_5_0-ibm-alsa
+Prefer: java-1_5_0-ibm:java-1_5_0-ibm-fonts
+Prefer: java-1_6_0-ibm:java-1_6_0-ibm-fonts
+Prefer: microcode_ctl:kernel-default
+Prefer: notification-daemon
+Prefer: pkg-config gtk-doc wlan-kmp-default lua-libs lua-devel
+Prefer: gnu-jaf classpathx-mail avahi-compat-mDNSResponder yast2-control-center-qt
+Prefer: vim-normal myspell-american wine
+Prefer: eclipse-platform eclipse-scripts
+Prefer: yast2-theme-openSUSE
+Prefer: amarok:amarok-xine
+Prefer: kdenetwork3-vnc:tightvnc
+Prefer: libgweather0 jessie ndesk-dbus ndesk-dbus-glib tomcat6-jsp-2_1-api tomcat6-servlet-2_5-api
+Prefer: icewm-lite
+Prefer: patterns-openSUSE-GNOME-cd:banshee
+Prefer: yast2-ncurses-pkg
+Prefer: monodevelop: mono-addins
+Prefer: ant-trax:saxon
+Prefer: gnome-session:gnome-session-branding-openSUSE
+Prefer: gnome-session:gconf2-branding-openSUSE
+Prefer: yast2-qt:yast2-qt-branding-openSUSE
+Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE
+Prefer: fcitx:fcitx-branding-openSUSE
+Prefer: xfce4-notifyd:xfce4-notifyd-branding-upstream
+Prefer: exo-data:exo-branding-upstream
+Prefer: xfce4-settings:xfce4-settings-branding-upstream
+Prefer: xfdesktop:xfdesktop-branding-upstream
+Prefer: texlive-xmltex texlive-tools texlive-jadetex
+Prefer: mono-web:mono-data-sqlite
+Prefer: gnome-games:gnuchess
+Prefer: glchess:gnuchess
+Prefer: libreoffice:libreoffice-branding-upstream
+Prefer: yast2-branding-openSUSE
+Prefer: gimp:gimp-branding-upstream
+Prefer: libesd-devel:esound
+Prefer: libesd0:esound-daemon
+Prefer: package-lists-openSUSE-KDE-cd: esound-daemon
+Prefer: glib2:glib2-branding-upstream
+Prefer: libgio-2_0-0:gio-branding-upstream
+Prefer: libglib-2_0-0:glib2-branding-upstream
+Prefer: kdelibs4:kdelibs4-branding-upstream
+Prefer: kdebase4-workspace:kdebase4-workspace-branding-upstream
+Prefer: kdelibs4-branding:kdelibs4-branding-upstream
+Prefer: PackageKit:PackageKit-branding-upstream
+Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
+Prefer: mysql-connector-java:java-1_5_0-gcj-compat
+Prefer: -geronimo-jta-1_0_1B-api -geronimo-jms-1_1-api -geronimo-el-1_0-api
+Prefer: rhino:xmlbeans-mini
+Prefer: ghostscript-devel:ghostscript-library
+Prefer: gdm:gdm-branding-upstream
+Prefer: rpcbind log4j-mini eclipse-source
+Prefer: mx4j:log4j-mini
+Prefer: podsleuth:sg3_utils
+Prefer: libcdio_cdda0 libcdio_paranoia0
+Prefer: mozilla-xulrunner191
+Prefer: mozilla-xulrunner191-32bit
+Prefer: boo tog-pegasus
+Prefer: kde4-kupdateapplet:kde4-kupdateapplet-zypp
+Prefer: kdebase4-workspace:kdebase4-workspace-ksysguardd
+Prefer: ant:xerces-j2
+Prefer: dhcp-client:dhcp
+Prefer: dummy-release
+# provides typelib(St)
+Prefer: -cinnamon
+Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es
+Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt -bundle-lang-kde-el
+Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru -bundle-lang-kde-pl
+Prefer: -bundle-lang-kde-sv -bundle-lang-kde-ko -bundle-lang-kde-fi -bundle-lang-kde-da
+Prefer: -bundle-lang-kde-cs -bundle-lang-kde-nl -bundle-lang-kde-hu -bundle-lang-kde-nb
+Prefer: -bundle-lang-kde-it -bundle-lang-kde-ca -bundle-lang-kde-ar
+Prefer: -bundle-lang-gnome-es -bundle-lang-gnome-de -bundle-lang-gnome-fr
+Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en -bundle-lang-gnome-el
+Prefer: -bundle-lang-gnome-zh -bundle-lang-gnome-ja -bundle-lang-gnome-ru -bundle-lang-gnome-cs
+Prefer: -bundle-lang-gnome-ko -bundle-lang-gnome-da -bundle-lang-gnome-nl -bundle-lang-gnome-hu
+Prefer: -bundle-lang-gnome-pl -bundle-lang-gnome-fi -bundle-lang-gnome-nb -bundle-lang-gnome-sv
+Prefer: -bundle-lang-gnome-it -bundle-lang-gnome-ca -bundle-lang-gnome-ar
+Prefer: -bundle-lang-gnome-extras-es -bundle-lang-gnome-extras-de -bundle-lang-gnome-extras-fr
+Prefer: -bundle-lang-gnome-extras-pt -bundle-lang-gnome-extras-en -bundle-lang-gnome-extras-el
+Prefer: -bundle-lang-gnome-extras-zh -bundle-lang-gnome-extras-ja -bundle-lang-gnome-extras-ru -bundle-lang-gnome-extras-cs
+Prefer: -bundle-lang-gnome-extras-ko -bundle-lang-gnome-extras-da -bundle-lang-gnome-extras-nl -bundle-lang-gnome-extras-hu
+Prefer: -bundle-lang-gnome-extras-pl -bundle-lang-gnome-extras-fi -bundle-lang-gnome-extras-nb -bundle-lang-gnome-extras-sv
+Prefer: -bundle-lang-gnome-extras-it -bundle-lang-gnome-extras-ca -bundle-lang-gnome-extras-ar
+Prefer: -bundle-lang-common-es -bundle-lang-common-de -bundle-lang-common-fr
+Prefer: -bundle-lang-common-pt -bundle-lang-common-en -bundle-lang-common-el
+Prefer: -bundle-lang-common-ja -bundle-lang-common-zh -bundle-lang-common-cs -bundle-lang-common-ru
+Prefer: -bundle-lang-common-nl -bundle-lang-common-hu -bundle-lang-common-pl -bundle-lang-common-da
+Prefer: -bundle-lang-common-ko -bundle-lang-common-nb -bundle-lang-common-fi -bundle-lang-common-sv
+Prefer: -bundle-lang-common-it -bundle-lang-common-ca -bundle-lang-common-ar
+Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
+Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
+Prefer: -zmd -libreoffice -pam-laus -libgcc-tree-ssa -busybox-links
+Prefer: -python-setuptools
+Prefer: -kdenetwork3-InstantMessenger
+Prefer: -icc-profiles
+Prefer: libsocialweb:libsocialweb-branding-upstream
+Prefer: gnome-panel:gnome-panel-branding-upstream
+Prefer: vala
+Prefer: wallpaper-branding-openSUSE
+# in doubt, take xerces
+Prefer: -crimson
+# in doubt, take higher versions
+Prefer: -rubygem-rack-1_1 -rubygem-rack-1_2 -rubygem-rack-1_3 -rubygem-tilt-1_1 -rubygem-rack-1_4
+Prefer: -rubygem-method_source-0_7 -rubygem-rails-2_3 -rubygem-activerecord-2_3
+Prefer: -rubygem-json_pure-1_5
+Prefer: geronimo-servlet-2_4-api
+Prefer: -libhdf5-0-openmpi -libhdf5_hl0-openmpi -libhdf5_hl8-openmpi -libhdf5-8-openmpi
+# for now gstream 0.10 is it
+Prefer: typelib-1_0-Gst-0_10 gstreamer-0_10-utils-unversioned gstreamer-0_10-utils typelib-1_0-GstInterfaces-0_10
+# prefer the small systemd for building
+Prefer: libudev-mini-devel libudev-mini1 udev-debuginfo libudev1-debuginfo
+Prefer: systemd-mini systemd-mini-devel
+Prefer: systemd-mini-devel:systemd-mini
+Prefer: udev-mini
+Prefer: libudev1:udev
+Prefer: xmlgraphics-commons:apache-commons-io
+# the -32bit stuff provides things it shouldn't (hopefully temporary)
+Prefer: -typelib-1_0-GdkPixbuf-2_0-32bit -typelib-1_0-Pango-1_0-32bit
+Prefer: postgresql postgresql-server
+Prefer: -unzip-rcc
+
+# kernel bug (coolo)
+Prefer: kernel-default-devel
+
+Prefer: wxWidgets-2_9-devel
+
+Prefer: -NX -xaw3dd -db43
+Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis
+Prefer: -vmware-player
+Prefer: libgcc_s1 libgcc_s1-32bit libgcc_s1-64bit
+Prefer: libffi%{gcc_version} libffi%{gcc_version}-devel
+Prefer: libgcc_s1-x86 libffi4 libgcj_bc1
+Prefer: libffi4-32bit libffi4-64bit
+Prefer: libgomp1 libgomp1-32bit libgomp1-64bit
+Prefer: libmudflap4 libmudflap4-32bit libmudflap4-64bit
+Prefer: libobjc4 libgfortran3 libquadmath0
+Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini -libiso9660-7-mini -libcdio10-mini -libcdio12-mini
+Prefer: -libcdio-mini -faac-mini -libcdio-mini-devel
+Prefer: -seamonkey
+Prefer: -libdb-4_4-devel -libdb-4_5-devel -libevoldap-2_4-2
+Prefer: libopenal0-soft openal-soft -lsb-buildenv
+Prefer: -libevent
+Prefer: gnu-crypto libusb-compat-devel
+Prefer: libusb-0_1-4
+Prefer: CASA_auth_token_svc:xerces-j2
+Prefer: libreoffice:xerces-j2
+Prefer: k3b:libdvdread4
+Prefer: glibc-devel
+Prefer: -libpcap -libiniparser -loudmouth -libkonq4 -libnetcdf-4 -java-1_7_0-openjdk-javadoc -java-1_7_0-icedtea-javadoc
+%ifnarch %arm
+Prefer: -java-1_7_0-icedtea-devel
+%endif
+Prefer: NetworkManager:dhcp-client
+Prefer: kdebase3-SuSE:kdebase3
+Prefer: kde4-kdm:kde4-kdm-branding-upstream
+Prefer: kdm:kdm-branding-upstream
+Prefer: pcre-tools
+Prefer: libpopt0
+Prefer: -apache2-mod_perl -otrs -qa_apache_testsuite -ctcs2
+Prefer: libgnome-keyring-devel
+Prefer: linux-glibc-devel
+Prefer: squid sysvinit
+Prefer: libpng16-compat-devel
+Prefer: -python3 -python3-gobject-devel -python3-gobject2-devel -x11-video-fglrxG02 -libpng12-0
+Prefer: perl-Mail-SPF:perl-Error libldb0 -audit-libs mysql-community-server mysql-community-server-client
+#needed because new xml-commons package
+Prefer: xml-commons-resolver12 xml-commons-jaxp-1.3-apis
+Prefer: xmlgraphics-fop:xerces-j2
+Prefer: libxfce4ui:libxfce4ui-branding-upstream
+Prefer: libgarcon-1-0:libgarcon-branding-upstream
+Prefer: libgarcon-data:libgarcon-branding-upstream
+Prefer: libexo-1-0:libexo-1-0-branding-upstream
+Prefer: gnome-shell:mozilla-js20
+Prefer: cogl-devel
+Prefer: -perl-XML-SAX
+# prefer module-init-tools
+Prefer: -kmod-compat
+Prefer: gettext-tools-mini gettext-runtime-mini
+# choice p11-kit-nss-trust
+Prefer: mozilla-nss-certs
+# amarok dependency
+Prefer: phonon-backend-gstreamer-0_10
+
+Ignore: java-1_7_0-openjdk:mozilla-nss
+Ignore: java-1_7_0-openjdk:java-ca-certificates
+Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
+Ignore: cracklib:cracklib-dict
+Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,distribution-release,udev
+Ignore: sysvinit:mingetty
+Ignore: gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel
+Ignore: libgcj43,libstdc++43-devel
+Ignore: libgcj44,libstdc++44-devel
+Ignore: libgcj45,libstdc++45-devel
+Ignore: libgcj46,libstdc++46-devel
+Ignore: libgcj47,libstdc++47-devel
+Ignore: pwdutils:openslp
+Ignore: pam-modules:resmgr
+Ignore: rpm:suse-build-key,build-key
+Ignore: bind-utils:bind-libs
+Ignore: alsa:dialog,pciutils
+Ignore: portmap:syslogd
+Ignore: xorg-x11:x11-tools,resmgr,xkeyboard-config,xorg-x11-Mesa,libusb,freetype2,libjpeg,libpng
+Ignore: xorg-x11-server:xorg-x11-driver-input,xorg-x11-driver-video
+Ignore: apache2:logrotate
+Ignore: arts:alsa,audiofile,resmgr,libogg,libvorbis
+Ignore: kdelibs3:alsa,arts,OpenEXR,aspell,cups-libs,mDNSResponder-lib,krb5,libjasper
+Ignore: kdelibs3-devel:libvorbis-devel
+Ignore: kdebase3:kdebase3-ksysguardd,OpenEXR,dbus-1,dbus-1-qt,hal,powersave,openslp,libusb
+Ignore: kdebase3-SuSE:release-notes
+Ignore: jack:alsa,libsndfile
+Ignore: libxml2-devel:readline-devel
+Ignore: gnome-vfs2:gnome-mime-data,desktop-file-utils,cdparanoia,dbus-1,dbus-1-glib,hal,libsmbclient,fam,file_alteration
+Ignore: libgda:file_alteration
+Ignore: gnutls:lzo,libopencdk
+Ignore: gnutls-devel:lzo-devel,libopencdk-devel
+Ignore: pango:cairo,glitz,libpixman,libpng
+Ignore: pango-devel:cairo-devel
+Ignore: cairo-devel:libpixman-devel
+Ignore: libgnomeprint:libgnomecups
+Ignore: libgnomeprintui:libgnomecups
+Ignore: orbit2-devel:indent
+Ignore: qt3:libmng
+Ignore: qt-sql:qt_database_plugin
+Ignore: gtk2:libpng,libtiff
+Ignore: libgnomecanvas-devel:glib-devel
+Ignore: libgnomeui:gnome-icon-theme,shared-mime-info
+Ignore: scrollkeeper:docbook_4
+Ignore: gnome-desktop:libgnomesu,startup-notification
+Ignore: python-devel:python-tk
+Ignore: gnome-pilot:gnome-panel
+Ignore: gnome-panel:control-center2
+Ignore: gnome-menus:kdebase3
+Ignore: gnome-main-menu:rug
+Ignore: libbonoboui:gnome-desktop
+Ignore: libxfce4ui-1-0:exo-tools
+Ignore: docbook_4:iso_ent,xmlcharent
+Ignore: control-center2:nautilus,evolution-data-server,gnome-menus,gstreamer-plugins,gstreamer,metacity,mozilla-nspr,mozilla,libxklavier,gnome-desktop,startup-notification
+Ignore: docbook-xsl-stylesheets:xmlcharent
+Ignore: liby2util-devel:libstdc++-devel,openssl-devel
+Ignore: yast2:yast2-ncurses,yast2_theme,perl-Config-Crontab,yast2-xml,SuSEfirewall2
+Ignore: yast2-core:netcat,hwinfo,wireless-tools,sysfsutils
+Ignore: yast2-core-devel:libxcrypt-devel,hwinfo-devel,blocxx-devel,sysfsutils,libstdc++-devel
+Ignore: yast2-packagemanager-devel:rpm-devel,curl-devel,openssl-devel
+Ignore: yast2-devtools:libxslt
+Ignore: yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation
+Ignore: yast2-bootloader:bootloader-theme
+Ignore: yast2-packager:yast2-x11,libyui_pkg
+# not during build
+Ignore: yui_backend
+Ignore: yast2-x11:sax2-libsax-perl
+Ignore: yast2-network:yast2-inetd
+Ignore: openslp-devel:openssl-devel
+Ignore: java-1_4_2-sun:xorg-x11-libs
+Ignore: java-1_4_2-sun-devel:xorg-x11-libs
+Ignore: tetex:xorg-x11-libs,expat,fontconfig,freetype2,libjpeg,ghostscript-x11,xaw3d,gd,dialog,ed
+Ignore: texlive-bin:ghostscript-x11
+Ignore: texlive-bin-omega:ghostscript-x11
+Ignore: yast2-country:yast2-trans-stats
+Ignore: tpb:tpctl-kmp
+Ignore: tpctl:tpctl-kmp
+Ignore: zaptel:zaptel-kmp
+Ignore: mkinitrd:pciutils
+Ignore: pciutils:pciutils-ids
+Ignore: postfix:iproute2
+Ignore: aaa_base:systemd
+Ignore: ConsoleKit:systemd
+Ignore: openssh:systemd
+Ignore: cronie:systemd
+Ignore: systemd:kbd
+Ignore: systemd:systemd-presets-branding
+Ignore: systemd:dbus-1
+Ignore: systemd:pam-config
+Ignore: systemd:udev
+Ignore: systemd-mini:this-is-only-for-build-envs
+Ignore: polkit:ConsoleKit
+Ignore: logrotate:cron
+Ignore: texlive-filesystem:cron
+Ignore: xinit:xterm
+Ignore: xdm:xterm
+Ignore: gnome-control-center:gnome-themes-accessibility
+Ignore: coreutils:info
+Ignore: cpio:info
+Ignore: diffutils:info
+Ignore: findutils:info
+Ignore: gawk:info
+Ignore: grep:info
+Ignore: groff:info
+Ignore: m4:info
+Ignore: sed:info
+Ignore: tar:info
+Ignore: util-linux:info
+Ignore: gettext-tools:info
+Ignore: gettext-runtime:info
+Ignore: libgcrypt-devel:info
+Ignore: binutils:info
+Ignore: gzip:info
+Ignore: make:info
+Ignore: bison:info
+Ignore: flex:info
+Ignore: help2man:info
+Ignore: man:groff-full
+Ignore: git-core:rsync
+Ignore: apache2:systemd
+Ignore: icewm-lite:icewm
+
+Ignore: libgcc:glibc-32bit
+Ignore: libgcc41:glibc-32bit
+Ignore: libgcc42:glibc-32bit
+Ignore: libgcc43:glibc-32bit
+Ignore: libgcc44:glibc-32bit
+Ignore: libgcc45:glibc-32bit
+Ignore: libgcc46:glibc-32bit
+Ignore: libgcc47:glibc-32bit
+Ignore: libstdc++:glibc-32bit
+Ignore: libstdc41++:glibc-32bit
+Ignore: libstdc42++:glibc-32bit
+Ignore: libstdc43++:glibc-32bit
+Ignore: libstdc44++:glibc-32bit
+Ignore: libstdc45++:glibc-32bit
+Ignore: libstdc46++:glibc-32bit
+Ignore: libstdc47++:glibc-32bit
+Ignore: ncurses-32bit
+
+Ignore: susehelp:susehelp_lang,suse_help_viewer
+Ignore: mailx:smtp_daemon
+Ignore: cron:smtp_daemon
+Ignore: hotplug:syslog
+Ignore: pcmcia:syslog
+Ignore: openct:syslog
+Ignore: postfix:sysvinit(syslog)
+Ignore: cups:sysvinit(syslog)
+Ignore: avalon-logkit:servlet
+Ignore: jython:servlet
+Ignore: ispell:ispell_dictionary,ispell_english_dictionary
+Ignore: aspell:aspel_dictionary,aspell_dictionary
+Ignore: smartlink-softmodem:kernel,kernel-nongpl
+Ignore: libreoffice-de:myspell-german-dictionary
+Ignore: libreoffice:libreoffice-i18n
+Ignore: libreoffice:libreoffice-icon-themes
+Ignore: mediawiki:php-session,php-gettext,php-zlib,php-mysql,mod_php_any
+Ignore: squirrelmail:mod_php_any,php-session,php-gettext,php-iconv,php-mbstring,php-openssl
+
+Ignore: simias:mono(log4net)
+Ignore: zmd:mono(log4net)
+Ignore: horde:mod_php_any,php-gettext,php-mcrypt,php-imap,php-pear-log,php-pear,php-session,php
+
+Ignore: xerces-j2:xml-commons-apis,xml-commons-resolver
+Ignore: xdg-menu:desktop-data
+Ignore: nessus-libraries:nessus-core
+Ignore: evolution:yelp
+Ignore: e17:e17-branding e17:e17-theme
+
+Ignore: mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp)
+Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp)
+
+Ignore: vcdimager:libcdio.so.6,libcdio.so.6(CDIO_6),libiso9660.so.4,libiso9660.so.4(ISO9660_4)
+Ignore: libcdio:libcddb.so.2
+
+Ignore: gnome-libs:libgnomeui
+Ignore: nautilus:gnome-themes
+Ignore: gnome-panel:gnome-themes
+Ignore: gnome-panel:tomboy
+Ignore: NetworkManager:NetworkManager-client
+Ignore: libbeagle:beagle
+Ignore: coreutils:coreutils-lang
+Ignore: cpio:cpio-lang
+Ignore: glib2:glib2-lang
+Ignore: gtk2:gtk2-lang
+Ignore: gtk:gtk-lang
+Ignore: atk:atk-lang
+Ignore: hal:pm-utils
+Ignore: MozillaThunderbird:pinentry-dialog
+Ignore: seamonkey:pinentry-dialog
+Ignore: pinentry:pinentry-dialog
+Ignore: gpg2:gpg2-lang
+Ignore: util-linux:util-linux-lang
+Ignore: suseRegister:distribution-release
+Ignore: compiz:compiz-decorator
+Ignore: icecream:gcc-c++
+Ignore: no
+Ignore: package
+Ignore: provides
+Ignore: j9vm/libjvm.so()(64bit)
+Ignore: kdepim3:suse_help_viewer
+Ignore: kdebase3-SuSE:kdebase3-SuSE-branding
+Ignore: kio_sysinfo:kdebase3-SuSE-branding
+Ignore: gnome-menus:gnome-menus-branding
+Ignore: epiphany:epiphany-branding
+Ignore: gnome-control-center:gnome-control-center-branding
+Ignore: phonon:phonon-backend
+Ignore: openwbem-devel
+Ignore: MozillaFirefox:MozillaFirefox-branding
+Ignore: yast2:yast2-branding
+Ignore: plymouth:plymouth-branding
+Ignore: plymouth:suspend
+Ignore: yast2-qt:yast2-branding
+Ignore: yast2-theme-SLE:yast2-branding
+Ignore: yast2-registration:yast2-registration-branding
+Ignore: compiz:compiz-branding
+Ignore: texlive:perl-Tk texlive-bin:perl-Tk
+Ignore: xfce4-desktop:xfce4-desktop-branding
+Ignore: xfce4-panel:xfce4-panel-branding
+Ignore: xfce4-session:xfce4-session-branding
+Ignore: kdebase4-runtime:kdebase4-runtime-branding
+Ignore: kwin:kdebase4-workspace-branding
+Ignore: pulseaudio:kernel
+Ignore: transmission-common:transmission-ui
+Ignore: mutter-moblin:moblin-branding
+Ignore: sysvinit-tools:mkinitrd cifs-utils:mkinitrd
+Ignore: mkinitrd:sbin_init
+Ignore: opensc:pinentry
+Ignore: gpg2:pinentry
+Ignore: NetworkManager:dhcp
+# sysconfig requires it at runtime, not buildtime
+Ignore: sysconfig:dbus-1
+Ignore: sysconfig:procps
+Ignore: sysconfig:iproute2
+Ignore: sysconfig:tunctl
+# no build dependencies
+Ignore: libksuseinstall1:yast2-packager
+Ignore: libksuseinstall1:zypper
+Ignore: syslog-service:logrotate
+Ignore: libglue-devel:cluster-glue
+Ignore: libqca2:gpg2
+Ignore: NetworkManager:wpa_supplicant
+Ignore: NetworkManager:dhcp-client
+Ignore: autoyast2:yast2-schema
+Ignore: libgio-2_0-0:dbus-1-x11
+Ignore: weather-wallpaper:inkscape
+
+%ifarch %arm
+Prefer: java-1_7_0-icedtea java-1_7_0-icedtea-devel
+%else
+%ifnarch s390 s390x
+Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel
+%endif
+%ifarch s390 s390x
+Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel
+%endif
+%endif
+
+Prefer: -java-1_5_0-gcj-compat-devel
+%ifarch %ix86 x86_64
+Prefer: -java-1_5_0-ibm-devel
+%endif
+
+%ifarch %arm
+Substitute: java2-devel-packages java-1_7_0-icedtea-devel
+%else
+Substitute: java2-devel-packages java-1_7_0-openjdk-devel
+%endif
+
+%ifarch x86_64 ppc64 s390x sparc64
+Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+%else
+ %ifarch ppc sparc sparcv9
+Substitute: glibc-devel-32bit glibc-devel-64bit
+ %else
+Substitute: glibc-devel-32bit
+ %endif
+%endif
+
+%ifarch %ix86
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-xen
+%endif
+%ifarch ia64
+Substitute: kernel-binary-packages kernel-default kernel-debug
+%endif
+%ifarch x86_64
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen
+%endif
+%ifarch ppc
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3
+%endif
+%ifarch ppc64
+Substitute: kernel-binary-packages kernel-default kernel-ppc64
+%endif
+%ifarch s390
+Substitute: kernel-binary-packages kernel-s390
+%endif
+%ifarch s390x
+Substitute: kernel-binary-packages kernel-default
+%endif
+
+# until the builds of the packages are fixed...
+Substitute: yast2-theme-SLED
+Substitute: yast2-theme-SLE
+
+Optflags: i586 -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: i686 -march=i686 -mtune=generic -fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: x86_64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ppc -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ppc64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: ia64 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: s390 -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: s390x -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv6l -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv6hl -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv7l -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: armv7hl -fmessage-length=0 -grecord-gcc-switches -fstack-protector
+Optflags: aarch64 -fmessage-length=0 -grecord-gcc-switches
+# need mcpu=ultrasparc to complete sparcv8plus to sparcv9 (adds, for example, atomic ops)
+Optflags: sparcv9 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc -fstack-protector
+Optflags: sparc64 -fmessage-length=0 -grecord-gcc-switches -mcpu=ultrasparc -fstack-protector
+%ifarch sparcv9
+Target: sparcv9
+%endif
+# Workaround buildservice bug (scheduler arch not matching target arch)
+%ifarch armv7l armv7hl
+Target: armv7hl-suse-linux
+%endif
+%ifarch armv6l armv6hl
+Target: armv6hl-suse-linux
+%endif
+
+Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables -fasynchronous-unwind-tables
+
+%define suse_version 1320
+
+%ifarch aarch64 armv6l armv6hl
+%define qemu_user_space_build 1
+%endif
+
+%if "%qemu_user_space_build" == "1"
+Hostarch: x86_64
+Constraint: hostlabel QEMU_ARM
+
+Macros:
+%qemu_user_space_build 1
+%_without_mono 1
+:Macros
+
+%ifarch armv6l armv6hl
+Preinstall: qemu-linux-user
+%endif
+
+%ifarch armv7l armv7hl
+Preinstall: qemu-linux-user
+%endif
+
+ExportFilter: ^qemu-linux-user.*\.x86_64\.rpm$ . armv7l armv6l
+%endif
+
+
+Macros:
+%insserv_prereq insserv sed
+%fillup_prereq fillup coreutils grep diffutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%kernel_module_package_buildreq module-init-tools kernel-syms
+%kernel_module_package_buildreqs module-init-tools kernel-syms
+
+%suse_version 1320
+%sles_version 0
+%ul_version 0
+%do_profiling 1
+%opensuse_bs 1
+%_vendor suse
+
+# define which gcc package builds the system libraries
+%product_libs_gcc_ver 48
+
+%ext_info .gz
+%ext_man .gz
+
+%info_add(:-:) test -x /sbin/install-info -a -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \
+%{nil}
+
+%info_del(:-:) test -x /sbin/install-info -a ! -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --quiet --delete --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \
+%{nil}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/expanddeps new/obs-build-20131015/expanddeps
--- old/obs-build-20130517/expanddeps 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/expanddeps 2013-10-15 11:43:49.000000000 +0200
@@ -244,11 +244,19 @@
if ($spec) {
my $d;
if ($spec =~ /\.kiwi$/) {
- # just set up kiwi root for now
- $d = {
- 'deps' => [ 'kiwi', 'zypper', 'createrepo', 'squashfs' ],
- 'subpacks' => [],
- };
+ # lets see if this is a product or image build
+ $d = Build::parse($cf, $spec) || {};
+ my $type = $d->{'imagetype'} && $d->{'imagetype'}->[0] eq 'product' ? 'product' : 'image';
+ my @kdeps;
+ if ($type eq 'image') {
+ @kdeps = @{$cf->{'substitute'}->{'kiwi-setup:image'} || []};
+ @kdeps = ('kiwi', 'createrepo', 'tar') unless @kdeps;
+ } else {
+ @kdeps = @{$cf->{'substitute'}->{'kiwi-setup:product'} || []};
+ @kdeps = ('kiwi') unless @kdeps;
+ }
+ push @kdeps, grep {/^kiwi-.*:/} @{$d->{'deps'} || []};
+ $d = { 'deps' => \@kdeps, 'subpacks' => [] };
} else {
$d = Build::parse($cf, $spec);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/init_buildsystem new/obs-build-20131015/init_buildsystem
--- old/obs-build-20130517/init_buildsystem 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/init_buildsystem 2013-10-15 11:43:49.000000000 +0200
@@ -232,7 +232,7 @@
fi
rm -rf .init_b_cache/scripts/control control.tar.gz data.tar.gz
elif test -e "$BUILD_ROOT/.init_b_cache/rpms/$1.arch" ; then
- $TAR -z -f "$BUILD_ROOT/.init_b_cache/rpms/$1.arch"
+ $TAR -f "$BUILD_ROOT/.init_b_cache/rpms/$1.arch"
if test -f .INSTALL ; then
cat .INSTALL > ".init_b_cache/scripts/$1.post"
echo 'type post_install >/dev/null 2>&1 && post_install' >> ".init_b_cache/scripts/$1.post"
@@ -602,23 +602,10 @@
# register the QEMU emulator
#
if check_use_emulator; then
- if [ -z "$PREPARE_VM" ]; then
- echo "WARNING: registering binfmt handlers system wide."
-
- if [ -x /usr/sbin/qemu-binfmt-conf.sh ]; then
- [ -e /proc/sys/fs/binfmt_misc ] || mount -n binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
- /usr/sbin/qemu-binfmt-conf.sh
- else
- echo "Warning: could not register binfmt handlers. /usr/sbin/qemu-binfmt-conf.sh does not exist. You may want to use KVM/XEN for using vminit instead"
- fi
- else
echo "registering binfmt handlers for VM"
if [ -x "$BUILD_DIR/initvm.`uname -m`" -a -e "$BUILD_DIR/qemu-reg" ]; then
$BUILD_DIR/initvm.`uname -m`
- elif [ -x /usr/sbin/qemu-binfmt-conf.sh ]; then
- [ -e /proc/sys/fs/binfmt_misc ] || mount -n binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
- /usr/sbin/qemu-binfmt-conf.sh
else
echo "Warning: could not register binfmt handlers. Neither build-initvm nor /usr/sbin/qemu-binfmt-conf.sh exist"
fi
@@ -628,7 +615,6 @@
if [ "$mmap_min_addr" != 0 ]; then
echo "Warning: mmap_min_addr is != 0. If programs fail at mmap this could be the reason"
fi
- fi
fi
PACKAGES_TO_INSTALL=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/initvm.c new/obs-build-20131015/initvm.c
--- old/obs-build-20130517/initvm.c 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/initvm.c 2013-10-15 11:43:49.000000000 +0200
@@ -23,6 +23,7 @@
*/
#include
+#include
#include
#include
#include
@@ -252,6 +253,7 @@
int main(int argc, char* argv[], char* env[])
{
int retval;
+ char buf[BUFSIZ];
/* mount proc filesystem if it isn't already */
if (mount("proc", "/proc", "proc", MS_MGC_VAL, NULL) == -1) {
@@ -296,14 +298,19 @@
exit(1);
}
- /* setup all done, do the registration */
- if (!binfmt_register(BINFMT_REGF_0, SYSFS_BINFMT_MISC_REG)) {
- fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- BINFMT_REGF_0);
- if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
- fprintf(stderr, "%s: binfmt registration failed\n",
- BINFMT_REGF_1);
- exit(1);
+ if (getenv("BUILD_DIR"))
+ sprintf(buf, "%s/qemu-reg", getenv("BUILD_DIR"));
+
+ if (!buf || !binfmt_register(buf, SYSFS_BINFMT_MISC_REG)) {
+ /* setup all done, do the registration */
+ if (!binfmt_register(BINFMT_REGF_0, SYSFS_BINFMT_MISC_REG)) {
+ fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
+ BINFMT_REGF_0);
+ if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
+ fprintf(stderr, "%s: binfmt registration failed\n",
+ BINFMT_REGF_1);
+ exit(1);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20130517/vc new/obs-build-20131015/vc
--- old/obs-build-20130517/vc 2013-05-17 11:24:45.000000000 +0200
+++ new/obs-build-20131015/vc 2013-10-15 11:43:49.000000000 +0200
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
shopt -s nullglob
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
