Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-08-02 22:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-07-19 11:44:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-08-02 22:43:58.000000000 +0200 @@ -1,0 +2,72 @@ +Fri Jul 17 08:02:34 CEST 2015 - [email protected] + +- v7.03.8 released + +------------------------------------------------------------------- +Fri Jul 17 08:01:56 CEST 2015 - [email protected] + +- Update Makefile clean target + + delete possible .dice / .vagrant directories + +------------------------------------------------------------------- +Thu Jul 16 19:11:18 CEST 2015 - [email protected] + +- Update SLE12 JeOS image description + + xen-tools conflicts with xen-tools-domU + +------------------------------------------------------------------- +Thu Jul 16 11:18:26 CEST 2015 - [email protected] + +- Update dice configuration files + + Use the new dice docker buildsystem instead of vagrant calling + docker. There is also a kiwi-build-box container on dockerhub + which is automatically used for the build + +------------------------------------------------------------------- +Wed Jul 15 08:08:18 CEST 2015 - [email protected] + +- v7.03.7 released + +------------------------------------------------------------------- +Tue Jul 14 21:01:23 CEST 2015 - [email protected] + +- Use defined macro to check if variable is defined + + The perl version in tumbleweed seems to behave more strict on this + +------------------------------------------------------------------- +Tue Jul 14 10:41:51 CEST 2015 - [email protected] + +- v7.03.6 released + +------------------------------------------------------------------- +Tue Jul 14 10:40:17 CEST 2015 - [email protected] + +- Allow containers to be build without systemd + + the container setup procedure by default disable some services. + In order to do this either systemctl or chkconfig is used. + However this should not be a mandatory task because it is ok + to build containers without service tools installed + +------------------------------------------------------------------- +Mon Jul 13 17:35:14 CEST 2015 - [email protected] + +- Follow up fix for repo detection in kiwi describe + + The data fields of zypper in newer versions has changed. Thus + split by the field separator and extract the information. + Fortunately the ordering hasn't changed + +------------------------------------------------------------------- +Mon Jul 13 17:10:56 CEST 2015 - [email protected] + +- Fixed repo detection in describer module + + The zypper syntax has changed, thus detection of the repo state + leads to incorrect results + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.5gZhwa/_old 2015-08-02 22:44:01.000000000 +0200 +++ /var/tmp/diff_new_pack.5gZhwa/_new 2015-08-02 22:44:01.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.5 +Version: 7.03.8 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 +++ new/kiwi/.revision 2015-02-19 21:11:51.000000000 +0100 @@ -1 +1 @@ -8a9dbd06e83f3d8c5eefd78f88672bf9efe5c01c +551b98a6e4950fd5933b078be39bc047f8ac95b4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2015-05-18 14:27:05.000000000 +0200 +++ new/kiwi/Makefile 2015-07-17 07:59:43.000000000 +0200 @@ -266,6 +266,8 @@ @echo Cleanup... (cd system/boot && find -type f | grep -v .svn | xargs chmod u+w) (find -name .checksum.md5 | xargs rm -f) + (find -name .dice | xargs rm -rf) + (find -name .vagrant | xargs rm -rf) ${MAKE} -C tools clean ${MAKE} -C locale clean rm -f tools/burner/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIAnalyseSoftware.pm new/kiwi/modules/KIWIAnalyseSoftware.pm --- old/kiwi/modules/KIWIAnalyseSoftware.pm 2014-12-15 14:32:45.000000000 +0100 +++ new/kiwi/modules/KIWIAnalyseSoftware.pm 2015-07-13 17:31:37.000000000 +0200 @@ -296,19 +296,20 @@ } foreach my $repo (@list) { $repo =~ s/^\s+//g; - if ($repo =~ /^\d.*\|(.*)\|.*\|(.*)\|.*\|(.*)\|(.*)\|(.*)\|/) { - my $enabled = $2; - my $source = $5; - my $type = $4; - my $alias = $1; - my $prio = $3; + if ($repo =~ /^\d/) { + my @record = split(/\|/, $repo); + my $enabled = $record[4]; + my $source = $record[8]; + my $type = $record[7]; + my $alias = $record[1]; + my $prio = $record[6]; $enabled =~ s/^ +//; $enabled =~ s/ +$//; $source =~ s/^ +//; $source =~ s/ +$//; $type =~ s/^ +//; $type =~ s/ +$//; $alias =~ s/^ +//; $alias =~ s/ +$//; $alias =~ s/ $/:/g; $prio =~ s/^ +//; $prio =~ s/ +$//; my $origsrc = $source; - if ($enabled eq "Yes") { + if ($enabled =~ /Yes/) { #========================================== # handle special source type dvd|cd:// #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2015-05-18 13:10:35.000000000 +0200 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2015-07-14 21:00:01.000000000 +0200 @@ -707,8 +707,9 @@ my $locator = $this->{locator}; $kiwi -> info("Disable unwanted services\n"); my $sysctl = $locator -> getExecPath('systemctl', $targetDir); + my $ins = $locator -> getExecPath('chkconfig', $targetDir); my $croot = $locator -> getExecPath('chroot'); - if ($sysctl) { + if (defined $sysctl) { my @srvs = qw ( device-mapper.service kbd.service @@ -742,8 +743,7 @@ $kiwi -> done(); } } - } else { - my $ins = $locator -> getExecPath('chkconfig', $targetDir); + } elsif (defined $ins) { my @services = ( 'boot.clock', 'boot.device-mapper', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2015-07-10 11:23:02.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-07-17 08:02:28.000000000 +0200 @@ -1942,7 +1942,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.5"; + $data{Version} = "7.03.8"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.3-JeOS/Dicefile new/kiwi/template/ix86/suse-12.3-JeOS/Dicefile --- old/kiwi/template/ix86/suse-12.3-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-12.3-JeOS/Dicefile 2015-07-16 11:17:20.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.3-JeOS/Vagrantfile new/kiwi/template/ix86/suse-12.3-JeOS/Vagrantfile --- old/kiwi/template/ix86/suse-12.3-JeOS/Vagrantfile 2015-04-30 10:28:21.000000000 +0200 +++ new/kiwi/template/ix86/suse-12.3-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.provider "docker" do |d| - # select docker box to use for this build, build boxes can be found in: - # Virtualization:Appliances:Images e.g docker-box-13.1 - # in order to import a build box call e.g: - # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new - d.image = "kiwi-build-box:new" - d.create_args = ["--privileged=true", "-i", "-t"] - # start the sshd in foreground to keep the container in running state - d.cmd = ["/usr/sbin/sshd", "-D"] - d.has_ssh = true - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.1-JeOS/Dicefile new/kiwi/template/ix86/suse-13.1-JeOS/Dicefile --- old/kiwi/template/ix86/suse-13.1-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-13.1-JeOS/Dicefile 2015-07-15 13:09:22.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.1-JeOS/Vagrantfile new/kiwi/template/ix86/suse-13.1-JeOS/Vagrantfile --- old/kiwi/template/ix86/suse-13.1-JeOS/Vagrantfile 2015-04-30 10:28:21.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.1-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.provider "docker" do |d| - # select docker box to use for this build, build boxes can be found in: - # Virtualization:Appliances:Images e.g docker-box-13.1 - # in order to import a build box call e.g: - # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new - d.image = "kiwi-build-box:new" - d.create_args = ["--privileged=true", "-i", "-t"] - # start the sshd in foreground to keep the container in running state - d.cmd = ["/usr/sbin/sshd", "-D"] - d.has_ssh = true - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/Dicefile new/kiwi/template/ix86/suse-13.2-JeOS/Dicefile --- old/kiwi/template/ix86/suse-13.2-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-13.2-JeOS/Dicefile 2015-07-16 11:17:03.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/Vagrantfile new/kiwi/template/ix86/suse-13.2-JeOS/Vagrantfile --- old/kiwi/template/ix86/suse-13.2-JeOS/Vagrantfile 2015-04-30 10:28:21.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.2-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.provider "docker" do |d| - # select docker box to use for this build, build boxes can be found in: - # Virtualization:Appliances:Images e.g docker-box-13.1 - # in order to import a build box call e.g: - # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new - d.image = "kiwi-build-box:new" - d.create_args = ["--privileged=true", "-i", "-t"] - # start the sshd in foreground to keep the container in running state - d.cmd = ["/usr/sbin/sshd", "-D"] - d.has_ssh = true - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE11-JeOS/Dicefile new/kiwi/template/ix86/suse-SLE11-JeOS/Dicefile --- old/kiwi/template/ix86/suse-SLE11-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE11-JeOS/Dicefile 2015-07-16 11:17:26.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE11-JeOS/Vagrantfile new/kiwi/template/ix86/suse-SLE11-JeOS/Vagrantfile --- old/kiwi/template/ix86/suse-SLE11-JeOS/Vagrantfile 2015-04-30 10:28:21.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE11-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.provider "docker" do |d| - # select docker box to use for this build, build boxes can be found in: - # Virtualization:Appliances:Images e.g docker-box-13.1 - # in order to import a build box call e.g: - # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new - d.image = "kiwi-build-box:new" - d.create_args = ["--privileged=true", "-i", "-t"] - # start the sshd in foreground to keep the container in running state - d.cmd = ["/usr/sbin/sshd", "-D"] - d.has_ssh = true - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/Dicefile new/kiwi/template/ix86/suse-SLE12-JeOS/Dicefile --- old/kiwi/template/ix86/suse-SLE12-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/Dicefile 2015-07-16 11:17:28.000000000 +0200 @@ -0,0 +1,3 @@ +Dice.configure do |config| + config.buildhost = :DOCKER +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/Vagrantfile new/kiwi/template/ix86/suse-SLE12-JeOS/Vagrantfile --- old/kiwi/template/ix86/suse-SLE12-JeOS/Vagrantfile 2015-04-30 10:28:21.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.provider "docker" do |d| - # select docker box to use for this build, build boxes can be found in: - # Virtualization:Appliances:Images e.g docker-box-13.1 - # in order to import a build box call e.g: - # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new - d.image = "kiwi-build-box:new" - d.create_args = ["--privileged=true", "-i", "-t"] - # start the sshd in foreground to keep the container in running state - d.cmd = ["/usr/sbin/sshd", "-D"] - d.has_ssh = true - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2015-07-08 15:06:43.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2015-07-16 18:48:39.000000000 +0200 @@ -146,7 +146,6 @@ <package name="grub2-x86_64-xen" bootinclude="true"/> <package name="xen-kmp-default" bootinclude="true"/> <package name="xen-libs" arch="x86_64" replaces=""/> - <package name="xen-tools-domU" arch="x86_64" replaces=""/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> @@ -155,7 +154,6 @@ <package name="kernel-xen" replaces="kernel-default"/> <package name="kernel-xen" replaces="xen-kmp-default"/> <package name="xen-libs" arch="x86_64" replaces=""/> - <package name="xen-tools-domU" arch="x86_64" replaces=""/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> @@ -165,7 +163,6 @@ <package name="kernel-default" replaces="xen-kmp-default"/> <package name="kernel-default" replaces="xen-libs"/> <package name="kernel-default" replaces="xen-tools"/> - <package name="kernel-default" replaces="xen-tools-domU"/> <package name="kernel-default" replaces="xen"/> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> </packages>
