Hello community,
here is the log from the commit of package
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory
checked in at Mon Jun 20 16:00:21 CEST 2011.
--------
---
kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
2011-05-23 16:02:31.000000000 +0200
+++
/mounts/work_src_done/STABLE/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
2011-06-17 12:49:34.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 17 10:49:23 UTC 2011 - co...@novell.com
+
+- support splitted livecd builds
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kiwi-instsource-plugins-openSUSE-12-1.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-instsource-plugins-openSUSE-12-1.spec ++++++
--- /var/tmp/diff_new_pack.i805Kv/_old 2011-06-20 15:58:21.000000000 +0200
+++ /var/tmp/diff_new_pack.i805Kv/_new 2011-06-20 15:58:21.000000000 +0200
@@ -21,10 +21,11 @@
Name: kiwi-instsource-plugins-openSUSE-12-1
Summary: OpenSuSE - KIWI Image System
Version: 0.9
-Release: 1
+Release: 3
Group: System/Management
License: GPLv2
Source: %{name}.tar.bz2
+Patch0: kiwi-instsource-plugins-openSUSE-12-1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: inst-source-utils >= 2011.5.5
Requires: kiwi-instsource package-translations
@@ -39,6 +40,7 @@
%prep
%setup -q -n kiwi-instsource-plugins-openSUSE-12-1
+%patch0 -p0
%build
# empty because of rpmlint warning rpm-buildroot-usage
++++++ kiwi-instsource-plugins-openSUSE-12-1.diff ++++++
Index: KIWILiveTreePlugin.pm
===================================================================
--- KIWILiveTreePlugin.pm.orig 2011-05-23 15:59:57.000000000 +0200
+++ KIWILiveTreePlugin.pm 2011-06-18 17:51:03.046464565 +0200
@@ -109,16 +109,6 @@ sub new
}
# /constructor
-sub logandrename($$$$)
-{
- my $this = shift;
- my $dname = shift;
- my $oname = shift;
- my $nname = shift;
- $this->logMsg("I", "Renaming $dname/$oname to $dname/$nname");
- rename("$dname/$oname", "$dname/$nname") || die "no such file!";
-}
-
# returns: number of patched gfxboot files
sub execute
{
@@ -141,24 +131,22 @@ sub execute
return $retval;
}
- my $x11cd = undef;
- find( sub { if (m/kiwi-profiled-livecd-kde.i586.iso/) { $x11cd =
$File::Find::name; } }, $this->handler()->collect()->basedir());
- if (!$x11cd) {
+ my $medium = $this->collect()->productData()->getVar("MEDIUM_NAME");
+ my $cd = undef;
+ find( sub { if (m/.iso/) { $cd = $File::Find::name; } },
$this->handler()->collect()->basedir());
+ if (!$cd) {
$this->logMsg("E", "Initial CD not found\n");
exit(1);
}
- print "$x11cd\n";
- my $dname = dirname($x11cd);
- print "$dname\n";
- my $base = basename($dname);
- $base =~ s,openSUSE-Live-Tree-i586-x86_64,,;
-
- #logandrename($this, $dname, "kiwi-profiled-livecd-x11.i586.iso",
"openSUSE-X11-LiveCD-i686-$base.iso");
- #logandrename($this, $dname, "kiwi-profiled-livecd-x11.x86_64.iso",
"openSUSE-X11-LiveCD-x86_64-$base.iso");
- logandrename($this, $dname, "kiwi-profiled-livecd-kde.i586.iso",
"openSUSE-KDE-LiveCD-i686$base.iso");
- logandrename($this, $dname, "kiwi-profiled-livecd-kde.x86_64.iso",
"openSUSE-KDE-LiveCD-x86_64$base.iso");
- logandrename($this, $dname, "kiwi-profiled-livecd-gnome.i586.iso",
"openSUSE-GNOME-LiveCD-i686$base.iso");
- logandrename($this, $dname, "kiwi-profiled-livecd-gnome.x86_64.iso",
"openSUSE-GNOME-LiveCD-x86_64$base.iso");
+ $this->logMsg("I", "$cd $medium");
+ my $dname = dirname($cd);
+ $this->logMsg("I", "$dname");
+
+ my $nname = "$medium.iso";
+ $nname =~ s,-i586-,-i686-,;
+
+ $this->logMsg("I", "Renaming $cd to $dname/$nname");
+ rename($cd, "$dname/$nname") || $this->logMsg("E", "could not rename $cd");
return $retval;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
