Hello community, here is the log from the commit of package openSUSE-Tumbleweed-Vagrant for openSUSE:Factory checked in at 2019-08-05 10:37:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-Vagrant (Old) and /work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-Vagrant.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-Tumbleweed-Vagrant" Mon Aug 5 10:37:51 2019 rev:7 rq:720234 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-Vagrant/Tumbleweed.changes 2019-07-04 15:44:26.874219396 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-Vagrant.new.4126/Tumbleweed.changes 2019-08-05 10:38:22.327320153 +0200 @@ -1,0 +2,7 @@ +Tue Jul 23 13:06:12 UTC 2019 - Dan Čermák <[email protected]> + +- Add an additional profile for the aarch64 build with an embedded Vagrantfile + fix wicked networking configuration + remove obsolete baseCleanMount from config.sh + +------------------------------------------------------------------- New: ---- aarch64_vagrantfile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Tumbleweed.kiwi ++++++ --- /var/tmp/diff_new_pack.cIqQdX/_old 2019-08-05 10:38:23.811319972 +0200 +++ /var/tmp/diff_new_pack.cIqQdX/_new 2019-08-05 10:38:23.811319972 +0200 @@ -13,7 +13,8 @@ </specification> </description> <profiles> - <profile name="libvirt" description="Vagrant Box for Libvirt"/> + <profile name="libvirt" description="Vagrant Box for Libvirt" arch="x86_64"/> + <profile name="libvirt_aarch64" description="Vagrant Box for Libvirt on aarch64" arch="aarch64"/> <profile name="virtualbox" description="Vagrant Box for VirtualBox" arch="x86_64"/> </profiles> <preferences> @@ -28,13 +29,19 @@ <bootloader-theme>openSUSE</bootloader-theme> </preferences> <preferences profiles="libvirt"> - <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" bootloader="grub2" firmware="efi"> + <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" bootloader="grub2" firmware="efi" kernelcmdline="net.ifnames=0"> <vagrantconfig provider="libvirt" virtualsize="42"/> <size unit="G">42</size> </type> </preferences> + <preferences profiles="libvirt_aarch64"> + <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" bootloader="grub2" firmware="efi" kernelcmdline="net.ifnames=0"> + <vagrantconfig provider="libvirt" virtualsize="42" embedded_vagrantfile="aarch64_vagrantfile"/> + <size unit="G">42</size> + </type> + </preferences> <preferences profiles="virtualbox"> - <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" bootloader="grub2"> + <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" bootloader="grub2" kernelcmdline="net.ifnames=0"> <vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="42"/> <size unit="G">42</size> </type> @@ -60,7 +67,6 @@ <package name="grub2"/> <package name="grub2-x86_64-efi" arch="x86_64"/> <package name="grub2-arm64-efi" arch="aarch64"/> - <package name="syslinux" arch="x86_64"/> <package name="tar"/> <package name="openssh"/> <package name="iproute2"/> @@ -90,7 +96,7 @@ <package name="haveged"/> </packages> - <packages type="image" profiles="libvirt"> + <packages type="image" profiles="libvirt,libvirt_aarch64"> <package name="rsync"/> </packages> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.cIqQdX/_old 2019-08-05 10:38:23.851319967 +0200 +++ /var/tmp/diff_new_pack.cIqQdX/_new 2019-08-05 10:38:23.851319967 +0200 @@ -1,4 +1,5 @@ <multibuild> <flavor>libvirt</flavor> + <flavor>libvirt_aarch64</flavor> <flavor>virtualbox</flavor> </multibuild> ++++++ aarch64_vagrantfile ++++++ Vagrant.configure("2") do |config| config.vm.synced_folder ".", "/vagrant", type: "rsync" config.vm.provider :libvirt do |libvirt| libvirt.driver = "kvm" libvirt.host = 'localhost' libvirt.uri = 'qemu:///system' libvirt.host = "master" libvirt.features = ["apic"] libvirt.loader = "/usr/share/qemu/aavmf-aarch64-code.bin" libvirt.video_type = "vga" libvirt.cpu_mode = "host-passthrough" libvirt.machine_type = "virt-3.1" libvirt.emulator_path = "/usr/bin/qemu-system-aarch64" end end ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.cIqQdX/_old 2019-08-05 10:38:23.879319964 +0200 +++ /var/tmp/diff_new_pack.cIqQdX/_new 2019-08-05 10:38:23.883319963 +0200 @@ -120,6 +120,14 @@ if rpm -q virtualbox-guest-tools 2> /dev/null; then echo vboxsf > /etc/modules-load.d/vboxsf.conf fi + + # drop any network udev rules for libvirt, so that the networks are called + # ethX + # this is not required for Virtualbox as it handles networking differently + # and doesn't need this hack + if [ "${kiwi_profiles}" != "virtualbox" ]; then + rm -f /etc/udev/rules.d/*-net.rules + fi } vagrantSetup @@ -132,34 +140,14 @@ #================================================= # configure openSUSE repositories from YaST -# -# don't do this for Leap 42.3, -# the package live-add-yast-repos is missing there #------------------------------------------------- # Leap 42.3's os-release is missing " around some of the values # => filter them out since they are present in later releases OS_ID=$(grep '^ID=' /etc/os-release | awk -F'=' '{ print $2 }'| sed 's/"//g') -OS_VERSION=$(grep '^VERSION_ID=' /etc/os-release | awk -F'=' '{ print $2 }'| sed 's/"//g') if [ $(expr match "${OS_ID^^}" "OPENSUSE") -gt 7 ]; then - if [ "${OS_VERSION}" = "42.3" ]; then - zypper ar --refresh -K \ - http://download.opensuse.org/distribution/leap/42.3/repo/oss/suse/ "OSS" - zypper ar --refresh -K \ - http://download.opensuse.org/update/leap/42.3/oss/ "OSS Update" - zypper ar --refresh -K \ - http://download.opensuse.org/distribution/leap/42.3/repo/non-oss/suse/ "NON OSS" - zypper ar --refresh -K \ - http://download.opensuse.org/update/leap/42.3/non-oss/ "NON OSS Update" - else - add-yast-repos - fi + add-yast-repos fi -#====================================== -# Umount kernel filesystems -#-------------------------------------- -baseCleanMount - exit 0 ++++++ root.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/root/etc/sysconfig/network/ifcfg-eth0 new/root/etc/sysconfig/network/ifcfg-eth0 --- old/root/etc/sysconfig/network/ifcfg-eth0 1970-01-01 01:00:00.000000000 +0100 +++ new/root/etc/sysconfig/network/ifcfg-eth0 2019-07-25 15:53:52.000000000 +0200 @@ -0,0 +1,2 @@ +STARTMODE=auto +BOOTPROTO=dhcp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/root/etc/sysconfig/network/ifcfg-lan0 new/root/etc/sysconfig/network/ifcfg-lan0 --- old/root/etc/sysconfig/network/ifcfg-lan0 2019-04-03 16:17:18.000000000 +0200 +++ new/root/etc/sysconfig/network/ifcfg-lan0 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -BOOTPROTO='dhcp' -MTU='' -REMOTE_IPADDR='' -STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/root/etc/udev/rules.d/70-persistent-net.rules new/root/etc/udev/rules.d/70-persistent-net.rules --- old/root/etc/udev/rules.d/70-persistent-net.rules 2019-04-03 16:17:18.000000000 +0200 +++ new/root/etc/udev/rules.d/70-persistent-net.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0"
