commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2014-06-19 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2014-06-19 13:07:50

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2013-12-10 07:02:34.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2014-06-19 13:07:54.0 +0200
@@ -1,0 +2,5 @@
+Tue Jun 17 09:47:21 UTC 2014 - co...@suse.com
+
+- add a provide of kiwi-instsource-plugin, which is now required by kiwi
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.p27Pos/_old  2014-06-19 13:07:55.0 +0200
+++ /var/tmp/diff_new_pack.p27Pos/_new  2014-06-19 13:07:55.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kiwi-instsource-plugins-openSUSE-12-1
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@
 %if 0%{suse_version}  1210
 Requires:   extract-appdata-icons
 %endif
+Provides:   kiwi-instsource-plugin = 12.1
 Requires:   inst-source-utils = 2011.5.5
 Requires:   kiwi-instsource
 Requires:   mkdosfs

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2013-12-09 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2013-12-10 07:02:33

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2013-08-28 13:38:29.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2013-12-10 07:02:34.0 +0100
@@ -1,0 +2,5 @@
+Mon Dec  9 10:34:33 UTC 2013 - adr...@suse.de
+
+- fix plugin loading for kiwi v5.06.8
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIFinishEFIPlugin.pm 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIFinishEFIPlugin.pm
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIFinishEFIPlugin.pm
2013-08-26 16:06:21.0 +0200
+++ new/kiwi-instsource-plugins-openSUSE-12-1/KIWIFinishEFIPlugin.pm
2013-12-09 11:31:30.0 +0100
@@ -41,7 +41,6 @@
 use Config::IniFiles;
 use File::Find;
 use File::Basename;
-use KIWIQX qw (qxx);
 
 
 sub new
@@ -133,9 +132,9 @@
 
 my $efi = $dir/boot/x86_64/efi;
 $this-logMsg(I, creating $efi);
-qxx(dd if=/dev/zero of=$efi bs=1M count=4);
-qxx(/usr/sbin/mkdosfs -n 'BOOT' $efi);
-qxx(mcopy -Do -s -i $efi $dir/EFI ::);
+KIWIQX::qxx(dd if=/dev/zero of=$efi bs=1M count=4);
+KIWIQX::qxx(/usr/sbin/mkdosfs -n 'BOOT' $efi);
+KIWIQX::qxx(mcopy -Do -s -i $efi $dir/EFI ::);
   }
 
   return $retval;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIMiniIsoPlugin.pm 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIMiniIsoPlugin.pm
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIMiniIsoPlugin.pm  
2013-08-26 15:56:44.0 +0200
+++ new/kiwi-instsource-plugins-openSUSE-12-1/KIWIMiniIsoPlugin.pm  
2013-12-09 11:31:30.0 +0100
@@ -41,8 +41,6 @@
 use Config::IniFiles;
 use File::Find;
 
-use KIWIQX qw (qxx);
-
 sub new
 {
   # ...
@@ -242,7 +240,7 @@
 }
 close(OUT);
 close(IN); 
-qxx(diff -u $grubcfg $grubcfg.new);
+KIWIQX::qxx(diff -u $grubcfg $grubcfg.new);
 rename($grubcfg.new, $grubcfg);
   } else {
 $this-logMsg(I, no grub.cfg at $grubcfg);

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2013-08-28 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2013-08-28 13:38:28

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2013-02-26 15:15:20.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2013-08-28 13:38:29.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 27 11:22:07 UTC 2013 - adr...@suse.de
+
+- avoid usage of _legacy code
+
+---

Old:

  kiwi-instsource-plugins-openSUSE-12-1.diff



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.jW0Ald/_old  2013-08-28 13:38:30.0 +0200
+++ /var/tmp/diff_new_pack.jW0Ald/_new  2013-08-28 13:38:30.0 +0200
@@ -25,7 +25,6 @@
 Version:0.9
 Release:0
 Source: %{name}.tar.bz2
-Patch0: kiwi-instsource-plugins-openSUSE-12-1.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if 0%{suse_version}  1210
 Requires:   extract-appdata-icons
@@ -47,7 +46,6 @@
 
 %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.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIBasePlugin.pm 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIBasePlugin.pm
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIBasePlugin.pm 2011-05-23 
15:59:55.0 +0200
+++ new/kiwi-instsource-plugins-openSUSE-12-1/KIWIBasePlugin.pm 2013-08-26 
15:20:59.0 +0200
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2008 Jan-Christoph Bornschlegel, Novell Inc.
+# Copyright (c) 2008 Jan-Christoph Bornschlegel, SUSE LLC
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -20,7 +20,7 @@
 #
 # FILE  : KIWIInstSourceBasePlugin.pm
 #
-# PROJECT   : OpenSUSE Build-Service
+# PROJECT   : openSUSE Build-Service
 # COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH, Germany
 #   :
 # AUTHOR: Jan-Christoph Bornschlegel jcb...@suse.de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIContentPlugin.pm 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIContentPlugin.pm
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIContentPlugin.pm  
2011-05-23 15:59:57.0 +0200
+++ new/kiwi-instsource-plugins-openSUSE-12-1/KIWIContentPlugin.pm  
2013-08-26 15:20:59.0 +0200
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2008 Jan-Christoph Bornschlegel, Novell Inc.
+# Copyright (c) 2008 Jan-Christoph Bornschlegel, SUSE LLC
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -20,7 +20,7 @@
 #
 # FILE  : KIWIContentPlugin.pm
 #
-# PROJECT   : OpenSUSE Build-Service
+# PROJECT   : openSUSE Build-Service
 # COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH, Germany
 #   :
 # AUTHOR: Jan-Christoph Bornschlegel jcb...@suse.de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.ini 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.ini
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.ini   
2011-05-23 15:59:57.0 +0200
+++ new/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.ini   
2013-08-26 15:20:59.0 +0200
@@ -21,7 +21,6 @@
 [options]
 parameter = -P
 parameter = -Z
-parameter = -C
 parameter = -D
 parameter = -K
 parameter = -M 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.pm 
new/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.pm
--- old/kiwi-instsource-plugins-openSUSE-12-1/KIWIDescrPlugin.pm
2011-05-23 15:59:57.0 +0200
+++ 

commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2013-02-26 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2013-02-26 15:15:19

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2013-02-07 10:27:00.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2013-02-26 15:15:20.0 +0100
@@ -1,0 +2,10 @@
+Mon Feb 25 20:34:37 UTC 2013 - co...@suse.com
+
+- patch repo url into the uefi grub cfg (bnc#805234)
+
+---
+Mon Feb 25 15:58:42 UTC 2013 - co...@suse.com
+
+- add another plugin which creates boot/x86_64/efi for EFI media
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.m6nWPa/_old  2013-02-26 15:15:22.0 +0100
+++ /var/tmp/diff_new_pack.m6nWPa/_new  2013-02-26 15:15:22.0 +0100
@@ -32,6 +32,8 @@
 %endif
 Requires:   inst-source-utils = 2011.5.5
 Requires:   kiwi-instsource
+Requires:   mkdosfs
+Requires:   mtools
 Requires:   openSUSE-EULAs
 Requires:   package-translations
 Supplements:kiwi-instsource

++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.m6nWPa/_old  2013-02-26 15:15:22.0 +0100
+++ /var/tmp/diff_new_pack.m6nWPa/_new  2013-02-26 15:15:22.0 +0100
@@ -251,3 +251,204 @@
 +
 +1;
 +
+Index: KIWIFinishEFIPlugin.ini
+===
+--- /dev/null
 KIWIFinishEFIPlugin.ini
+@@ -0,0 +1,5 @@
++[base]
++name = KIWIFinishEFIPlugin
++order = 10
++defaultenable = 1
++
+Index: KIWIFinishEFIPlugin.pm
+===
+--- /dev/null
 KIWIFinishEFIPlugin.pm
+@@ -0,0 +1,144 @@
++
++# Copyright (c) 2012 SUSE
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License version 2 as
++# published by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program (see the file LICENSE); if not, write to the
++# Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++#
++
++
++#
++# FILE  : KIWIFinishEFIPlugin.pm
++#
++# PROJECT   : OpenSUSE Build-Service
++# COPYRIGHT : (c) 2012 SUSE LINUX Products GmbH, Germany
++#   :
++# AUTHOR: Stephan Kulow co...@suse.de
++#   :
++# BELONGS TO: Operating System images
++#   :
++# DESCRIPTION   : Module patching mini iso builds
++#   :
++# STATUS: Development
++#
++
++package KIWIFinishEFIPlugin;
++
++use strict;
++
++use base KIWIBasePlugin;
++use Data::Dumper;
++use Config::IniFiles;
++use File::Find;
++use File::Basename;
++use KIWIQX qw (qxx);
++
++
++sub new
++{
++  # ...
++  # Create a new KIWIFinishEFIPlugin object
++  # ---
++  my $class   = shift;
++  my $handler = shift;
++  my $config  = shift;
++
++  my $this = new KIWIBasePlugin($handler);
++  bless ($this, $class);
++
++  $config =~ m{(.*)/([^/]+)$};
++  my $configpath = $1;
++  my $configfile = $2;
++  if(not defined($configpath) or not defined($configfile)) {
++$this-logMsg(E, wrong parameters in plugin initialisation\n);
++return undef;
++  }
++
++  ## now gather all necessary information from the inifile:
++  #===
++  # Issue: why duplicate code here? Why not put it into the base class?
++  # Answer: Each plugin may have different options. Some only need a target 
filename,
++  # whilst some others may need much more. I don't want to specify a 
complicated framework
++  # for the plugin, it shall just be a simple straightforward way to get 
information
++  # into the plugin. The idea is that the people who decide on the metadata 
write
++  # the plugin, and 

commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2013-02-07 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2013-02-07 10:26:58

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2012-09-02 07:47:58.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2013-02-07 10:27:00.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb  5 20:25:03 UTC 2013 - co...@suse.com
+
+- kiwi moved mbrid from boot/grub to boot
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.y0f9P4/_old  2013-02-07 10:27:01.0 +0100
+++ /var/tmp/diff_new_pack.y0f9P4/_new  2013-02-07 10:27:01.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kiwi-instsource-plugins-openSUSE-12-1
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,9 @@
 Source: %{name}.tar.bz2
 Patch0: kiwi-instsource-plugins-openSUSE-12-1.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if 0%{suse_version}  1210
 Requires:   extract-appdata-icons
+%endif
 Requires:   inst-source-utils = 2011.5.5
 Requires:   kiwi-instsource
 Requires:   openSUSE-EULAs

++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.y0f9P4/_old  2013-02-07 10:27:01.0 +0100
+++ /var/tmp/diff_new_pack.y0f9P4/_new  2013-02-07 10:27:01.0 +0100
@@ -239,9 +239,9 @@
 +  find( sub { 
 + if (m/initrd.liv/) { 
 +   my $cd = $File::Find::name; 
-+   system(mkdir -p boot/grub; echo $medium  boot/grub/mbrid);
-+   system(echo boot/grub/mbrid | cpio --create --format=newc --quiet | 
gzip -9 -f  $cd);
-+   system(rm boot/grub/mbrid; rmdir boot/grub; rmdir boot);
++   system(mkdir -p boot; echo $medium  boot/mbrid);
++   system(echo boot/mbrid | cpio --create --format=newc --quiet | gzip 
-9 -f  $cd);
++   system(rm boot/mbrid; rmdir boot);
 +   $this-logMsg(I, updated $cd);
 +  }  
 + }, $this-handler()-collect()-basedir());

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2012-09-01 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2012-09-02 07:47:56

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2012-08-27 16:04:33.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2012-09-02 07:47:58.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 28 08:35:27 UTC 2012 - co...@suse.com
+
+- also support promo dvds that are biarch
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.hsmM0Q/_old  2012-09-02 07:48:00.0 +0200
+++ /var/tmp/diff_new_pack.hsmM0Q/_new  2012-09-02 07:48:00.0 +0200
@@ -101,7 +101,7 @@
 ===
 --- /dev/null
 +++ KIWIPromoDVDPlugin.pm
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,149 @@
 +
 +# Copyright (c) 2012 SUSE
 +#
@@ -236,19 +236,15 @@
 +  }
 +
 +  my $medium = $this-collect()-productData()-getVar(MEDIUM_NAME);
-+  my $name = $this-{m_basesubdir}-{$cd} ) =~ s{.*/(.*)/*$}{$1};
-+  my $cd;
-+  find( sub { if (m/initrd.liv/) { $cd = $File::Find::name; }  }, 
$this-handler()-collect()-basedir());
-+  if (!$cd) {
-+  $this-logMsg(E, initrd.liv not found\n);
-+  exit(1);
-+  }
-+  $this-logMsg(I, $cd $medium $name);
-+  my $dname = dirname($cd);
-+  $this-logMsg(I, $dname);
-+  system(mkdir -p boot/grub; echo $medium  boot/grub/mbrid);
-+  system(echo boot/grub/mbrid | cpio --create --format=newc --quiet | gzip 
-9 -f  $cd);
-+  $this-logMsg(I, updated $cd);
++  find( sub { 
++ if (m/initrd.liv/) { 
++   my $cd = $File::Find::name; 
++   system(mkdir -p boot/grub; echo $medium  boot/grub/mbrid);
++   system(echo boot/grub/mbrid | cpio --create --format=newc --quiet | 
gzip -9 -f  $cd);
++   system(rm boot/grub/mbrid; rmdir boot/grub; rmdir boot);
++   $this-logMsg(I, updated $cd);
++  }  
++ }, $this-handler()-collect()-basedir());
 +
 +  return $retval;
 +}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2012-08-27 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2012-08-27 16:04:31

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2012-03-11 20:04:33.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2012-08-27 16:04:33.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 27 13:19:05 UTC 2012 - co...@suse.com
+
+- add special hack for promo dvds so the kiwi live cds boot from 
+  product DVDs
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.GMjksA/_old  2012-08-27 16:04:36.0 +0200
+++ /var/tmp/diff_new_pack.GMjksA/_new  2012-08-27 16:04:36.0 +0200
@@ -1,7 +1,7 @@
 Index: KIWILiveTreePlugin.pm
 ===
 KIWILiveTreePlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100
-+++ KIWILiveTreePlugin.pm  2012-03-05 13:56:10.640598808 +0100
+--- KIWILiveTreePlugin.pm.orig
 KIWILiveTreePlugin.pm
 @@ -109,16 +109,6 @@ sub new
  }
  # /constructor
@@ -59,8 +59,8 @@
  }
 Index: KIWIDescrPlugin.pm
 ===
 KIWIDescrPlugin.pm.orig2012-03-05 13:56:09.045673886 +0100
-+++ KIWIDescrPlugin.pm 2012-03-10 15:14:03.808988785 +0100
+--- KIWIDescrPlugin.pm.orig
 KIWIDescrPlugin.pm
 @@ -230,6 +230,25 @@ sub executeDir
 return 1;
   }
@@ -87,3 +87,171 @@
  
if($this-{m_compress} =~ m{yes}i) {
foreach my $pfile(glob($targetdir/packages*)) {
+Index: KIWIPromoDVDPlugin.ini
+===
+--- /dev/null
 KIWIPromoDVDPlugin.ini
+@@ -0,0 +1,5 @@
++[base]
++name = KIWIPromoDVDPlugin
++order = 7
++defaultenable = 1
++
+Index: KIWIPromoDVDPlugin.pm
+===
+--- /dev/null
 KIWIPromoDVDPlugin.pm
+@@ -0,0 +1,153 @@
++
++# Copyright (c) 2012 SUSE
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License version 2 as
++# published by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program (see the file LICENSE); if not, write to the
++# Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++#
++
++
++#
++# FILE  : KIWIPromoDVDPlugin.pm
++#
++# PROJECT   : OpenSUSE Build-Service
++# COPYRIGHT : (c) 2012 SUSE LINUX Products GmbH, Germany
++#   :
++# AUTHOR: Stephan Kulow co...@suse.de
++#   :
++# BELONGS TO: Operating System images
++#   :
++# DESCRIPTION   : Module patching mini iso builds
++#   :
++# STATUS: Development
++#
++
++package KIWIPromoDVDPlugin;
++
++use strict;
++
++use base KIWIBasePlugin;
++use Data::Dumper;
++use Config::IniFiles;
++use File::Find;
++use File::Basename;
++
++
++sub new
++{
++  # ...
++  # Create a new KIWIPromoDVDPlugin object
++  # ---
++  my $class   = shift;
++  my $handler = shift;
++  my $config  = shift;
++
++  my $this = new KIWIBasePlugin($handler);
++  bless ($this, $class);
++
++  $config =~ m{(.*)/([^/]+)$};
++  my $configpath = $1;
++  my $configfile = $2;
++  if(not defined($configpath) or not defined($configfile)) {
++$this-logMsg(E, wrong parameters in plugin initialisation\n);
++return undef;
++  }
++
++  ## now gather all necessary information from the inifile:
++  #===
++  # Issue: why duplicate code here? Why not put it into the base class?
++  # Answer: Each plugin may have different options. Some only need a target 
filename,
++  # whilst some others may need much more. I don't want to specify a 
complicated framework
++  # for the plugin, it shall just be a simple 

commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2012-03-11 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2012-03-11 20:04:30

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2011-10-28 19:55:29.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2012-03-11 20:04:33.0 +0100
@@ -1,0 +2,5 @@
+Sun Mar 11 18:07:30 UTC 2012 - co...@suse.com
+
+- require and call extract-appdata-icons (only useful in 12.2)
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.ecxeue/_old  2012-03-11 20:04:34.0 +0100
+++ /var/tmp/diff_new_pack.ecxeue/_new  2012-03-11 20:04:34.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kiwi-instsource-plugins-openSUSE-12-1
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,15 +20,18 @@
 
 Name:   kiwi-instsource-plugins-openSUSE-12-1
 Summary:OpenSuSE - KIWI Image System
-Version:0.9
-Release:3
-Group:  System/Management
 License:GPL-2.0
+Group:  System/Management
+Version:0.9
+Release:0
 Source: %{name}.tar.bz2
 Patch0: kiwi-instsource-plugins-openSUSE-12-1.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Requires:   extract-appdata-icons
 Requires:   inst-source-utils = 2011.5.5
-Requires:   kiwi-instsource package-translations openSUSE-EULAs
+Requires:   kiwi-instsource
+Requires:   openSUSE-EULAs
+Requires:   package-translations
 Supplements:kiwi-instsource
 BuildArch:  noarch
 
@@ -51,9 +54,6 @@
 make buildroot=$RPM_BUILD_ROOT \
   version=12.1 install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
 %dir %{_datadir}/kiwi

++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.ecxeue/_old  2012-03-11 20:04:34.0 +0100
+++ /var/tmp/diff_new_pack.ecxeue/_new  2012-03-11 20:04:34.0 +0100
@@ -1,7 +1,7 @@
 Index: KIWILiveTreePlugin.pm
 ===
 KIWILiveTreePlugin.pm.orig 2011-05-23 15:59:57.0 +0200
-+++ KIWILiveTreePlugin.pm  2011-10-28 10:57:04.815647298 +0200
+--- KIWILiveTreePlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100
 KIWILiveTreePlugin.pm  2012-03-05 13:56:10.640598808 +0100
 @@ -109,16 +109,6 @@ sub new
  }
  # /constructor
@@ -59,9 +59,9 @@
  }
 Index: KIWIDescrPlugin.pm
 ===
 KIWIDescrPlugin.pm.orig2011-05-23 15:59:57.0 +0200
-+++ KIWIDescrPlugin.pm 2011-10-28 10:58:49.035658734 +0200
-@@ -230,6 +230,13 @@ sub executeDir
+--- KIWIDescrPlugin.pm.orig2012-03-05 13:56:09.045673886 +0100
 KIWIDescrPlugin.pm 2012-03-10 15:14:03.808988785 +0100
+@@ -230,6 +230,25 @@ sub executeDir
 return 1;
   }
}
@@ -72,6 +72,18 @@
 + $this-logMsg(E, Calling translate_packages.pl en  
failed:\n$data\n);
 + return 1;
 +  }
++
++  if (-x /usr/bin/extract-appdata-icons  -s $targetdir/appdata.xml) {
++ my $cmd = /usr/bin/extract-appdata-icons $targetdir/appdata.xml 
$targetdir;
++ my $data = qx( $cmd );
++ if($?  8) {
++   $this-logMsg(E, Calling extract-appdata-icons 
$targetdir/appdata.xml $targetdir failed:\n$data\n);
++   return 1;
++ }
++ if($this-{m_compress} =~ m{yes}i) {
++ system(gzip, --rsyncable, $targetdir/appdata.xml);
++ }
++  }
  
if($this-{m_compress} =~ m{yes}i) {
foreach my $pfile(glob($targetdir/packages*)) {

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2011-12-06 18:21:49

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:




Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.7A8tuh/_old  2011-12-06 18:38:01.0 +0100
+++ /var/tmp/diff_new_pack.7A8tuh/_new  2011-12-06 18:38:01.0 +0100
@@ -23,7 +23,7 @@
 Version:0.9
 Release:3
 Group:  System/Management
-License:GPLv2
+License:GPL-2.0
 Source: %{name}.tar.bz2
 Patch0: kiwi-instsource-plugins-openSUSE-12-1.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2011-10-28 Thread h_root
Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2011-10-28 19:28:04

Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and  /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)


Package is kiwi-instsource-plugins-openSUSE-12-1, Maintainer is 

Changes:

--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
  2011-09-23 02:06:53.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2011-10-28 19:55:29.0 +0200
@@ -1,0 +2,6 @@
+Fri Oct 28 08:59:34 UTC 2011 - co...@suse.com
+
+- call package_translate one more time for english to insert english
+  eulas
+
+---



Other differences:
--
++ kiwi-instsource-plugins-openSUSE-12-1.spec ++
--- /var/tmp/diff_new_pack.PS05eE/_old  2011-10-28 19:55:50.0 +0200
+++ /var/tmp/diff_new_pack.PS05eE/_new  2011-10-28 19:55:50.0 +0200
@@ -28,7 +28,7 @@
 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
+Requires:   kiwi-instsource package-translations openSUSE-EULAs
 Supplements:kiwi-instsource
 BuildArch:  noarch
 

++ kiwi-instsource-plugins-openSUSE-12-1.diff ++
--- /var/tmp/diff_new_pack.PS05eE/_old  2011-10-28 19:55:50.0 +0200
+++ /var/tmp/diff_new_pack.PS05eE/_new  2011-10-28 19:55:50.0 +0200
@@ -1,7 +1,7 @@
 Index: KIWILiveTreePlugin.pm
 ===
 --- KIWILiveTreePlugin.pm.orig 2011-05-23 15:59:57.0 +0200
-+++ KIWILiveTreePlugin.pm  2011-06-18 17:51:03.046464565 +0200
 KIWILiveTreePlugin.pm  2011-10-28 10:57:04.815647298 +0200
 @@ -109,16 +109,6 @@ sub new
  }
  # /constructor
@@ -57,3 +57,21 @@
  
return $retval;
  }
+Index: KIWIDescrPlugin.pm
+===
+--- KIWIDescrPlugin.pm.orig2011-05-23 15:59:57.0 +0200
 KIWIDescrPlugin.pm 2011-10-28 10:58:49.035658734 +0200
+@@ -230,6 +230,13 @@ sub executeDir
+return 1;
+  }
+   }
++  # one more time for english to insert possible EULAs
++  my $cmd = /usr/bin/translate_packages.pl en  $targetdir/packages.en  
$targetdir/packages.en.new  mv $targetdir/packages.en.new 
$targetdir/packages.en;
++  my $data = qx( $cmd );
++  if($?  8) {
++ $this-logMsg(E, Calling translate_packages.pl en  
failed:\n$data\n);
++ return 1;
++  }
+ 
+   if($this-{m_compress} =~ m{yes}i) {
+   foreach my $pfile(glob($targetdir/packages*)) {

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory

2011-06-20 Thread h_root

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.0 +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.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.i805Kv/_new  2011-06-20 15:58:21.0 +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.0 +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