Hello community,
here is the log from the commit of package build for openSUSE:Factory checked in at 2016-04-22 16:15:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-14 09:56:28.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2016-04-22 16:15:47.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Apr 8 09:37:41 UTC 2016 - adrian(a)suse.de
+
+- support unpacking of obscpio archives in source
+- added DoD for aarch64 repositories on Debian
+- aarch64_ilp32 support
+- KVM: telnet feature fixes and documentation
+- KVM: run qemu as user
+- fail when space allocation is not successful (on supported FS)
+
+-------------------------------------------------------------------
Old:
----
obs-build-20160304.tar.gz
New:
----
obs-build-20160331.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.dNhSZ8/_old 2016-04-22 16:15:48.000000000 +0200
+++ /var/tmp/diff_new_pack.dNhSZ8/_new 2016-04-22 16:15:48.000000000 +0200
@@ -18,11 +18,13 @@
# needsbinariesforbuild
+%define version_unconverted 20160331
+
Name: build
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 20160304
+Version: 20160331
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.dNhSZ8/_old 2016-04-22 16:15:48.000000000 +0200
+++ /var/tmp/diff_new_pack.dNhSZ8/_new 2016-04-22 16:15:48.000000000 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20160304
+pkgver=20160331
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.dNhSZ8/_old 2016-04-22 16:15:48.000000000 +0200
+++ /var/tmp/diff_new_pack.dNhSZ8/_new 2016-04-22 16:15:48.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20160304
+Version: 20160331
Binary: build
Maintainer: Adrian Schroeter <adrian(a)suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.dNhSZ8/_old 2016-04-22 16:15:48.000000000 +0200
+++ /var/tmp/diff_new_pack.dNhSZ8/_new 2016-04-22 16:15:48.000000000 +0200
@@ -1,4 +1,4 @@
-build (20160304) unstable; urgency=low
+build (20160331) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20160304.tar.gz -> obs-build-20160331.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/Build/Deb.pm new/obs-build-20160331/Build/Deb.pm
--- old/obs-build-20160304/Build/Deb.pm 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/Build/Deb.pm 2016-04-08 11:37:31.000000000 +0200
@@ -42,6 +42,7 @@
"armv7el" => "armel",
"armv7l" => "armhf",
"armv7hl" => "armhf",
+ "aarch64" => "arm64",
);
sub basearch {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/Makefile new/obs-build-20160331/Makefile
--- old/obs-build-20160304/Makefile 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/Makefile 2016-04-08 11:37:31.000000000 +0200
@@ -62,6 +62,7 @@
spectool \
signdummy \
unrpm \
+ telnet_login_wrapper \
$(DESTDIR)$(pkglibdir)
install -m755 emulator/emulator.sh $(DESTDIR)$(pkglibdir)/emulator/
install -m644 Build/*.pm $(DESTDIR)$(pkglibdir)/Build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/baselibs_global.conf new/obs-build-20160331/baselibs_global.conf
--- old/obs-build-20160304/baselibs_global.conf 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/baselibs_global.conf 2016-04-08 11:37:31.000000000 +0200
@@ -9,6 +9,8 @@
arch sparcv9v targets sparc64v:32bit
arch sparc64 targets sparcv9:64bit
arch sparc64v targets sparcv9v:64bit
+arch aarch64 targets aarch64_ilp32:64bit
+arch aarch64_ilp32 targets aarch64:32bit
configdir /usr/lib/baselibs-<targettype>/bin
@@ -20,9 +22,9 @@
targetname <name>-<targettype>
-+.*/lib(64)?/.*\.(so\..*|so|o|a|la)$
++.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)$
-targettype 64bit -^(/usr)?/lib/lib
+targettype 64bit -^(/usr)?/lib(ilp32)?/lib
targettype 32bit -/lib64/
targettype x86 -/lib64/
@@ -39,5 +41,5 @@
post "/sbin/ldconfig"
package /(.*)-debuginfo$/
-+/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so\..*|so|o|a|la)\.debug$
-+/usr/lib(64)?/debug/.build-id/.*
++/usr/lib(64|ilp32)?/debug/.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)\.debug$
++/usr/lib(64|ilp32)?/debug/.build-id/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/build new/obs-build-20160331/build
--- old/obs-build-20160304/build 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/build 2016-04-08 11:37:31.000000000 +0200
@@ -1265,8 +1265,8 @@
cleanup_and_exit 1
fi
if test -x /sbin/ip ; then
- ip addr add 10.0.2.15/8 dev eth0
- ip addr add ::1/24 dev eth0
+ ip addr add 10.0.2.15/8 dev ${VM_TELNET_DEVICE}
+ ip addr add ::1/24 dev ${VM_TELNET_DEVICE}
ip link set ${VM_TELNET_DEVICE} up
else
if ! test -x /sbin/ifconfig ; then
@@ -1281,7 +1281,7 @@
hostname "$MYHOSTNAME"
fi
if test -n "$VM_TELNET"; then
- echo WARNING: telnet option used, setting up telnet server
+ echo WARNING: telnet option used, setting up telnet server ${VM_TELNET_DEVICE}
if test -x /usr/sbin/in.telnetd; then
( /usr/sbin/in.telnetd -L /.build/telnet_login_wrapper -debug 23 & )
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/build-vm new/obs-build-20160331/build-vm
--- old/obs-build-20160304/build-vm 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/build-vm 2016-04-08 11:37:31.000000000 +0200
@@ -322,8 +322,15 @@
echo "$size" > "${img}.size"
# allocate blocks
if type -p fallocate > /dev/null ; then
- fallocate -p -l "${size}M" "$img"
- fallocate -l "${size}M" "$img"
+ fallocate -p -l "${size}M" "$img" 2> /dev/null
+ errout=$( fallocate -l "${size}M" "$img" 2>&1 )
+ if test $? != 0; then
+ echo $errout
+ if test "${errout/Operation not supported/}" = "$errout"; then
+ # Do not fail on not support file systems, eg ext2 or ext3
+ cleanup_and_exit 3
+ fi
+ fi
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/build-vm-kvm new/obs-build-20160331/build-vm-kvm
--- old/obs-build-20160304/build-vm-kvm 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/build-vm-kvm 2016-04-08 11:37:31.000000000 +0200
@@ -208,15 +208,9 @@
vm_startup_kvm() {
qemu_bin="$kvm_bin"
qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,serial=0,cache=unsafe -device "$kvm_device",drive=disk)
- local sudo=
if [ -n "$VM_USER" ] ; then
- sudo=/usr/bin/sudo
- [ -x $sudo ] || complain 21 "cannot find sudo"
grep -q "^$VM_USER:" /etc/passwd || complain 22 "cannot find KVM user '$VM_USER'"
- sudo="$sudo -u $VM_USER"
- for f in "$VM_IMAGE" "$VM_SWAP" "$vm_initrd" ; do
- [ -n "$f" ] && chown $VM_USER "$f"
- done
+ kvm_options="$kvm_options -runas $VM_USER"
fi
if test -n "$VM_SWAP" ; then
qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,serial=1,cache=unsafe -device "$kvm_device",drive=swap)
@@ -254,7 +248,7 @@
if test -n "$VM_TELNET"; then
kvm_options="$kvm_options -netdev user,id=telnet,hostfwd=tcp:127.0.0.1:$VM_TELNET-:23 -device e1000,netdev=telnet"
fi
- set -- $sudo $qemu_bin -nodefaults -no-reboot -nographic -vga none $kvm_options \
+ set -- $qemu_bin -nodefaults -no-reboot -nographic -vga none $kvm_options \
-kernel $vm_kernel \
-initrd $vm_initrd \
-append "root=$qemu_rootdev $qemu_rootfstype $qemu_rootflags panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=$kvm_console init=$vm_init_script" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/build.1 new/obs-build-20160331/build.1
--- old/obs-build-20160304/build.1 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/build.1 2016-04-08 11:37:31.000000000 +0200
@@ -165,6 +165,15 @@
.TP
.B --vm-disk-clean
Force the recreation of the disk image.
+.TP
+.B "--vm-telnet" PORT
+Is forwarding PORT to a telnet session inside of the VM.
+Specify also needed extra packages via -x parameter, usually:
+.I --vm-telnet 1234 -x telnet-server -x net-tools
+ And connect from the host via:
+.I telnet localhost 1234
+ NOTE: The telnet server gets started after all packages got installed.
+
.SH RECIPE FILE OPTIONS
The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160304/common_functions new/obs-build-20160331/common_functions
--- old/obs-build-20160304/common_functions 2016-03-04 17:19:26.000000000 +0100
+++ new/obs-build-20160331/common_functions 2016-04-08 11:37:31.000000000 +0200
@@ -29,7 +29,7 @@
extend_build_arch() {
case $BUILD_ARCH in
- aarch64) BUILD_ARCH="aarch64:armv8l" ;;
+ aarch64|aarch64_ilp32) BUILD_ARCH="aarch64:aarch64_ilp32: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" ;;
