Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Factory checked in at 2017-11-04 19:28:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and /work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Sat Nov 4 19:28:35 2017 rev:11 rq:538318 version:1.0~pre.1509619089.24f326a
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2017-09-25 13:52:46.658878118 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new/product-builder-plugin-Tumbleweed.changes
2017-11-04 19:28:35.894635868 +0100
@@ -1,0 +2,7 @@
+Thu Nov 2 09:43:02 UTC 2017 - adr...@suse.de
+
+- download instsys again on NET install media. Follow linuxrc
+ default now.
+- fix cleanup code for mini media
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.0~pre.1505901051.22e279d.obscpio
New:
----
product-builder-plugins-1.0~pre.1509619089.24f326a.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.T8ELLS/_old 2017-11-04 19:28:38.058556799 +0100
+++ /var/tmp/diff_new_pack.T8ELLS/_new 2017-11-04 19:28:38.062556654 +0100
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0+
Group: System/Management
-Version: 1.0~pre.1505901051.22e279d
+Version: 1.0~pre.1509619089.24f326a
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
++++++ product-builder-plugins-1.0~pre.1505901051.22e279d.obscpio ->
product-builder-plugins-1.0~pre.1509619089.24f326a.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.0~pre.1505901051.22e279d/KIWIMiniIsoPlugin.pm
new/product-builder-plugins-1.0~pre.1509619089.24f326a/KIWIMiniIsoPlugin.pm
--- old/product-builder-plugins-1.0~pre.1505901051.22e279d/KIWIMiniIsoPlugin.pm
2017-06-23 10:57:55.000000000 +0200
+++ new/product-builder-plugins-1.0~pre.1509619089.24f326a/KIWIMiniIsoPlugin.pm
2017-11-02 11:38:09.000000000 +0100
@@ -129,9 +129,7 @@
sub { find_cb($this, '.*/root$', \@rootfiles) },
$this->handler()->collect()->basedir()
);
- if (@rootfiles) {
- $this->removeRepoData($rootfiles[0]);
- }
+ $this->removeRepoData();
my @isolxfiles;
find(
@@ -140,7 +138,7 @@
);
$this -> updateInitRDNET("./etc/linuxrc.d/10_repo",
"defaultrepo=$repoloc\n");
- $this -> updateInitRDNET("./etc/linuxrc.d/16_instsys",
"instsys=disk:boot/___INITRD_ARCH___/root\n");
+ $this -> updateInitRDNET("./etc/linuxrc.d/15_kexec", "kexec=1\n");
my @gfxbootfiles;
find(
@@ -164,17 +162,10 @@
sub removeRepoData {
my $this = shift;
- my $rootfile = shift;
+ my $basedir = $this->handler()->collect()->basedir();
- print STDERR "RF $rootfile\n";
- my $rootdir = dirname($rootfile);
- $this->logMsg("I", "removing files from <$rootdir>");
- foreach my $file (glob("$rootdir/*")) {
- if (-f $file && $file !~ m,/repodata$,) {
- $this->logMsg("I", "removing <$file>");
- unlink $file;
- }
- }
+ $this->logMsg("I", "removing repodata from <$basedir>");
+ system("find", $basedir, "-name", "repodata", "-a", "-type", "d", "-exec",
"rm", "-rv", "{}", ";");
return $this;
}
@@ -285,6 +276,11 @@
# hardcode for now
$zipper = "xz --check=crc32";
+ my ($cpio, $pad) = _makecpiohead($file, [0, 0, oct(644), 1, 0, 0, 0,
length($content), 0, 0, 0]);
+ $cpio .= $content;
+ $cpio .= $pad if $pad;
+ $cpio .= _makecpiohead();
+
my @initrdfiles;
find(
sub { find_cb($this, '.*/initrd$', \@initrdfiles) },
@@ -295,18 +291,6 @@
for my $initrd (@initrdfiles) {
$this -> logMsg("I", "updating $initrd");
-
- my $iarch = $initrd;
- $iarch =~ s/.*\/boot\///;
- $iarch =~ s/\/.*//;
- my $_content = $content;
- $_content =~ s/___INITRD_ARCH___/$iarch/g;
- $this -> logMsg("I", " set parameter: $_content");
- my ($cpio, $pad) = _makecpiohead($file, [0, 0, oct(644), 1, 0, 0, 0,
length($_content), 0, 0, 0]);
- $cpio .= $_content;
- $cpio .= $pad if $pad;
- $cpio .= _makecpiohead();
-
my $fh = FileHandle -> new();
if (! $fh -> open("|$zipper -c >> $initrd")) {
#if (! $fh -> open(">$initrd.append")) {
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.T8ELLS/_old 2017-11-04 19:28:38.198551684 +0100
+++ /var/tmp/diff_new_pack.T8ELLS/_new 2017-11-04 19:28:38.198551684 +0100
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.0~pre.1505901051.22e279d
-mtime: 1505901051
-commit: 22e279d94be5d253204b0ab5d6b14c24a72680d8
+version: 1.0~pre.1509619089.24f326a
+mtime: 1509619089
+commit: 24f326a05ba7527aafb371729c3f30b7625beae5
