Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-02-14 13:56:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkdud"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2015-02-11
16:46:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-02-14
13:56:33.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 13 12:06:10 CET 2015 - snw...@suse.com
+
+- added --prefix option to let users choose the directory prefix
+- 1.16
+
+-------------------------------------------------------------------
Old:
----
mkdud-1.15.tar.xz
New:
----
mkdud-1.16.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkdud.spec ++++++
--- /var/tmp/diff_new_pack.X7Kbni/_old 2015-02-14 13:56:34.000000000 +0100
+++ /var/tmp/diff_new_pack.X7Kbni/_new 2015-02-14 13:56:34.000000000 +0100
@@ -23,7 +23,7 @@
Summary: Create driver update from rpms
License: GPL-3.0+
Group: Hardware/Other
-Version: 1.15
+Version: 1.16
Release: 0
Source: %{name}-%{version}.tar.xz
Url: https://github.com/wfeldt/mkdud
++++++ mkdud-1.15.tar.xz -> mkdud-1.16.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.15/README new/mkdud-1.16/README
--- old/mkdud-1.15/README 2015-02-11 11:28:25.000000000 +0100
+++ new/mkdud-1.16/README 2015-02-13 12:01:53.000000000 +0100
@@ -121,7 +121,26 @@
'dud' boot option in this case.
-5. Signature
+5. DUD directory structure
+--------------------------
+
+Please read section 2.1 [Directory structure] in the Update-Media-HOWTO above
first.
+
+Normally, mkdud ensures a correct directory layout. But sometimes you may
+want to specify a directory prefix yourself.
+
+For example, imagine you want to include your driver update directly into
+the initrd. You can do this simply by appending an (unsigned) driver update
+to the initrd. But when someone else tries this again, they will get into
+trouble as the directories are just merged. To avoid this, choose a
+directory prefix that's unlikely to conflict with others using the
+'--prefix' option.
+
+If this sounds a bit complicated just try the '--prefix' option and look at
+the unpacked driver update.
+
+
+6. Signature
------------
When downloading a driver update the installer will verify the integrity of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.15/VERSION new/mkdud-1.16/VERSION
--- old/mkdud-1.15/VERSION 2015-02-11 11:28:25.000000000 +0100
+++ new/mkdud-1.16/VERSION 2015-02-13 12:01:53.000000000 +0100
@@ -1 +1 @@
-1.15
+1.16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.15/changelog new/mkdud-1.16/changelog
--- old/mkdud-1.15/changelog 2015-02-11 11:28:25.000000000 +0100
+++ new/mkdud-1.16/changelog 2015-02-13 12:01:53.000000000 +0100
@@ -1,3 +1,6 @@
+2015-02-13: 1.16
+ - added --prefix option to let users choose the directory prefix
+
2015-02-11: 1.15
- create and read directly (non-detached) signed updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.15/mkdud new/mkdud-1.16/mkdud
--- old/mkdud-1.15/mkdud 2015-02-11 11:28:25.000000000 +0100
+++ new/mkdud-1.16/mkdud 2015-02-13 12:01:53.000000000 +0100
@@ -132,6 +132,7 @@
my $opt_sign;
my $opt_sign_direct;
my $opt_sign_key;
+my $opt_dud_prefix;
# global variables
my $dud;
@@ -174,6 +175,7 @@
'sign-key=s' => \$opt_sign_key,
'force' => \$opt_force,
'format=s' => \$opt_format,
+ 'prefix=i' => \$opt_dud_prefix,
'save-temp' => \$opt_save_temp,
'version' => sub { print "$VERSION\n"; exit 0 },
'help' => sub { usage 0 },
@@ -332,7 +334,8 @@
If SCRIPT has the special name ServicePackN (N
= 1, 2, ...), a
script that checks for service pack N is
_generated_ and added.
Option can be repeated to specify several
conditions.
- -p, --prio NUM Set repository priority to NUM (default: 50).
+ -p, --prio NUM Set repository priority to NUM; lower NUM
means higher priority
+ (default: 50).
-n, --name NAME Set driver update name. If you update packages
or modules
a default name is generated based on the
package and module
versions.
@@ -361,6 +364,7 @@
--format FORMAT Specify archive format for DUD.
FORMAT=(cpio|tar)[.(gz|xz)].
Default FORMAT is cpio.gz (gzip compressed
cpio archive).
Note: don't change the default. See README.
+ --prefix NUM First directory prefix of driver update. See
README.
--sign Sign the driver update.
--detached-sign Sign the driver update. This creates a
detached signature.
--sign-key KEY_FILE Use this key for signing. Alternatively, use
the
@@ -1255,12 +1259,13 @@
return undef;
}
- my $tmp_src = @duds == 1 ? $duds[0]{file} : $tmp_new;
+ my $tmp_src = (@duds == 1 && !defined($opt_dud_prefix)) ? $duds[0]{file} :
$tmp_new;
- if(@duds > 1) {
- my $dud_cnt = 0;
+ if(@duds > 1 || defined($opt_dud_prefix)) {
+ my $dud_cnt = defined($opt_dud_prefix) ? $opt_dud_prefix : 1;
+ $dud_cnt = 1 if $dud_cnt < 0;
for my $d (@duds) {
- my $n = sprintf "%s/%02d", $tmp_new, ++$dud_cnt;
+ my $n = sprintf "%s/%02d", $tmp_new, $dud_cnt++;
die "$n: $!\n" unless mkdir $n;
die "$d->{file}/linux -> $n/linux: $!" unless rename "$d->{file}/linux",
"$n/linux";
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
