Hello community,
here is the log from the commit of package build for openSUSE:Factory checked in at 2016-05-05 12:09:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2016-04-22 16:15:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2016-05-05 12:09:11.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 27 15:03:56 UTC 2016 - adrian@suse.de
+
+- fix build on armv7hl
+
+-------------------------------------------------------------------
+Wed Apr 27 06:31:53 UTC 2016 - adrian@suse.de
+
+- run debtransform after buildtime source services
+- Handle also aarch32* and armv8 cases for kvm cpu switches
+- add support for LXC 1.0.8
+- added DoD for aarch64 repositories on Debian
+
+-------------------------------------------------------------------
Old:
----
obs-build-20160331.tar.gz
New:
----
obs-build-20160427.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200
@@ -18,13 +18,13 @@
# needsbinariesforbuild
-%define version_unconverted 20160331
+%define version_unconverted 20160427
Name: build
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 20160331
+Version: 20160427
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20160331
+pkgver=20160427
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20160331
+Version: 20160427
Binary: build
Maintainer: Adrian Schroeter
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200
@@ -1,4 +1,4 @@
-build (20160331) unstable; urgency=low
+build (20160427) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20160331.tar.gz -> obs-build-20160427.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build new/obs-build-20160427/build
--- old/obs-build-20160331/build 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build 2016-04-27 17:03:07.000000000 +0200
@@ -1313,15 +1313,6 @@
echo "export SUSE_IGNORED_RPATHS=/etc/ld.so.conf" > "$BUILD_ROOT/etc/profile.d/buildsystem.sh"
fi
- # get rid of old src dir, it is no longer needed and just wastes space
- test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR"
-
- # patch recipes
- recipe_prepare
-
- # hmmm
- chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"
-
cd $BUILD_ROOT$TOPDIR/SOURCES || cleanup_and_exit 1
for i in *.obscpio ; do
test -e "$i" || continue
@@ -1344,6 +1335,15 @@
$BUILD_DIR/runservices --buildroot "$BUILD_ROOT" || cleanup_and_exit 1
fi
+ # get rid of old src dir, it is no longer needed and just wastes space
+ test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR"
+
+ # patch recipes
+ recipe_prepare
+
+ # hmmm
+ chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"
+
echo -----------------------------------------------------------------
if test "$BUILD_USER" = root ; then
echo ----- building $RECIPEFILE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-pkg-deb new/obs-build-20160427/build-pkg-deb
--- old/obs-build-20160331/build-pkg-deb 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-pkg-deb 2016-04-27 17:03:07.000000000 +0200
@@ -68,8 +68,22 @@
pkg_erase_deb() {
export DEBIAN_FRONTEND=noninteractive
export DEBIAN_PRIORITY=critical
- ( cd $BUILD_ROOT && chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 || touch $BUILD_ROOT/exit ) | \
- perl -ne '$|=1;/^(\(Reading database|Removing |Purging configuration files for )/||/^$/||print'
+ cd $BUILD_ROOT && chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 | {
+ local retry
+ while read line; do
+ case "$line" in
+ subprocess\ installed\ *script\ returned\ error\ exit\ status*)
+ chroot $BUILD_ROOT rm -f /var/lib/dpkg/info/$PKG.{pre,post}rm
+ retry=1
+ ;;
+ *) echo "$line" ;;
+ esac
+ done
+ if test -n "$retry"; then
+ echo "re-try deleting $PKG without post/pre remove scripts"
+ chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 || touch $BUILD_ROOT/exit
+ fi
+ } | perl -ne '$|=1;/^(\(Reading database|Removing |Purging configuration files for )/||/^$/||print'
}
pkg_cumulate_deb() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm new/obs-build-20160427/build-vm
--- old/obs-build-20160331/build-vm 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-vm 2016-04-27 17:03:07.000000000 +0200
@@ -645,6 +645,8 @@
if test -z "$VM_KERNEL" -a -e "$BUILD_ROOT/.build.kernel.$VM_TYPE" ; then
kernel="$BUILD_ROOT/.build.kernel.$VM_TYPE"
hostarchfile="$BUILD_ROOT/.build.hostarch.$VM_TYPE"
+ elif test -n "$kernel" -a -e "$kernel" -a -e "$kernel.hostarch" ; then
+ hostarchfile="$kernel.hostarch"
fi
if test -n "$hostarchfile" -a -e "$hostarchfile"; then
newhostarch=`cat "$hostarchfile"`
@@ -750,7 +752,7 @@
test "$PERSONALITY" = -1 && PERSONALITY=0 # syscall failed?
case $(uname -m) in
ppc|ppcle|s390) PERSONALITY=8 ;; # ppc/s390 kernel never tells us if a 32bit personality is active, assume we run on 64bit
- aarch64) test "$BUILD_ARCH" != "${BUILD_ARCH#armv}" && PERSONALITY=8 ;; # workaround, to be removed
+ aarch64) test "$BUILD_ARCH" != "${BUILD_ARCH#armv[567]}" && PERSONALITY=8 ;; # workaround, to be removed
esac
test "$VM_TYPE" = lxc -o "$VM_TYPE" = docker && PERSONALITY=0
echo "PERSONALITY='$PERSONALITY'" >> $BUILD_ROOT/.build/build.data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-kvm new/obs-build-20160427/build-vm-kvm
--- old/obs-build-20160331/build-vm-kvm 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-vm-kvm 2016-04-27 17:03:07.000000000 +0200
@@ -85,21 +85,28 @@
aarch64)
kvm_bin="/usr/bin/qemu-system-aarch64"
kvm_console=ttyAMA0
- kvm_options="-enable-kvm -cpu host "
- # This option only exists with QEMU 2.5 or newer
- if $kvm_bin -machine 'virt,?' 2>&1 | grep -q gic-version ; then
- # We want to use the host gic version in order to make use
- # of all available features (e.g. more than 8 CPUs) and avoid
- # the emulation overhead of vGICv2 on a GICv3 host.
- kvm_options+="-M virt,gic-version=host"
- else
- kvm_options+="-M virt"
- fi
vm_kernel=/boot/Image
vm_initrd=/boot/initrd
- # prefer the guest kernel/initrd
- test -e /boot/Image.guest && vm_kernel=/boot/Image.guest
- test -e /boot/initrd.guest && vm_initrd=/boot/initrd.guest
+ if test "${BUILD_ARCH#aarch}" != "$BUILD_ARCH" -o "${BUILD_ARCH#armv8}" != "$BUILD_ARCH"; then
+ kvm_options="-enable-kvm -cpu host "
+ test -e /boot/Image.guest && vm_kernel=/boot/Image.guest
+ test -e /boot/initrd.guest && vm_initrd=/boot/initrd.guest
+ else
+ # Running an armv7 kernel on aarch64
+ kvm_options="-enable-kvm -cpu host,aarch64=off "
+ # prefer the guest kernel/initrd
+ test -e /boot/Image.guest32 && vm_kernel=/boot/Image.guest32
+ test -e /boot/initrd.guest32 && vm_initrd=/boot/initrd.guest32
+ fi
+ # This option only exists with QEMU 2.5 or newer
+ if $kvm_bin -machine 'virt,?' 2>&1 | grep -q gic-version ; then
+ # We want to use the host gic version in order to make use
+ # of all available features (e.g. more than 8 CPUs) and avoid
+ # the emulation overhead of vGICv2 on a GICv3 host.
+ kvm_options+="-M virt,gic-version=host"
+ else
+ kvm_options+="-M virt"
+ fi
kvm_device=virtio-blk-device
;;
ppc|ppcle|ppc64|ppc64le)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-lxc new/obs-build-20160427/build-vm-lxc
--- old/obs-build-20160331/build-vm-lxc 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-vm-lxc 2016-04-27 17:03:07.000000000 +0200
@@ -52,14 +52,14 @@
EOF
chmod a+x "$LXCHOOK"
case "$(lxc-create --version)" in
- 1.0*)
- lxc-create -n "$LXCID" -f "$LXCCONF" || cleanup_and_exit 1
- lxc-start -n "$LXCID" "$vm_init_script"
- ;;
- *)
+ 1.0.8|1.1.*)
lxc-create -n "$LXCID" -f "$LXCCONF" -t none || cleanup_and_exit 1
lxc-start -n "$LXCID" -F "$vm_init_script"
;;
+ 1.0.*)
+ lxc-create -n "$LXCID" -f "$LXCCONF" || cleanup_and_exit 1
+ lxc-start -n "$LXCID" "$vm_init_script"
+ ;;
esac
BUILDSTATUS="$?"
test "$BUILDSTATUS" != 255 || BUILDSTATUS=3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-pvm new/obs-build-20160427/build-vm-pvm
--- old/obs-build-20160331/build-vm-pvm 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-vm-pvm 2016-04-27 17:03:07.000000000 +0200
@@ -1,17 +1,6 @@
#PowerVM build functions
-test -z "$VM_WORKER_NR" && VM_WORKER_NR=1
-lpname="worker-$VM_WORKER_NR"
-lpartype="AIX/Linux"
-bootloader_size="8M"
-rootlv="$lpname"-root
-swaplv="$lpname"-swap
-master_lpar=$(cat /proc/device-tree/ibm,partition-name)
-size_gb(){
- size_gb=`expr $1 / 1024`
-}
-
-setup_bootloader(){
+pvm_setup_bootloader(){
disk=$1
parted -s $disk mklabel msdos
parted -s $disk mkpart primary ext2 0 $bootloader_size
@@ -21,7 +10,7 @@
bl_target=${disk}1
}
-getdiskname(){
+pvm_getdiskname(){
lv=$1
if [ -z "$SKIP" ];then
args=$(pvmctl scsi list -f ' ' -d VirtualDisk.udid ClientAdapter.loc_code --where VirtualDisk.name=$lv)
@@ -36,46 +25,38 @@
dev=$(readlink -f $devid)
fi
case $lv in
- *root) test -z "$SKIP" && setup_bootloader "$dev";
+ *root) test -z "$SKIP" && pvm_setup_bootloader "$dev";
VM_IMAGE="${dev}2";;
*swap) VM_SWAP="${dev}";;
esac
}
-createdev() {
- name=$1
- size=$2
- target=$3
- size_gb $size
- test -z $3 && target=$master_lpar
- is_created $name
- if [ -z "$SKIP" ];then
- execute lv create --name $name --size $size_gb
- target=$master_lpar
- fi
- execute scsi create --vg name=rootvg --type lv --lpar name=$target --stor-id $name
- test -z "$SKIP" && getdiskname $name
-}
-execute(){
+
+pvm_execute(){
cmd=$@
pvmctl $cmd
}
-vm_kill_pvm() {
- execute lpar power-off --hard -i name="$VM_NAME"
-}
-is_created() {
+pvm_is_created() {
dev=$1
$(pvmctl lv list -d LogicalVolume.name | grep -q $dev) && SKIP=1
}
-vm_attach_root_pvm(){
- target=$1
- createdev $rootlv $VMDISK_ROOTSIZE $target
-}
-vm_attach_swap_pvm(){
- createdev $swaplv $VMDISK_SWAPSIZE $target
+pvm_createdev() {
+ name=$1
+ size=$2
+ target=$3
+ size_gb=`expr $size / 1024`
+ test -z $3 && target=$master_lpar
+ pvm_is_created $name
+ if [ -z "$SKIP" ];then
+ pvm_execute lv create --name $name --size $size_gb
+ target=$master_lpar
+ fi
+ pvm_execute scsi create --vg name=rootvg --type lv --lpar name=$target --stor-id $name
+ test -z "$SKIP" && pvm_getdiskname $name
}
-lpar_is_running(){
+
+pvm_lpar_is_running(){
state=$(pvmctl lpar list -d LogicalPartition.state --where LogicalPartition.name=$lpname |awk -F "=" '{print $2}')
CONSOLEPID=`pgrep -f "cat $hvcdev"`
if [ "$state" = "running" ];then
@@ -85,77 +66,106 @@
return 1
fi
}
-watch_build(){
- while lpar_is_running $lpname;do
+
+pvm_watch_build(){
+ while pvm_lpar_is_running $lpname;do
sleep 10
done
}
+
+pvm_detachdev(){
+ lv=$1
+ lpar=$2
+ pvm_execute scsi delete --lpar name=$lpar --type lv --stor-id $lv
+}
+
+pvm_deletelv(){
+ viosvrcmd --id 1 -c "rmbdsp -bd $1"
+}
+
+pvm_nametoid(){
+ local id
+ name=$1
+ lparid=$(pvmctl lpar list -d LogicalPartition.id -i name=$name | awk -F "=" '{print $2}')
+}
+
+
+pvm_openconsole(){
+ id=$1
+ pvmutil -o create_vterm_dev --id $id
+ hvcsadmin -console $id
+ hvcdev=$(hvcsadmin -console $id|awk '{print $4}')
+}
+
+pvm_closeconsole(){
+ hvcdev=$(hvcsadmin -console $id|awk '{print $4}')
+ hvcsadmin -close $hvcdev
+ pvmutil -o delete_vterm_dev --id $1
+}
+
+vm_kill_pvm() {
+ pvm_execute lpar power-off --hard -i name="$VM_NAME"
+}
+
vm_startup_pvm(){
cpus=$BUILD_JOBS
cores=`echo 0.05 \* $cpus| bc -l`
- execute lpar create --name $lpname --mem $VM_MEMSIZE --proc-unit $cores --proc $cpus --proc-type shared --sharing-mode uncapped --type $lpartype
- nametoid $lpname
+ pvm_execute lpar create --name $lpname --mem $VM_MEMSIZE --proc-unit $cores --proc $cpus --proc-type shared --sharing-mode uncapped --type $lpartype
+ pvm_nametoid $lpname
vm_attach_root_pvm $lpname
vm_attach_swap_pvm $lpname
- openconsole $lparid
- execute lpar power-on -i name=$lpname
- watch_build &
+ pvm_openconsole $lparid
+ pvm_execute lpar power-on -i name=$lpname
+ pvm_watch_build &
PID=$!
cat $hvcdev
vm_detach_root_pvm $lpname
vm_detach_swap_pvm $lpname
}
+
vm_verify_options_pvm(){
- :
+ test -z "$VM_WORKER_NR" && VM_WORKER_NR=1
+ lpname="worker-$VM_WORKER_NR"
+ lpartype="AIX/Linux"
+ bootloader_size="8M"
+ rootlv="$lpname"-root
+ swaplv="$lpname"-swap
+ master_lpar=$(cat /proc/device-tree/ibm,partition-name)
}
-detachdev(){
- lv=$1
- lpar=$2
- execute scsi delete --lpar name=$lpar --type lv --stor-id $lv
+
+vm_attach_root_pvm(){
+ target=$1
+ pvm_createdev $rootlv $VMDISK_ROOTSIZE $target
+}
+
+vm_attach_swap_pvm(){
+ pvm_createdev $swaplv $VMDISK_SWAPSIZE $target
}
vm_detach_swap_pvm(){
lpar=$1
test -z $lpar && lpar=$master_lpar
- detachdev $swaplv $lpar
+ pvm_detachdev $swaplv $lpar
}
+
vm_detach_root_pvm(){
lpar=$1
test -z $lpar && lpar=$master_lpar
- detachdev $rootlv $lpar
-}
-deletelv(){
- viosvrcmd --id 1 -c "rmbdsp -bd $1"
-}
-openconsole(){
- id=$1
- pvmutil -o create_vterm_dev --id $id
- hvcsadmin -console $id
- hvcdev=$(hvcsadmin -console $id|awk '{print $4}')
-}
-
-nametoid(){
- local id
- name=$1
- lparid=$(pvmctl lpar list -d LogicalPartition.id -i name=$name | awk -F "=" '{print $2}')
-}
-closeconsole(){
- hvcdev=$(hvcsadmin -console $id|awk '{print $4}')
- hvcsadmin -close $hvcdev
- pvmutil -o delete_vterm_dev --id $1
+ pvm_detachdev $rootlv $lpar
}
vm_cleanup_pvm(){
- nametoid $lpname
+ pvm_nametoid $lpname
closeconsole $lparid
vm_detach_root_pvm $lpname
vm_detach_root_pvm
vm_detach_swap_pvm $lpname
vm_detach_swap_pvm
- execute lpar delete -i name=$lpname
- deletelv $rootlv
- deletelv $swaplv
+ pvm_execute lpar delete -i name=$lpname
+ pvm_deletelv $rootlv
+ pvm_deletelv $swaplv
}
+
vm_fixup_pvm(){
VM_SWAPDEV=/dev/sdb
GRUBDIR=`mktemp -d /tmp/grubinstall.XXXX`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-zvm new/obs-build-20160427/build-vm-zvm
--- old/obs-build-20160331/build-vm-zvm 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/build-vm-zvm 2016-04-27 17:03:07.000000000 +0200
@@ -39,7 +39,7 @@
cleanup_and_exit 1
}
-prevent_detach() {
+zvm_prevent_detach() {
if test "$1" = "150" -o "$1" = "0150"; then
zvm_fatal "don't detach local root"
fi
@@ -157,7 +157,7 @@
# 1. worker device number
# 2. worker number
DEVNR=$(zvm_get_local_devnr $1 $2)
- prevent_detach $DEVNR
+ zvm_prevent_detach $DEVNR
dasd_configure 0.0.0$DEVNR 0 0
if ! vmcp detach $DEVNR >& /dev/null ; then
zvm_fatal "Could not locally detach disk number $1 from worker $2"
@@ -209,7 +209,7 @@
done
# Third, remove stale links
for DEVNR in $DEVNR_ROOT $DEVNR_SWAP ; do
- prevent_detach $DEVNR
+ zvm_prevent_detach $DEVNR
if vmcp q v $DEVNR 2> /dev/null ; then
vmcp detach $DEVNR
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/common_functions new/obs-build-20160427/common_functions
--- old/obs-build-20160331/common_functions 2016-04-08 11:37:31.000000000 +0200
+++ new/obs-build-20160427/common_functions 2016-04-27 17:03:07.000000000 +0200
@@ -22,6 +22,9 @@
build_host_arch() {
: ${BUILD_HOST_ARCH:=`uname -m`}
+ # the linux kernel only knows armv7l, armv7hl is a userland definition
+ test armv7l == "$BUILD_HOST_ARCH" && BUILD_HOST_ARCH=armv7hl
+
BUILD_INITVM_ARCH="$BUILD_HOST_ARCH"
# avoid multiple initvm.* helpers for i586 and i686
test i686 != "$BUILD_INITVM_ARCH" || BUILD_INITVM_ARCH=i586
@@ -29,7 +32,8 @@
extend_build_arch() {
case $BUILD_ARCH in
- aarch64|aarch64_ilp32) BUILD_ARCH="aarch64:aarch64_ilp32:armv8l" ;;
+ aarch64) BUILD_ARCH="aarch64:aarch64_ilp32:armv8l" ;;
+ aarch64_ilp32) BUILD_ARCH="aarch64_ilp32:aarch64:armv8l" ;;
armv8l) BUILD_ARCH="armv8l" ;; # armv8l is aarch64 in 32bit mode. not a superset of armv7
armv7hl) BUILD_ARCH="armv7hl:armv7l:armv6hl:armv6l:armv5tel" ;;
armv7l) BUILD_ARCH="armv7l:armv6l:armv5tel" ;;