Hello community,
here is the log from the commit of package kiwi for openSUSE:12.2 checked in at
2012-07-06 09:39:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/kiwi (Old)
and /work/SRC/openSUSE:12.2/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/kiwi/kiwi.changes 2012-07-02 21:23:14.000000000
+0200
+++ /work/SRC/openSUSE:12.2/.kiwi.new/kiwi.changes 2012-07-06
09:39:21.000000000 +0200
@@ -1,0 +2,22 @@
+Wed Jul 4 15:07:36 CEST 2012 - m...@suse.de
+
+- v5.03.29 released
+
+-------------------------------------------------------------------
+Wed Jul 4 14:58:23 CEST 2012 - m...@suse.de
+
+- don't remove rpm and fonts required in the pxe examples
+
+-------------------------------------------------------------------
+Wed Jul 4 13:59:38 CEST 2012 - m...@suse.de
+
+- added missing fonts and X11 input packages to pxe 12.1 example
+
+-------------------------------------------------------------------
+Tue Jul 3 16:40:50 CEST 2012 - m...@suse.de
+
+- libproxy reads the data from /etc/sysconfig/proxy. Thus it's
+ required to hold a temporary copy of that file inside the chroot
+ to make use of proxy settings while operating in the chroot
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.xMKSxL/_old 2012-07-06 09:39:22.000000000 +0200
+++ /var/tmp/diff_new_pack.xMKSxL/_new 2012-07-06 09:39:22.000000000 +0200
@@ -21,7 +21,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.03.28
+Version: 5.03.29
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:12.2/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:12.2/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200
+++ new/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200
@@ -1 +1 @@
-bbb46580bfb055545c3684d8dbec559229207502
+67288b7deef93eea9a1dfda7d663d37af80e794a
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-07-02 20:48:52.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2012-07-04 15:08:04.000000000 +0200
@@ -50,7 +50,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.03.28";
+ $data{Version} = "5.03.29";
$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/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm
--- old/kiwi/modules/KIWIRoot.pm 2012-06-27 14:36:16.000000000 +0200
+++ new/kiwi/modules/KIWIRoot.pm 2012-07-04 15:08:04.000000000 +0200
@@ -450,6 +450,8 @@
# need resolv.conf/hosts for internal chroot name resolution
qxx (" cp /etc/resolv.conf $root/etc 2>&1 ");
qxx (" cp /etc/hosts $root/etc 2>&1 ");
+ # need /etc/sysconfig/proxy for internal chroot proxy usage
+ qxx (" cp /etc/sysconfig/proxy $root/etc/sysconfig 2>&1 ");
$kiwi -> done();
#==========================================
# Create package keys
@@ -556,6 +558,14 @@
$this->{needHosts} = 1;
}
#==========================================
+ # make sure proxy works
+ #------------------------------------------
+ $this->{needProxy} = 0;
+ if (! -f "$root/etc/sysconfig/proxy") {
+ qxx ("cp /etc/sysconfig/proxy $root/etc/sysconfig 2>&1");
+ $this->{needProxy} = 1;
+ }
+ #==========================================
# Check and set lock
#------------------------------------------
$manager -> checkExclusiveLock();
@@ -627,6 +637,14 @@
$this->{needHosts} = 1;
}
#==========================================
+ # make sure proxy works
+ #------------------------------------------
+ $this->{needProxy} = 0;
+ if (! -f "$root/etc/sysconfig/proxy") {
+ qxx ("cp /etc/sysconfig/proxy $root/etc/sysconfig 2>&1");
+ $this->{needProxy} = 1;
+ }
+ #==========================================
# Check and set lock
#------------------------------------------
$manager -> checkExclusiveLock();
@@ -677,6 +695,7 @@
my $root = $this->{root};
my $needResolvConf = $this->{needResolvConf};
my $needHosts = $this->{needHosts};
+ my $needProxy = $this->{needProxy};
if ($needResolvConf) {
qxx ("rm -f $root/etc/resolv.conf");
undef $this->{needResolvConf};
@@ -685,6 +704,10 @@
qxx ("rm -f $root/etc/hosts");
undef $this->{needHosts};
}
+ if ($needProxy) {
+ qxx ("rm -f $root/etc/sysconfig/proxy");
+ undef $this->{needProxy};
+ }
}
#==========================================
@@ -1230,6 +1253,23 @@
}
}
#========================================
+ # cleanup temporary copy of proxy
+ #----------------------------------------
+ if (! -e "$imageDesc/root/etc/sysconfig/proxy") {
+ # restore only if overlay tree doesn't contain a proxy setup
+ if ((-f "$root/etc/sysconfig/proxy") && (-f
"/etc/sysconfig/proxy")) {
+ my $data = qxx (
+ "diff -q /etc/sysconfig/proxy
$root/etc/sysconfig/proxy"
+ );
+ my $code = $? >> 8;
+ if ($code == 0) {
+ $kiwi -> info ("Cleanup temporary copy of
sysconfig/proxy");
+ qxx ("rm -f $root/etc/sysconfig/proxy");
+ $kiwi -> done ();
+ }
+ }
+ }
+ #========================================
# cleanup temporary .buildenv
#----------------------------------------
if (-f "$root/.buildenv") {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
