Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-01-27 14:03:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-01-26
14:05:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-01-27
14:03:13.000000000 +0100
@@ -1,0 +2,24 @@
+Fri Jan 27 13:56:19 CET 2012 - m...@suse.de
+
+- v5.02.7 released
+
+-------------------------------------------------------------------
+Fri Jan 27 13:43:30 CET 2012 - m...@suse.de
+
+- clean KIWICollect.pm to perl critic
+
+-------------------------------------------------------------------
+Fri Jan 27 09:46:46 CET 2012 - m...@suse.de
+
+- In RHEL/CentOS distributions the qemu-img program is packaged
+ in qemu-img not in qemu or virt-utils.
+
+-------------------------------------------------------------------
+Fri Jan 27 09:30:21 CET 2012 - m...@suse.de
+
+- enhanced RHEL6 JeOS
+ * added default ifcfg-eth0 connecting via dhcp
+ * switch off firstboot start via sysconfig/firstboot
+ * added profiles RedHat and CentOS to build for both targets
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.2vqE0h/_old 2012-01-27 14:03:15.000000000 +0100
+++ /var/tmp/diff_new_pack.2vqE0h/_new 2012-01-27 14:03:15.000000000 +0100
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.6
+Version: 5.02.7
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
@@ -218,6 +218,8 @@
%else
%if 0%{?suse_version} >= 1130
Requires: virt-utils
+%else if 0%{?rhel_version}
+Requires: qemu-img
%else
Requires: qemu
%endif
@@ -265,6 +267,8 @@
%else
%if 0%{?suse_version} >= 1130
Requires: virt-utils
+%else if 0%{?rhel_version}
+Requires: qemu-img
%else
Requires: qemu
%endif
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-01-26 12:27:49.000000000 +0100
+++ new/kiwi/.revision 2012-01-26 12:27:49.000000000 +0100
@@ -1 +1 @@
-b346e55a98c767650ab06cd2fdec7c180cd54b16
+3dc9a3a4e99fb5686271b89b5d6650698a9c1182
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm
new/kiwi/modules/KIWICollect.pm
--- old/kiwi/modules/KIWICollect.pm 2012-01-26 12:27:49.000000000 +0100
+++ new/kiwi/modules/KIWICollect.pm 2012-01-27 13:53:16.000000000 +0100
@@ -107,7 +107,7 @@
m_browser => undef,
m_srcmedium => -1,
m_debugmedium => -1,
- m_logStdOut => undef,
+ m_logStdOut => 0,
m_startUpTime => undef,
m_fpacks => [],
m_fmpacks => [],
@@ -497,7 +497,7 @@
$this->{m_dirlist}->{"$curdir"} = 1;
}
my $num = $n;
- if ( $this->{m_proddata}->getVar("FLAVOR") eq "ftp"
+ if ( $this->{m_proddata}->getVar("FLAVOR", '') eq "ftp"
or $n == $this->{m_debugmedium} )
{
$num = 1;
@@ -537,8 +537,7 @@
$this->logMsg('I', "KIWICollect::Init: create KIWIRepoMetaHandler
module");
$this->{m_metacreator} = KIWIRepoMetaHandler -> new ($this);
$this->{m_metacreator}->baseurl($this->{m_united});
- $this->{m_metacreator}->mediaName(
-
$this->{m_proddata}->getVar('MEDIUM_NAME'));
+
$this->{m_metacreator}->mediaName($this->{m_proddata}->getVar('MEDIUM_NAME'));
my $msg = 'Loading plugins from <'
. $this->{m_proddata}->getOpt("PLUGIN_DIR")
. '>';
@@ -673,12 +672,12 @@
}
# We create iso files by default, but keep this for manual override
- if($this->{m_proddata}->getVar("REPO_ONLY") eq "true") {
+ if($this->{m_proddata}->getVar("REPO_ONLY", 'false') eq "true") {
$this->logMsg('I', "Skipping ISO generation due to REPO_ONLY
setting");
return 0;
}
# should not be applied anymore
- if($this->{m_proddata}->getVar("FLAVOR") eq "ftp") {
+ if($this->{m_proddata}->getVar("FLAVOR", '') eq "ftp") {
my $msg = 'Skipping ISO generation for FLAVOR ftp, please use '
. 'REPO_ONLY flag instead !';
$this->logMsg('W', $msg);
@@ -1363,16 +1362,15 @@
next PACKKEY;
}
- $this->logMsg('I', "unpack
$packPointer->{'localfile'} ");
- $this->{m_util}->unpac_package(
-
$packPointer->{'localfile'}, "$tmp");
+ $this->logMsg('I', "unpack
$packPointer->{localfile} ");
+ $this->{m_util}->unpac_package(
$packPointer->{localfile}, "$tmp");
# all metapackages contain at least a
CD1 dir and _may_
# contain another /usr/share/<name> dir
if ( -d "$tmp/CD1") {
qx(cp -a $tmp/CD1/*
$this->{m_basesubdir}->{$medium});
}
else {
- my $msg = "No CD1 directory on
$packPointer->{name}";
+ my $msg = "No CD1 directory on
$packPointer->{localfile}";
$this->logMsg('W', $msg);
}
#for my $sub("usr", "etc") {
@@ -2307,7 +2305,7 @@
if(-d $item) {
@data = qx($dy $item);
$this->logMsg('I',
- "[createMetadata] $dy output
for directory $_:");
+ "[createMetadata] $dy output
for directory $item:");
for my $entry (@data) {
chomp $entry;
$this->logMsg('I', "\t$entry");
@@ -2525,7 +2523,7 @@
}
else {
RPM:
- for my $rpmname(<RPMLIST>) {
+ for my $rpmname (<$RPMLIST>) {
chomp $rpmname;
if(! defined($rpmname)
or ! defined($this->{m_repoPacks}->{$rpmname}))
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 2012-01-26 12:27:55.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-01-27 13:57:05.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.6";
+ $data{Version} = "5.02.7";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml
new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml
--- old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-01-26
12:27:49.000000000 +0100
+++ new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-01-27
13:53:16.000000000 +0100
@@ -6,6 +6,10 @@
<contact>m...@suse.com</contact>
<specification>RHEL Enterprise 6 JeOS</specification>
</description>
+ <profiles>
+ <profile name="RedHat" description="Build for RHEL"
import="true"/>
+ <profile name="CentOS" description="Build for CentOS"/>
+ </profiles>
<preferences>
<version>1.1.0</version>
<packagemanager>yum</packagemanager>
@@ -17,7 +21,7 @@
<rpm-check-signatures>false</rpm-check-signatures>
<type image="iso" primary="true" boot="isoboot/rhel-06.0"
flags="clic"/>
<type image="vmx" boot="vmxboot/rhel-06.0" filesystem="ext3"
format="vmdk" kernelcmdline="rhgb">
- <machine memory="1024" guestOS="rhel5">
+ <machine memory="1024" guestOS="rhel6">
<vmdisk controller="scsi" id="0"/>
<vmnic driver="e1000" interface="0"
mode="bridged"/>
</machine>
@@ -36,10 +40,16 @@
<user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root"
name="root"/>
</users>
<repository type="rpm-md">
+ <source
path="obs://Virtualization:/Appliances:/rhel-060/RedHat_RHEL-6"/>
+ </repository>
+ <repository type="rpm-md" profiles="RedHat">
<source path="iso:///image/CDs/RHEL-6.2-%arch-DVD.iso"/>
</repository>
- <repository type="rpm-md">
- <source
path="obs://Virtualization:/Appliances:/rhel-060/RedHat_RHEL-6"/>
+ <repository type="rpm-md" profiles="CentOS">
+ <source path="http://mirror.centos.org/centos/6/os/%arch"/>
+ </repository>
+ <repository type="rpm-md" profiles="CentOS">
+ <source path="http://mirror.centos.org/centos/6/updates/%arch"/>
</repository>
<packages type="image">
<package name="bash"/>
@@ -80,7 +90,6 @@
<package name="parted"/>
<package name="perl-Digest-SHA1"/>
<package name="procps"/>
- <package name="redhat-release-server"/>
<package name="rpm"/>
<package name="screen"/>
<package name="selinux-policy-targeted"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/firstboot
new/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/firstboot
--- old/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/firstboot
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/firstboot
2012-01-27 13:53:16.000000000 +0100
@@ -0,0 +1 @@
+RUN_FIRSTBOOT=NO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/network-scripts/ifcfg-eth0
new/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/network-scripts/ifcfg-eth0
---
old/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/network-scripts/ifcfg-eth0
1970-01-01 01:00:00.000000000 +0100
+++
new/kiwi/template/ix86/rhel-06.0-JeOS/root/etc/sysconfig/network-scripts/ifcfg-eth0
2012-01-27 13:53:16.000000000 +0100
@@ -0,0 +1,3 @@
+DEVICE=eth0
+BOOTPROTO=dhcp
+ONBOOT=yes
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
