commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2020-07-13 09:06:21
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.3060 (New)
Package is "mkdud"
Mon Jul 13 09:06:21 2020 rev:32 rq:819996 version:1.50
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2020-06-25
15:09:06.441681440 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new.3060/mkdud.changes2020-07-13
09:06:38.576260952 +0200
@@ -1,0 +2,8 @@
+Fri Jul 10 13:28:59 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#34
+- ensure DUD repos are removed at the end of the installation
+ (bsc#1173988)
+- 1.50
+
+
Old:
mkdud-1.49.tar.xz
New:
mkdud-1.50.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.Tq2Kh6/_old 2020-07-13 09:06:39.328262843 +0200
+++ /var/tmp/diff_new_pack.Tq2Kh6/_new 2020-07-13 09:06:39.328262843 +0200
@@ -30,7 +30,7 @@
Summary:Create driver update from rpms
License:GPL-3.0-or-later
Group: Hardware/Other
-Version:1.49
+Version:1.50
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
++ mkdud-1.49.tar.xz -> mkdud-1.50.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.49/VERSION new/mkdud-1.50/VERSION
--- old/mkdud-1.49/VERSION 2020-06-24 18:04:34.0 +0200
+++ new/mkdud-1.50/VERSION 2020-07-10 15:28:59.0 +0200
@@ -1 +1 @@
-1.49
+1.50
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.49/changelog new/mkdud-1.50/changelog
--- old/mkdud-1.49/changelog2020-06-24 18:04:34.0 +0200
+++ new/mkdud-1.50/changelog2020-07-10 15:28:59.0 +0200
@@ -1,3 +1,8 @@
+2020-07-10:1.50
+ - merge gh#openSUSE/mkdud#34
+ - ensure DUD repos are removed at the end of the installation
+ (bsc#1173988)
+
2020-06-24:1.49
- merge gh#openSUSE/mkdud#33
- add --sign-key-id option to allow specifying a gpg signing key by id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.49/mkdud new/mkdud-1.50/mkdud
--- old/mkdud-1.49/mkdud2020-06-24 18:04:34.0 +0200
+++ new/mkdud-1.50/mkdud2020-07-10 15:28:59.0 +0200
@@ -1207,9 +1207,9 @@
dir=${0%/*/*}
dir=${dir#/*/}
-repo="baseurl=dir:///$dir/repo"
+repo="baseurl=dir:(//)?/$dir/repo"
-for i in `grep -l $repo /etc/zypp/repos.d/*` ; do
+for i in `grep -El $repo /etc/zypp/repos.d/*` ; do
[ -f "$i" ] && rm "$i"
done
= = = = = = = =
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2020-06-25 15:08:06
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.3060 (New)
Package is "mkdud"
Thu Jun 25 15:08:06 2020 rev:31 rq:816867 version:1.49
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2020-03-05
23:21:20.297279770 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new.3060/mkdud.changes2020-06-25
15:09:06.441681440 +0200
@@ -1,0 +2,7 @@
+Wed Jun 24 16:04:34 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#33
+- add --sign-key-id option to allow specifying a gpg signing key by id
+- 1.49
+
+
Old:
mkdud-1.48.tar.xz
New:
mkdud-1.49.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.dTQM1T/_old 2020-06-25 15:09:08.881689097 +0200
+++ /var/tmp/diff_new_pack.dTQM1T/_new 2020-06-25 15:09:08.881689097 +0200
@@ -30,7 +30,7 @@
Summary:Create driver update from rpms
License:GPL-3.0-or-later
Group: Hardware/Other
-Version:1.48
+Version:1.49
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
++ mkdud-1.48.tar.xz -> mkdud-1.49.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.48/VERSION new/mkdud-1.49/VERSION
--- old/mkdud-1.48/VERSION 2020-03-04 15:13:49.0 +0100
+++ new/mkdud-1.49/VERSION 2020-06-24 18:04:34.0 +0200
@@ -1 +1 @@
-1.48
+1.49
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.48/changelog new/mkdud-1.49/changelog
--- old/mkdud-1.48/changelog2020-03-04 15:13:49.0 +0100
+++ new/mkdud-1.49/changelog2020-06-24 18:04:34.0 +0200
@@ -1,3 +1,7 @@
+2020-06-24:1.49
+ - merge gh#openSUSE/mkdud#33
+ - add --sign-key-id option to allow specifying a gpg signing key by id
+
2020-03-04:1.48
- merge gh#openSUSE/mkdud#32
- updated troubleshooting section in HOWTO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.48/mkdud new/mkdud-1.49/mkdud
--- old/mkdud-1.48/mkdud2020-03-04 15:13:49.0 +0100
+++ new/mkdud-1.49/mkdud2020-06-24 18:04:34.0 +0200
@@ -138,6 +138,7 @@
my $opt_sign;
my $opt_sign_direct;
my $opt_sign_key;
+my $opt_sign_key_id;
my $opt_dud_prefix;
my $opt_vendor;
my $opt_preparer;
@@ -196,6 +197,7 @@
'detached-sign'=> \$opt_sign,
'sign' => sub { $opt_sign = 1; $opt_sign_direct = 1 },
'sign-key=s' => \$opt_sign_key,
+ 'sign-key-id=s'=> \$opt_sign_key_id,
'obs-keys' => \$opt_obs_keys,
'force'=> sub { $opt_fix_yast = $opt_fix_usr_src = $opt_fix_dist
= $opt_fix_adddir = 0 },
'fix-yast!'=> \$opt_fix_yast,
@@ -241,6 +243,7 @@
}
$opt_sign_key ||= $config{'sign-key'};
+$opt_sign_key_id ||= $config{'sign-key-id'};
if($opt_obs_keys) {
my $f;
@@ -413,6 +416,7 @@
--signSign the driver update.
--detached-sign Sign the driver update creating a detached
signature.
--sign-key KEY_FILE Use this key for signing.
+ --sign-key-id KEY_ID Use this key id for signing (anything gpg
accepts).
--volume Set ISO volume id (if using format 'iso').
--vendor Set ISO publisher id (if using format 'iso').
--preparerSet ISO data preparer id (if using format
'iso').
@@ -2118,6 +2122,17 @@
{
return if !$opt_sign;
+ if($opt_sign_key_id) {
+$sign_key_ok = 1;
+$sign_key_id = $opt_sign_key_id;
+$sign_key_dir = "$ENV{HOME}/.gnupg";
+die "$sign_key_dir: no such gpg directory\n" unless -d $sign_key_dir;
+
+print "using signing key, keyid = $sign_key_id\n";
+
+return;
+ }
+
die "no sign key specified\n" if !$opt_sign_key;
my $key = $opt_sign_key;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.48/mkdud_man.adoc
new/mkdud-1.49/mkdud_man.adoc
--- old/mkdud-1.48/mkdud_man.adoc 2020-03-04 15:13:49.0 +0100
+++ new/mkdud-1.49/mkdud_man.adoc 2020-06-24 18:04:34.0 +0200
@@ -145,6 +145,12 @@
*--sign-key*=_KEY_FILE_::
Use this key for signing. Alternatively, use the `sign-key` entry in
`~/.mkdudrc`.
+*--sign-key-id*=_KEY_ID_::
+Use this key id for signing (anything gpg accepts).
+Alternatively, use the `sign-key-id` entry in `~/.mkdudrc`. +
+If both *--sign-key* and
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2020-03-05 23:21:09
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.26092 (New)
Package is "mkdud"
Thu Mar 5 23:21:09 2020 rev:30 rq:781547 version:1.48
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2019-09-25
08:20:50.630445985 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new.26092/mkdud.changes 2020-03-05
23:21:20.297279770 +0100
@@ -1,0 +2,7 @@
+Wed Mar 4 14:13:49 UTC 2020 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#32
+- updated troubleshooting section in HOWTO
+- 1.48
+
+
Old:
mkdud-1.47.tar.xz
New:
mkdud-1.48.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.PqN8ut/_old 2020-03-05 23:21:22.797281146 +0100
+++ /var/tmp/diff_new_pack.PqN8ut/_new 2020-03-05 23:21:22.797281146 +0100
@@ -30,7 +30,7 @@
Summary:Create driver update from rpms
License:GPL-3.0-or-later
Group: Hardware/Other
-Version:1.47
+Version:1.48
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
++ mkdud-1.47.tar.xz -> mkdud-1.48.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.47/HOWTO.md new/mkdud-1.48/HOWTO.md
--- old/mkdud-1.47/HOWTO.md 2019-09-23 15:12:48.0 +0200
+++ new/mkdud-1.48/HOWTO.md 2020-03-04 15:13:49.0 +0100
@@ -181,17 +181,303 @@
```
-## Debug problems
+## Troubleshooting
-Sometimes things just don't work as expected. Here's what to do:
+Sometimes things just don't work as expected. Here is a detailed guide that
walks you through the entire update process
+and shows what exactly to expect.
-- use `mkdud --show foo.dud` to get an overview of what's inside the driver
update
-- make sure the product specified with `--dist` matches the intended product
+For illustrating purposes a driver update for
[libparted0](https://software.opensuse.org/package/libparted0)
+(the library containing the core functionality of
[parted](https://software.opensuse.org/package/parted)) is used.
-If you see the driver update loaded but it's apparently not applied, do this:
+The latest version of libpart0 is (at the time I'm writing this) contained in
package `libparted0-3.3-1.1.x86_64.rpm`.
-- start the installation with the `startshell=1` boot option; this will open a
shell instead of starting the installer (the regular
-workflow continues when you exit this shell)
-- there must be an `/update` directory with subdirectories for each driver
update; if it's missing, your driver update has not been recognized
-- check the correct product: the `UpdateDir` entry in `/linuxrc.config`
contains the expected string
-- have a look at `/var/log/linuxrc.log` to see what linuxrc did with the
driver update so far
+One last note before we start:
+
+- 'installation system' refers to the small system the installer runs in
during the installation
+- 'target system' refers to the system that gets finally installed
+
+### Creating the driver update
+
+Let's make a driver update for Tumbleweed of our package:
+
+```sh
+> mkdud --create foo.dud --dist tw libparted0-3.3-1.1.x86_64.rpm
+=== Update #1 ===
+ [openSUSE Tumbleweed (x86_64)]
+Name:
+ libparted0-3.3-1.1.x86_64 Wed Jan 15 15:33:15 2020
+ID:
+ c599d3ac-9bf7-48cb-b593-bd6612388049
+Packages:
+ libparted0-3.3-1.1.x86_64.rpm (Wed Jan 15 15:33:15 2020)
+ - install methods: instsys, repo, rpm (repo priority 50)
+Scripts:
+ update.pre, update.post2
+Installation System:
+ /usr/lib64/libparted-fs-resize.so.0.0.2
+ /usr/lib64/libparted.so.2.0.2
+```
+
+You can use `mkdud --show foo.dud` to get the same overview of what's inside
the driver update.
+
+It is important that the argument to `--dist` is the correct product. Driver
updates are always for a specific product.
+Use `--dist` several times to make an update that applies to more than one
product.
+
+`foo.dud` is a compressed CPIO archive. Looking inside shows this:
+
+```sh
+> zcat foo.dud | cpio -tv
+drwxr-xr-x 1 root root0 Mar 4 12:12 .
+drwxr-xr-x 1 root root0 Mar 4 12:12 linux
+drwxr-xr-x 1 root root0 Mar 4 12:12 linux/suse
+drwxr-xr-x 1 root root0 Mar 4 12:12 linux/suse/x86_64-tw
+-rw-r--r-- 1 root root 134 Mar 4 12:12
linux/suse/x86_64-tw/dud.config
+drwxr-xr-x 1 root root0 Mar 4 12:12
linux/suse/x86_64-tw/install
+-r--r--r--
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2019-09-25 08:20:48
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.7948 (New)
Package is "mkdud"
Wed Sep 25 08:20:48 2019 rev:29 rq:732741 version:1.47
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2019-04-05
12:06:36.362571790 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new.7948/mkdud.changes2019-09-25
08:20:50.630445985 +0200
@@ -1,0 +2,14 @@
+Mon Sep 23 13:12:48 UTC 2019 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#31
+- adjust spec file to build on SLE-11
+- 1.47
+
+
+Mon Sep 23 11:50:34 UTC 2019 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#28
+- start moving doc to asciidoc; add proper man page
+- 1.46
+
+
Old:
mkdud-1.45.tar.xz
New:
mkdud-1.47.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.BW0Ad5/_old 2019-09-25 08:20:51.046445927 +0200
+++ /var/tmp/diff_new_pack.BW0Ad5/_new 2019-09-25 08:20:51.046445927 +0200
@@ -18,11 +18,19 @@
Name: mkdud
BuildRequires: xz
+%if 0%?suse_version >= 1500 || 0%?sle_version >= 120400
+BuildRequires: rubygem(asciidoctor)
+%else
+BuildRequires: asciidoc
+%if 0%?suse_version >= 1310 || 0%?sle_version >= 12
+BuildRequires: libxslt-tools
+%endif
+%endif
Requires: gpg2
Summary:Create driver update from rpms
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: Hardware/Other
-Version:1.45
+Version:1.47
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
@@ -42,7 +50,8 @@
%build
%install
- make install DESTDIR=%{buildroot}
+ %make_install
+ install -D -m 644 mkdud.1 %{buildroot}%{_mandir}/man1/mkdud.1
%clean
rm -rf %{buildroot}
@@ -51,6 +60,12 @@
%defattr(-,root,root)
/usr/bin/mkdud
/usr/share/bash-completion
-%doc README.md COPYING
+%doc %{_mandir}/man1/mkdud.*
+%doc *.md
+%if %suse_version >= 1500
+%license COPYING
+%else
+%doc COPYING
+%endif
%changelog
++ mkdud-1.45.tar.xz -> mkdud-1.47.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.45/Makefile new/mkdud-1.47/Makefile
--- old/mkdud-1.45/Makefile 2019-04-04 15:04:44.0 +0200
+++ new/mkdud-1.47/Makefile 2019-09-23 15:12:48.0 +0200
@@ -18,13 +18,23 @@
changelog: $(GITDEPS)
$(GIT2LOG) --changelog changelog
-install:
+install: doc
@cp mkdud mkdud.tmp
@perl -pi -e 's/0\.0/$(VERSION)/ if /VERSION = /' mkdud.tmp
install -m 755 -D mkdud.tmp $(DESTDIR)$(BINDIR)/mkdud
install -m 644 -D bash_completion/mkdud $(DESTDIR)$(COMPLDIR)/mkdud
@rm -f mkdud.tmp
+doc:
+ @if [ -x /usr/bin/asciidoctor ] ; then \
+ asciidoctor -b manpage -a version=$(VERSION) mkdud_man.adoc ;\
+ else \
+ a2x -f manpage -a version=$(VERSION) mkdud_man.adoc ;\
+ fi
+# a2x -f docbook -a version=$(VERSION) mkdud_man.adoc
+# dblatex mkdud_man.xml
+
clean:
- @rm -rf *~ package changelog VERSION
+ @rm -rf *~ */*~ package changelog VERSION
+ @rm -f mkdud.1 mkdud_man.xml mkdud_man.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.45/README.md new/mkdud-1.47/README.md
--- old/mkdud-1.45/README.md2019-04-04 15:04:44.0 +0200
+++ new/mkdud-1.47/README.md2019-09-23 15:12:48.0 +0200
@@ -2,15 +2,20 @@
## About
-This is about driver updates. If you're not familiar with them, please look at
-http://ftp.suse.com/pub/people/hvogel/Update-Media-HOWTO/index.html and
-http://en.opensuse.org/SDB:Linuxrc#p_driverupdate first.
+This is about driver updates for openSUSE/SLES. If you're not familiar with
them, please look at
+- http://ftp.suse.com/pub/people/hvogel/Update-Media-HOWTO/index.html
+- http://en.opensuse.org/SDB:Linuxrc#p_driverupdate
`mkdud` is a tool that makes it easy to create driver updates for SUSE
distributions.
## Downloads
-Get the latest version from the [openSUSE Build
Service](https://software.opensuse.org/package/mkdud).
+Packages for openSUSE and SLES are built at the [openSUSE Build
Service](https://build.opensuse.org). You can grab
+
+- [official releases](https://software.opensuse.org/package/mkdud) or
+
+- [latest stable
versions](https://software.opensuse.org/download/package?project=home:snwint:ports=mkdud)
+ from my
[ports](https://build.opensuse.org/package/show/home:snwint:ports/mkdud)
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2019-04-05 12:04:58
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.3908 (New)
Package is "mkdud"
Fri Apr 5 12:04:58 2019 rev:28 rq:691525 version:1.45
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2019-01-10
15:21:16.998458338 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new.3908/mkdud.changes2019-04-05
12:06:36.362571790 +0200
@@ -1,0 +2,7 @@
+Thu Apr 4 13:04:44 UTC 2019 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#30
+- map Kubic to Tumbleweed
+- 1.45
+
+
Old:
mkdud-1.44.tar.xz
New:
mkdud-1.45.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.z5zwrU/_old 2019-04-05 12:06:37.030572137 +0200
+++ /var/tmp/diff_new_pack.z5zwrU/_new 2019-04-05 12:06:37.034572138 +0200
@@ -22,7 +22,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.44
+Version:1.45
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
++ mkdud-1.44.tar.xz -> mkdud-1.45.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.44/VERSION new/mkdud-1.45/VERSION
--- old/mkdud-1.44/VERSION 2019-01-08 10:39:11.0 +0100
+++ new/mkdud-1.45/VERSION 2019-04-04 15:04:44.0 +0200
@@ -1 +1 @@
-1.44
+1.45
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.44/changelog new/mkdud-1.45/changelog
--- old/mkdud-1.44/changelog2019-01-08 10:39:11.0 +0100
+++ new/mkdud-1.45/changelog2019-04-04 15:04:44.0 +0200
@@ -1,3 +1,7 @@
+2019-04-04:1.45
+ - merge gh#openSUSE/mkdud#30
+ - map Kubic to Tumbleweed
+
2019-01-08:1.44
- merge gh#openSUSE/mkdud#27
- fix architecture auto-detection for elf binaries and libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.44/mkdud new/mkdud-1.45/mkdud
--- old/mkdud-1.44/mkdud2019-01-08 10:39:11.0 +0100
+++ new/mkdud-1.45/mkdud2019-04-04 15:04:44.0 +0200
@@ -290,7 +290,8 @@
my %d;
@dists = @opt_dist;
map { tr/-//d } @dists;
-map { s/^(tumbleweed|tw).*/tw/g } @dists;
+# kubic is part of tumbleweed
+map { s/^(tumbleweed|tw|kubic).*/tw/g } @dists;
# map 'casp' to the new 'caasp'
map { s/^casp(\d)/caasp$1/ } @dists;
# CaaSP should be aligned with the respective SLES
@@ -398,9 +399,9 @@
find a hint in SOURCES either, an update for
all supported
architectures is created.
-d, --dist DIST Specify the product the DUD is for. Possible
values include:
-13.2, sle12, leap42.3, kubic1.0, caasp1.0, tw
standing for
-openSUSE 13.2, SLE12, Leap 42.3, Kubic 1.0,
CaaSP 1.0,
-Tumbleweed, respectively.
+13.2, sle12, leap42.3, caasp1.0, tw standing
for
+openSUSE 13.2, SLE12, Leap 42.3, CaaSP 1.0,
Tumbleweed,
+respectively.
Note that 'sle12' is a short hand for
specifying both
'sles12' and 'sled12'.
Note also that there are no separate names for
service packs.
@@ -542,7 +543,7 @@
- X.Y (e.g. 13.2) = openSUSE X.Y
- leapX.Y (e.g. leap42.3) = openSUSE Leap X.Y
-- kubicX.Y (e.g. kubic1.0) = openSUSE Kubic X.Y
+- (obsolete) kubicX.Y (e.g. kubic1.0) = openSUSE Kubic X.Y
- tw = openSUSE Tumbleweed
- sleX (e.g. sle12) = SUSE Linux Enterprise (Server + Desktop) X
- slesX (e.g. sles12) = SUSE Linux Enterprise Server X
@@ -563,6 +564,9 @@
- caasp3.0 = sles12 (-sp3)
- caasp4.0 = sles15
+ Kubic is based on Tumbleweed. For compatibility, '--dist kubic...' variants
are still
+ supported but will be mapped to Tumbleweed. Please use '--dist tw' directly.
+
Driver updates built only for SLE12 will implicitly also work with
CaaSP3.0; those built only for SLE15 will also work with CaaSP4.0. But
this is not true for CaaSP1.0 and CaaSP2.0.
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2019-01-10 15:20:57
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.28833 (New)
Package is "mkdud"
Thu Jan 10 15:20:57 2019 rev:27 rq:663616 version:1.44
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-12-21
08:22:33.893505622 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new.28833/mkdud.changes 2019-01-10
15:21:16.998458338 +0100
@@ -1,0 +2,7 @@
+Tue Jan 8 09:39:11 UTC 2019 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#27
+- fix architecture auto-detection for elf binaries and libraries
+- 1.44
+
+
Old:
mkdud-1.43.tar.xz
New:
mkdud-1.44.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.MiGiL5/_old 2019-01-10 15:21:17.622457691 +0100
+++ /var/tmp/diff_new_pack.MiGiL5/_new 2019-01-10 15:21:17.622457691 +0100
@@ -22,7 +22,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.43
+Version:1.44
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
++ mkdud-1.43.tar.xz -> mkdud-1.44.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.43/VERSION new/mkdud-1.44/VERSION
--- old/mkdud-1.43/VERSION 2018-12-20 12:00:46.0 +0100
+++ new/mkdud-1.44/VERSION 2019-01-08 10:39:11.0 +0100
@@ -1 +1 @@
-1.43
+1.44
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.43/changelog new/mkdud-1.44/changelog
--- old/mkdud-1.43/changelog2018-12-20 12:00:46.0 +0100
+++ new/mkdud-1.44/changelog2019-01-08 10:39:11.0 +0100
@@ -1,3 +1,7 @@
+2019-01-08:1.44
+ - merge gh#openSUSE/mkdud#27
+ - fix architecture auto-detection for elf binaries and libraries
+
2018-12-20:1.43
- merge gh#openSUSE/mkdud#26
- fix building on old distros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.43/mkdud new/mkdud-1.44/mkdud
--- old/mkdud-1.43/mkdud2018-12-20 12:00:46.0 +0100
+++ new/mkdud-1.44/mkdud2019-01-08 10:39:11.0 +0100
@@ -658,15 +658,30 @@
#
sub get_file_arch
{
- local $_;
+ my $file = $_[0];
- for (`objdump -f $_[0] 2>/dev/null`) {
-if(/^architecture:\s*(\S+)/) {
- my $ar = $1;
- $ar =~ s/^.*:|,$//g;
- $ar = "i386" if $ar =~ /^i.86$/;
- $ar =~ tr/-/_/;
- return $ar if $ar ne "";
+ # Use objdump's 'file format' to determine architecture tag.
+ # Note that objdump's 'architecture' entry does not differentiate between
+ # 'ppc64' and 'ppc64le'.
+ my $arch_map = {
+'elf32-i386' => 'i386',
+'elf32-littlearm' => 'armv7hl',# same for 'armv6hl'
+'elf32-powerpc' => 'ppc',
+'elf32-s390' => 's390',
+'elf64-ia64-little' => 'ia64',
+'elf64-littleaarch64' => 'aarch64',
+'elf64-littleriscv' => 'riscv64',
+'elf64-powerpc' => 'ppc64',
+'elf64-powerpcle' => 'ppc64le',
+'elf64-s390' => 's390x',
+'elf64-x86-64' => 'x86_64',
+ };
+
+ for (`objdump -f $file 2>/dev/null`) {
+if(/ file format (\S+)$/) {
+ my $ar = $arch_map->{$1};
+ die "$file: unsupported elf arch \"$1\"\n" if !$ar;
+ return $ar;
}
}
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-12-21 08:22:30
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.28833 (New)
Package is "mkdud"
Fri Dec 21 08:22:30 2018 rev:26 rq:660261 version:1.43
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-12-12
17:29:37.390790385 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new.28833/mkdud.changes 2018-12-21
08:22:33.893505622 +0100
@@ -1,0 +2,21 @@
+Thu Dec 20 11:00:46 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#26
+- fix building on old distros
+- 1.43
+
+
+Thu Dec 20 10:27:23 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#25
+- fix package build
+- 1.42
+
+
+Thu Dec 20 10:05:17 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#24
+- Add bash completion
+- 1.41
+
+
Old:
mkdud-1.40.tar.xz
New:
mkdud-1.43.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.vzkwyZ/_old 2018-12-21 08:22:34.401505147 +0100
+++ /var/tmp/diff_new_pack.vzkwyZ/_new 2018-12-21 08:22:34.405505143 +0100
@@ -22,7 +22,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.40
+Version:1.43
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/openSUSE/mkdud
@@ -50,6 +50,7 @@
%files
%defattr(-,root,root)
/usr/bin/mkdud
+/usr/share/bash-completion
%doc README.md COPYING
%changelog
++ mkdud-1.40.tar.xz -> mkdud-1.43.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.40/Makefile new/mkdud-1.43/Makefile
--- old/mkdud-1.40/Makefile 2018-12-11 16:16:47.0 +0100
+++ new/mkdud-1.43/Makefile 2018-12-20 12:00:46.0 +0100
@@ -4,6 +4,7 @@
BRANCH := $(shell [ -d .git ] && git branch | perl -ne 'print $$_ if
s/^\*\s*//')
PREFIX := mkdud-$(VERSION)
BINDIR = /usr/bin
+COMPLDIR = /usr/share/bash-completion/completions
all:archive
@@ -21,6 +22,7 @@
@cp mkdud mkdud.tmp
@perl -pi -e 's/0\.0/$(VERSION)/ if /VERSION = /' mkdud.tmp
install -m 755 -D mkdud.tmp $(DESTDIR)$(BINDIR)/mkdud
+ install -m 644 -D bash_completion/mkdud $(DESTDIR)$(COMPLDIR)/mkdud
@rm -f mkdud.tmp
clean:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.40/VERSION new/mkdud-1.43/VERSION
--- old/mkdud-1.40/VERSION 2018-12-11 16:16:47.0 +0100
+++ new/mkdud-1.43/VERSION 2018-12-20 12:00:46.0 +0100
@@ -1 +1 @@
-1.40
+1.43
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.40/bash_completion/mkdud
new/mkdud-1.43/bash_completion/mkdud
--- old/mkdud-1.40/bash_completion/mkdud1970-01-01 01:00:00.0
+0100
+++ new/mkdud-1.43/bash_completion/mkdud2018-12-20 12:00:46.0
+0100
@@ -0,0 +1,131 @@
+# bash completion for mkdud -*- shell-script -*-
+
+# complete options, directories, and files in directories
+
+_completeMkdud()
+{
+local mode="general"
+local g_options='--version --help -s --show -c --create'
+local c_options='--save-temp -a --arch -d --dist --condition
+-p --prio -n --name -x --exec -i --install --config
+--no-docs --keep-docs --force --no-fix-yast --no-fix-dist
+--no-fix-usr-src --no-fix-adddir --format --prefix
+--sign --detached-sign --sign-key --volume --vendor
+--preparer --application --obs-keys'
+local dists='sle11 sle12 sle15 leap42.3 leap15.0 leap15.1 tw
+caasp1.0 caasp2.0 caasp3.0 caasp4.0'
+local sps='ServicePack0 ServicePack1 ServicePack2 ServicePack3
ServicePack4'
+
+local cur prev words cword split
+_init_completion -s || return 0
+
+# mkdud only takes options, tabbing after command name adds a single dash
+[[ $cword -eq 1 && -z "$cur" ]] &&
+{
+compopt -o nospace
+COMPREPLY=( "-" )
+return 0
+}
+
+COMPREPLY=()
+case $prev in
+--help|--version)
+return 0
+;;
+esac
+
+local args i
+
+# find which mode to use and how many real args used so far
+for (( i=1; i < cword; i++ )); do
+case ${words[i]} in
+-c|--create)
+mode="create"
+args=$(($cword - i))
+break
+
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-12-12 17:29:36
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new.28833 (New)
Package is "mkdud"
Wed Dec 12 17:29:36 2018 rev:25 rq:657244 version:1.40
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-11-18
23:30:55.317573011 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new.28833/mkdud.changes 2018-12-12
17:29:37.390790385 +0100
@@ -1,0 +2,16 @@
+Tue Dec 11 15:16:47 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#23
+- move spec file into obs directory
+- 1.40
+
+
+Tue Dec 11 14:38:08 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#22
+- fix reading oscrc (gh#openSUSE/mkdud#19)
+- update git2log script
+- add package spec file
+- 1.39
+
+
Old:
mkdud-1.38.tar.xz
New:
mkdud-1.40.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.uRDAtw/_old 2018-12-12 17:29:38.434789064 +0100
+++ /var/tmp/diff_new_pack.uRDAtw/_new 2018-12-12 17:29:38.438789059 +0100
@@ -1,8 +1,7 @@
#
# spec file for package mkdud
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2011 Steffen Winterfeldt
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,10 +22,10 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.38
+Version:1.40
Release:0
Source: %{name}-%{version}.tar.xz
-Url:https://github.com/wfeldt/mkdud
+Url:https://github.com/openSUSE/mkdud
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++ mkdud-1.38.tar.xz -> mkdud-1.40.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.38/VERSION new/mkdud-1.40/VERSION
--- old/mkdud-1.38/VERSION 2018-11-15 14:35:09.0 +0100
+++ new/mkdud-1.40/VERSION 2018-12-11 16:16:47.0 +0100
@@ -1 +1 @@
-1.38
+1.40
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.38/changelog new/mkdud-1.40/changelog
--- old/mkdud-1.38/changelog2018-11-15 14:35:09.0 +0100
+++ new/mkdud-1.40/changelog2018-12-11 16:16:47.0 +0100
@@ -1,3 +1,13 @@
+2018-12-11:1.40
+ - merge gh#openSUSE/mkdud#23
+ - move spec file into obs directory
+
+2018-12-11:1.39
+ - merge gh#openSUSE/mkdud#22
+ - fix reading oscrc (gh#openSUSE/mkdud#19)
+ - update git2log script
+ - add package spec file
+
2018-11-15:1.38
- merge gh#openSUSE/mkdud#21
- add HOWTO describing some typical uses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.38/git2log new/mkdud-1.40/git2log
--- old/mkdud-1.38/git2log 2018-11-15 14:35:09.0 +0100
+++ new/mkdud-1.40/git2log 2018-12-11 16:16:47.0 +0100
@@ -166,7 +166,7 @@
--version Write version number to FILE.
--branchWrite current branch to FILE.
--start START_TAG Start with tag START_TAG.
- --max N Write at most MAX long entries.
+ --max N Write at most N log entries.
--updateWrite changelog or version only if FILE is outdated.
--format FORMAT Write log using FORMAT. Supported FORMATs are 'internal'
(default) and 'obs'.
--width WIDTH Reformat log entries to be max WIDTH chars wide.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.38/mkdud new/mkdud-1.40/mkdud
--- old/mkdud-1.38/mkdud2018-11-15 14:35:09.0 +0100
+++ new/mkdud-1.40/mkdud2018-12-11 16:16:47.0 +0100
@@ -243,7 +243,8 @@
$opt_sign_key ||= $config{'sign-key'};
if($opt_obs_keys) {
- if(open(my $f, "$ENV{HOME}/.oscrc") || open(my $f,
"$ENV{HOME}/.config/osc/oscrc")) {
+ my $f;
+ if(open($f, "$ENV{HOME}/.oscrc") || open($f,
"$ENV{HOME}/.config/osc/oscrc")) {
while(<$f>) {
if(m#^\[(https?://([^/\]]+))#) {
$obs->{server}{$2} = $1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.38/obs/mkdud.spec
new/mkdud-1.40/obs/mkdud.spec
--- old/mkdud-1.38/obs/mkdud.spec 1970-01-01 01:00:00.0 +0100
+++ new/mkdud-1.40/obs/mkdud.spec
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-11-18 23:30:34
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Sun Nov 18 23:30:34 2018 rev:24 rq:649287 version:1.38
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-08-28
09:24:43.308879951 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-11-18
23:30:55.317573011 +0100
@@ -1,0 +2,16 @@
+Thu Nov 15 13:35:09 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#21
+- add HOWTO describing some typical uses
+- update git2log script
+- fix typo
+- 1.38
+
+
+Thu Nov 15 13:09:18 UTC 2018 - snw...@suse.de
+
+- merge gh#openSUSE/mkdud#20
+- put 'module.config' files into module directory
+- 1.37
+
+
Old:
mkdud-1.36.tar.xz
New:
mkdud-1.38.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.ORzmLR/_old 2018-11-18 23:30:55.849572369 +0100
+++ /var/tmp/diff_new_pack.ORzmLR/_new 2018-11-18 23:30:55.849572369 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.36
+Version:1.38
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.36.tar.xz -> mkdud-1.38.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.36/HOWTO.md new/mkdud-1.38/HOWTO.md
--- old/mkdud-1.36/HOWTO.md 1970-01-01 01:00:00.0 +0100
+++ new/mkdud-1.38/HOWTO.md 2018-11-15 14:35:09.0 +0100
@@ -0,0 +1,197 @@
+# Driver updates and you
+
+Driver updates provide a way to update kernel drivers and to influence the
+installation workflow **during the installation** of SUSE Linux.
+Kernel modules on the running system are updated with the usual update process
(of the kernel rpm).
+
+They are described in the [Update Media
Howto](http://ftp.suse.com/pub/people/hvogel/Update-Media-HOWTO/Update-Media-HOWTO.html)
+
+A driver update can be either an archive file or a directory (the unpacked
archive).
+
+
+## Use driver updates
+
+1. Use the `dud` boot option to pass a URL pointing to the driver update. For
example:
+
+- `dud=https://example.com/foo.dud`
+- `dud=disk:/foo.dud`
+
+2. Driver updates in special places are loaded automatically:
+
+- a file named `driverupdate` in the root directory of the installation
medium
+- a partition (e.g. on a USB stick) with file system label `OEMDRV`
containing an unpacked driver update
+- an unpacked driver update in the initrd of the installation medium
+
+Putting the driver update into the initrd provides a way to seamlessly
integrate driver updates into otherwise
+unchanged SUSE installation media. The `mksusecd` command has a dedicated
`--initrd` option to make this easy:
+
+```sh
+mksusecd --create new.iso --initrd foo.dud old.iso
+```
+
+
+## Create driver updates
+
+To create driver updates use `mkdud`. You have to specify at least the product
the driver update in intended for but it's
+also nice to give it a descriptive name:
+
+```sh
+mkdud --create foo.dud --dist leap15.0 --name "Support the new bar" bar.ko
+```
+
+Driver updates have to be properly signed to be accepted by the installer. If
they are not the user will
+see a dialog asking them for manual confirmation during the installation
process.
+
+The signature can be detached (e.g. `foo.dud.asc` for `foo.dud`) or
integrated. It's possible to use `mkdud --[detached-]sign` for this.
+But typically some external infrastructure for signing is used.
+
+An interesting alternative is to use signed rpms for driver updates. This way
you can get properly signed driver updates
+out of the [openSUSE Build Service](https://build.opensuse.org) for example.
+
+
+## Update and load kernel modules
+
+To create a driver update that updates kernel modules `bar.ko` and `foo.ko`
for product `xxx`:
+
+```sh
+mkdud --create foobar.dud --dist xxx bar.ko foo.ko
+```
+
+Note that you have to take module dependencies into account (they are not
resolved automatically).
+
+Sometimes modules must be loaded in a specific order. For this, add a file
`module.order` containing one module name (without `.ko`) per line:
+
+```sh
+echo -e "foo\nbar" >module.order
+mkdud --create foobar.dud --dist xxx bar.ko foo.ko module.order
+```
+
+If you have to prevent a (broken) kernel module to be loaded in the first
+place tell the user to add `brokenmodules=foo` to the
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-08-28 09:24:40
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Tue Aug 28 09:24:40 2018 rev:23 rq:631800 version:1.36
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-05-10
15:49:23.365286921 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-08-28
09:24:43.308879951 +0200
@@ -1,0 +2,7 @@
+Mon Aug 27 12:50:19 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#18
+- look also at ~/.config/osc/oscrc for osc config
+- 1.36
+
+
Old:
mkdud-1.35.tar.xz
New:
mkdud-1.36.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.y9I8FZ/_old 2018-08-28 09:24:43.756881349 +0200
+++ /var/tmp/diff_new_pack.y9I8FZ/_new 2018-08-28 09:24:43.756881349 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.35
+Version:1.36
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.35.tar.xz -> mkdud-1.36.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.35/VERSION new/mkdud-1.36/VERSION
--- old/mkdud-1.35/VERSION 2018-05-08 16:29:23.0 +0200
+++ new/mkdud-1.36/VERSION 2018-08-27 14:50:19.0 +0200
@@ -1 +1 @@
-1.35
+1.36
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.35/changelog new/mkdud-1.36/changelog
--- old/mkdud-1.35/changelog2018-05-08 16:29:23.0 +0200
+++ new/mkdud-1.36/changelog2018-08-27 14:50:19.0 +0200
@@ -1,3 +1,7 @@
+2018-08-27:1.36
+ - merge gh#openSUSE/mkdud#18
+ - look also at ~/.config/osc/oscrc for osc config
+
2018-05-08:1.35
- merge gh#openSUSE/mkdud#15
- add links to related blog articles
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.35/mkdud new/mkdud-1.36/mkdud
--- old/mkdud-1.35/mkdud2018-05-08 16:29:23.0 +0200
+++ new/mkdud-1.36/mkdud2018-08-27 14:50:19.0 +0200
@@ -243,7 +243,7 @@
$opt_sign_key ||= $config{'sign-key'};
if($opt_obs_keys) {
- if(open my $f, "$ENV{HOME}/.oscrc") {
+ if(open(my $f, "$ENV{HOME}/.oscrc") || open(my $f,
"$ENV{HOME}/.config/osc/oscrc")) {
while(<$f>) {
if(m#^\[(https?://([^/\]]+))#) {
$obs->{server}{$2} = $1;
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-05-10 15:49:15
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Thu May 10 15:49:15 2018 rev:22 rq:605373 version:1.35
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-04-27
16:09:15.222441779 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-05-10
15:49:23.365286921 +0200
@@ -1,0 +2,7 @@
+Tue May 8 14:29:23 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#15
+- add links to related blog articles
+- 1.35
+
+
Old:
mkdud-1.34.tar.xz
New:
mkdud-1.35.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.WUrYBX/_old 2018-05-10 15:49:24.309252323 +0200
+++ /var/tmp/diff_new_pack.WUrYBX/_new 2018-05-10 15:49:24.313252177 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.34
+Version:1.35
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.34.tar.xz -> mkdud-1.35.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.34/README.md new/mkdud-1.35/README.md
--- old/mkdud-1.34/README.md2018-04-26 16:23:20.0 +0200
+++ new/mkdud-1.35/README.md2018-05-08 16:29:23.0 +0200
@@ -12,6 +12,15 @@
Get the latest version from the [openSUSE Build
Service](https://software.opensuse.org/package/mkdud).
+## Blog
+
+See also my mini-series of articles around SUSE installation media and driver
updates that highlight specific use-cases:
+
+- [Update the update
process!](https://lizards.opensuse.org/2017/02/16/fun-things-to-do-with-driver-updates)
+- [But what if I need a new
kernel?](https://lizards.opensuse.org/2017/03/16/fun-things-to-do-with-driver-updates-2)
+- [And what if I want to **remove** some
files?](https://lizards.opensuse.org/2017/04/25/fun-things-to-do-with-driver-updates-3)
+- [Encrypted installation
media](https://lizards.opensuse.org/2017/11/17/encrypted-installation-media)
+
## Usage
### Updating RPMs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.34/VERSION new/mkdud-1.35/VERSION
--- old/mkdud-1.34/VERSION 2018-04-26 16:23:20.0 +0200
+++ new/mkdud-1.35/VERSION 2018-05-08 16:29:23.0 +0200
@@ -1 +1 @@
-1.34
+1.35
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.34/changelog new/mkdud-1.35/changelog
--- old/mkdud-1.34/changelog2018-04-26 16:23:20.0 +0200
+++ new/mkdud-1.35/changelog2018-05-08 16:29:23.0 +0200
@@ -1,3 +1,7 @@
+2018-05-08:1.35
+ - merge gh#openSUSE/mkdud#15
+ - add links to related blog articles
+
2018-04-26:1.34
- merge gh#openSUSE/mkdud#14
- fix Makefile and update git2log script
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-04-27 16:09:12
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Fri Apr 27 16:09:12 2018 rev:21 rq:601617 version:1.34
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-04-11
14:03:27.507621682 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-04-27
16:09:15.222441779 +0200
@@ -1,0 +2,14 @@
+Thu Apr 26 14:23:20 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#14
+- fix Makefile and update git2log script
+- 1.34
+
+
+Thu Apr 26 14:20:34 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#13
+- improve documentation
+- 1.33
+
+
Old:
mkdud-1.32.tar.xz
New:
mkdud-1.34.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.yauEMp/_old 2018-04-27 16:09:15.766421828 +0200
+++ /var/tmp/diff_new_pack.yauEMp/_new 2018-04-27 16:09:15.770421681 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.32
+Version:1.34
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.32.tar.xz -> mkdud-1.34.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.32/Makefile new/mkdud-1.34/Makefile
--- old/mkdud-1.32/Makefile 2018-04-10 10:20:24.0 +0200
+++ new/mkdud-1.34/Makefile 2018-04-26 16:23:20.0 +0200
@@ -24,5 +24,5 @@
@rm -f mkdud.tmp
clean:
- @rm -rf *~ package
+ @rm -rf *~ package changelog VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.32/README.md new/mkdud-1.34/README.md
--- old/mkdud-1.32/README.md2018-04-10 10:20:24.0 +0200
+++ new/mkdud-1.34/README.md2018-04-26 16:23:20.0 +0200
@@ -1,9 +1,17 @@
# mkdud
+## About
+
This is about driver updates. If you're not familiar with them, please look at
http://ftp.suse.com/pub/people/hvogel/Update-Media-HOWTO/index.html and
http://en.opensuse.org/SDB:Linuxrc#p_driverupdate first.
+`mkdud` is a tool that makes it easy to create driver updates for SUSE
distributions.
+
+## Downloads
+
+Get the latest version from the [openSUSE Build
Service](https://software.opensuse.org/package/mkdud).
+
## Usage
### Updating RPMs
@@ -174,10 +182,26 @@
## openSUSE Development
-The package is automatically submitted from the `master` branch to
-[system:install:head](https://build.opensuse.org/package/show/system:install:head/mkdud)
-OBS project. From that place it is forwarded to
-[openSUSE Factory](https://build.opensuse.org/project/show/openSUSE:Factory).
+To build, simply run `make`. Install with `make install`.
+
+Basically every new commit into the master branch of the repository will be
auto-submitted
+to all current SUSE products. No further action is needed except accepting the
pull request.
+
+Submissions are managed by a SUSE internal [jenkins](https://jenkins.io) node
in the InstallTools tab.
+
+Each time a new commit is integrated into the master branch of the repository,
+a new submit request is created to the openSUSE Build Service. The devel
project
+is
[system:install:head](https://build.opensuse.org/package/show/system:install:head/mkdud).
+
+`*.changes` and version numbers are auto-generated from git commits, you don't
have to worry about this.
+
+The spec file is maintained in the Build Service only. If you need to change
it for the `master` branch,
+submit to the
+[devel
project](https://build.opensuse.org/package/show/system:install:head/mkdud)
+in the build service directly.
+
+Development happens exclusively in the `master` branch. The branch is used for
all current products.
-You can find more information about this workflow in the [linuxrc-devtools
+You can find more information about the changes auto-generation and the
+tools used for jenkis submissions in the [linuxrc-devtools
documentation](https://github.com/openSUSE/linuxrc-devtools#opensuse-development).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.32/VERSION new/mkdud-1.34/VERSION
--- old/mkdud-1.32/VERSION 2018-04-10 10:20:24.0 +0200
+++ new/mkdud-1.34/VERSION 2018-04-26 16:23:20.0 +0200
@@ -1 +1 @@
-1.32
+1.34
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-04-11 14:01:07
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Wed Apr 11 14:01:07 2018 rev:20 rq:595135 version:1.32
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2018-03-22
12:11:49.215257830 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-04-11
14:03:27.507621682 +0200
@@ -1,0 +2,8 @@
+Tue Apr 10 08:20:24 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#12
+- adjust mkdud to work around a problem when updating coreutils
+ (bsc#1087901)
+- 1.32
+
+
Old:
mkdud-1.31.tar.xz
New:
mkdud-1.32.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.42ZQ54/_old 2018-04-11 14:03:28.335591758 +0200
+++ /var/tmp/diff_new_pack.42ZQ54/_new 2018-04-11 14:03:28.335591758 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.31
+Version:1.32
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.31.tar.xz -> mkdud-1.32.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.31/VERSION new/mkdud-1.32/VERSION
--- old/mkdud-1.31/VERSION 2018-03-21 16:11:00.0 +0100
+++ new/mkdud-1.32/VERSION 2018-04-10 10:20:24.0 +0200
@@ -1 +1 @@
-1.31
+1.32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.31/changelog new/mkdud-1.32/changelog
--- old/mkdud-1.31/changelog2018-03-21 16:11:00.0 +0100
+++ new/mkdud-1.32/changelog2018-04-10 10:20:24.0 +0200
@@ -1,3 +1,7 @@
+2018-04-06:1.32
+ - merge pr gh#openSUSE/mkdud#12
+ - adjust mkdud to work around a problem when updating coreutils (bsc
#1087901)
+
2018-03-21:1.31
- merge pr gh#openSUSE/mkdud#11
- adjust CaaSP support (bsc #1085261)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.31/mkdud new/mkdud-1.32/mkdud
--- old/mkdud-1.31/mkdud2018-03-21 16:11:00.0 +0100
+++ new/mkdud-1.32/mkdud2018-04-10 10:20:24.0 +0200
@@ -119,6 +119,7 @@
sub get_obs_key;
sub repack_as_rpm;
sub sign_rpm;
+sub create_adddir;
my %config;
my $opt_create;
@@ -129,7 +130,6 @@
my @opt_name;
my @opt_exec;
my $opt_no_docs = 1;
-my $opt_force;
my $opt_save_temp;
my %opt_install;
my @opt_config;
@@ -144,6 +144,10 @@
my $opt_application;
my $opt_volume;
my $opt_obs_keys;
+my $opt_fix_yast = 1;
+my $opt_fix_usr_src = 1;
+my $opt_fix_dist = 1;
+my $opt_fix_adddir = 1;
# global variables
my $dud;
@@ -186,14 +190,18 @@
'exec|x=s' => \@opt_exec,
'config=s' => \@opt_config,
'condition=s' => \@opt_condition,
- 'may-replace-yast' => \$opt_force,
+ 'may-replace-yast' => sub { $opt_fix_yast = 0 },
'no-docs' => \$opt_no_docs,
'keep-docs'=> sub { $opt_no_docs = 0 },
'detached-sign'=> \$opt_sign,
'sign' => sub { $opt_sign = 1; $opt_sign_direct = 1 },
'sign-key=s' => \$opt_sign_key,
'obs-keys' => \$opt_obs_keys,
- 'force'=> \$opt_force,
+ 'force'=> sub { $opt_fix_yast = $opt_fix_usr_src = $opt_fix_dist
= $opt_fix_adddir = 0 },
+ 'fix-yast!'=> \$opt_fix_yast,
+ 'fix-usr-src!' => \$opt_fix_usr_src,
+ 'fix-dist!'=> \$opt_fix_dist,
+ 'fix-adddir!' => \$opt_fix_adddir,
'format=s' => \$opt_format,
'prefix=i' => \$opt_dud_prefix,
'volume=s' => \$opt_volume,
@@ -297,11 +305,11 @@
for (@dists) {
if(!/^((leap|kubic|casp|caasp)?\d+\.\d+|tw|sle[sd]\d+)$/) {
-if($opt_force) {
- print STDERR "Warning: using unsupported dist \"$_\"\n";
+if(!$opt_fix_dist) {
+ print STDERR "*** Note: using unsupported dist \"$_\"\n";
}
else {
- die "Error: unsupported dist \"$_\" (e.g. sle12, tw; use --help for
supported dists, --force to override)\n";
+ die "Error: unsupported dist \"$_\" (e.g. sle15, tw; use --help for
supported dists, --no-fix-dist to override)\n";
}
}
}
@@ -430,11 +438,13 @@
--no-docs Don't include package documentation in
unpacked instsys tree
(to save space). This is the default setting.
--keep-docs Include package
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2018-03-22 12:07:32
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Thu Mar 22 12:07:32 2018 rev:19 rq:589771 version:1.31
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2017-05-09
18:04:14.495636949 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2018-03-22
12:11:49.215257830 +0100
@@ -1,0 +2,7 @@
+Wed Mar 21 15:11:00 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#11
+- adjust CaaSP support (bsc#1085261)
+- 1.31
+
+
Old:
mkdud-1.30.tar.xz
New:
mkdud-1.31.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.DMUFBk/_old 2018-03-22 12:11:50.311218549 +0100
+++ /var/tmp/diff_new_pack.DMUFBk/_new 2018-03-22 12:11:50.315218407 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.30
+Version:1.31
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.30.tar.xz -> mkdud-1.31.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.30/VERSION new/mkdud-1.31/VERSION
--- old/mkdud-1.30/VERSION 2017-05-08 17:02:59.0 +0200
+++ new/mkdud-1.31/VERSION 2018-03-21 16:11:00.0 +0100
@@ -1 +1 @@
-1.30
+1.31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.30/changelog new/mkdud-1.31/changelog
--- old/mkdud-1.30/changelog2017-05-08 17:02:59.0 +0200
+++ new/mkdud-1.31/changelog2018-03-21 16:11:00.0 +0100
@@ -1,3 +1,7 @@
+2018-03-21:1.31
+ - merge pr gh#openSUSE/mkdud#11
+ - adjust CaaSP support (bsc #1085261)
+
2017-05-05:1.30
- merge pr gh#openSUSE/mkdud#10
- fix service pack condition check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.30/mkdud new/mkdud-1.31/mkdud
--- old/mkdud-1.30/mkdud2017-05-08 17:02:59.0 +0200
+++ new/mkdud-1.31/mkdud2018-03-21 16:11:00.0 +0100
@@ -284,6 +284,13 @@
map { s/^(tumbleweed|tw).*/tw/g } @dists;
# map 'casp' to the new 'caasp'
map { s/^casp(\d)/caasp$1/ } @dists;
+# CaaSP should be aligned with the respective SLES
+# caasp1.0 = sle12 (-sp2)
+# cassp2.0 = sle12 (-sp3)
+# caasp3.0 = sle12 (-sp3)
+# caasp4.0 = sle15
+push @dists, "sles12" if grep { /^caasp[123]\./ } @dists;
+push @dists, "sles15" if grep { /^caasp4\./ } @dists;
push @dists, "13.2" if grep { $_ eq "leap42.1" } @dists;
@d{map { /^sle([sd]?)(\d+)/i ? $1 eq "" ? ("sles$2", "sled$2") :
"sle\L$1$2" : "\L$_" } @dists} = ();
@dists = sort keys %d;
@@ -383,7 +390,7 @@
architectures is created.
-d, --dist DIST Specify the product the DUD is for. Possible
values include:
13.2, sle12, leap42.3, kubic1.0, caasp1.0, tw
standing for
-openSUSE 13.2, SLE12, Leap 42.3, Kubic 1.0,
CAASP 1.0,
+openSUSE 13.2, SLE12, Leap 42.3, Kubic 1.0,
CaaSP 1.0,
Tumbleweed, respectively.
Note that 'sle12' is a short hand for
specifying both
'sles12' and 'sled12'.
@@ -529,12 +536,26 @@
- sleX (e.g. sle12) = SUSE Linux Enterprise (Server + Desktop) X
- slesX (e.g. sles12) = SUSE Linux Enterprise Server X
- sledX (e.g. sled12) = SUSE Linux Enterprise Desktop X - but see notes
below
-- caaspX.Y (e.g. caasp1.0) = SUSE Containers as a Service Platform X.Y
+- caaspX.Y (e.g. caasp1.0) = SUSE Container as a Service Platform X.Y -
see notes below
Note that there aren't any products anymore that actually use 'sledX',
even SLED uses the 'sles' DUDs meanwhile. For this, please just use 'sleX'
when creating a DUD for a SUSE Linux Enterprise product.
+ Note also that CaaSP releases are based on SLE releases. Since driver
+ updates are usually released for a specific SLE version mkdud provides a
+ mapping CaaSP release <-> SLE release when building with --dist caspX.Y.
+ Currently:
+
+- caasp1.0 = sles12 (-sp2)
+- caasp2.0 = sles12 (-sp3)
+- caasp3.0 = sles12 (-sp3)
+- caasp4.0 = sles15
+
+ Driver updates built only for SLE12 will implicitly also work with
+ CaaSP3.0; those built only
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2017-05-09 18:04:08
Comparing /work/SRC/openSUSE:Factory/mkdud (Old)
and /work/SRC/openSUSE:Factory/.mkdud.new (New)
Package is "mkdud"
Tue May 9 18:04:08 2017 rev:18 rq:493466 version:1.30
Changes:
--- /work/SRC/openSUSE:Factory/mkdud/mkdud.changes 2017-01-15
11:20:21.475029030 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2017-05-09
18:04:14.495636949 +0200
@@ -0,0 +1,8 @@
+
+Mon May 8 15:02:59 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mkdud#10
+- support openSUSE Kubic
+- fix service pack condition check
+- 1.30
+
Old:
mkdud-1.29.tar.xz
New:
mkdud-1.30.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.jeO3dn/_old 2017-05-09 18:04:16.271386015 +0200
+++ /var/tmp/diff_new_pack.jeO3dn/_new 2017-05-09 18:04:16.275385451 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.29
+Version:1.30
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.29.tar.xz -> mkdud-1.30.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.29/VERSION new/mkdud-1.30/VERSION
--- old/mkdud-1.29/VERSION 2017-01-13 16:14:25.0 +0100
+++ new/mkdud-1.30/VERSION 2017-05-08 17:02:59.0 +0200
@@ -1 +1 @@
-1.29
+1.30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.29/changelog new/mkdud-1.30/changelog
--- old/mkdud-1.29/changelog2017-01-13 16:14:25.0 +0100
+++ new/mkdud-1.30/changelog2017-05-08 17:02:59.0 +0200
@@ -1,3 +1,8 @@
+2017-05-05:1.30
+ - merge pr gh#openSUSE/mkdud#10
+ - fix service pack condition check
+ - support openSUSE Kubic
+
2017-01-13:1.29
- merge pr gh#openSUSE/mkdud#9
- follow casp -> caasp renaming
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.29/mkdud new/mkdud-1.30/mkdud
--- old/mkdud-1.29/mkdud2017-01-13 16:14:25.0 +0100
+++ new/mkdud-1.30/mkdud2017-05-08 17:02:59.0 +0200
@@ -289,7 +289,7 @@
@dists = sort keys %d;
for (@dists) {
- if(!/^((leap|casp|caasp)?\d+\.\d+|tw|sle[sd]\d+)$/) {
+ if(!/^((leap|kubic|casp|caasp)?\d+\.\d+|tw|sle[sd]\d+)$/) {
if($opt_force) {
print STDERR "Warning: using unsupported dist \"$_\"\n";
}
@@ -382,8 +382,9 @@
find a hint in SOURCES either, an update for
all supported
architectures is created.
-d, --dist DIST Specify the product the DUD is for. Possible
values include:
-13.2, sle12, leap42.2, caasp1.0, tw standing
for openSUSE 13.2,
-SLE12, Leap 42.2, CAASP 1.0, Tumbleweed,
respectively.
+13.2, sle12, leap42.3, kubic1.0, caasp1.0, tw
standing for
+openSUSE 13.2, SLE12, Leap 42.3, Kubic 1.0,
CAASP 1.0,
+Tumbleweed, respectively.
Note that 'sle12' is a short hand for
specifying both
'sles12' and 'sled12'.
Note also that there are no separate names for
service packs.
@@ -522,7 +523,8 @@
The --dist option accepts these values (case-insensitive; X, Y: decimal
numbers):
- X.Y (e.g. 13.2) = openSUSE X.Y
-- leapX.Y (e.g. leap42.2) = openSUSE Leap X.Y
+- leapX.Y (e.g. leap42.3) = openSUSE Leap X.Y
+- kubicX.Y (e.g. kubic1.0) = openSUSE Kubic X.Y
- tw = openSUSE Tumbleweed
- sleX (e.g. sle12) = SUSE Linux Enterprise (Server + Desktop) X
- slesX (e.g. sles12) = SUSE Linux Enterprise Server X
@@ -1758,7 +1760,7 @@
my %p1;
for (@$l) {
-if(/^(\S+)-(sle([sd])(\d+)|(leap|casp|caasp)?(\d+\.\d+)|tw)$/) {
+if(/^(\S+)-(sle([sd])(\d+)|(leap|kubic|casp|caasp)?(\d+\.\d+)|tw)$/) {
if($3 eq 's') {
push @{$p1{"SLES $4"}}, $1;
}
@@ -1768,6 +1770,9 @@
elsif($5 eq 'leap') {
push @{$p1{"openSUSE Leap $6"}}, $1;
}
+ elsif($5 eq 'kubic') {
+push @{$p1{"openSUSE Kubic $6"}}, $1;
+ }
elsif($5 eq 'casp') {
push @{$p1{"CASP $6"}}, $1;
}
@@ -2130,7 +2135,7 @@
my ($dist_name, $dist_ver, $dist_ver_sp, $dist_version_var);
-
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-12-02 16:42:27
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 2016-11-29
12:49:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-12-02
16:42:28.0 +0100
@@ -1,0 +2,11 @@
+Wed Nov 30 15:21:13 UTC 2016 - snw...@suse.com
+
+- more readable variable names
+- be more specific about dists that support DUDs as rpm
+- squash dashes ('-') to match more dist name spellings
+- support creating a dud in rpm format (bsc#1006175)
+- adjust documentation to include rpm format
+- accept driver updates packed as rpm
+- 1.27
+
+---
Old:
mkdud-1.26.tar.xz
New:
mkdud-1.27.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.xTHuJX/_old 2016-12-02 16:42:29.0 +0100
+++ /var/tmp/diff_new_pack.xTHuJX/_new 2016-12-02 16:42:29.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.26
+Version:1.27
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.26.tar.xz -> mkdud-1.27.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.26/README.md new/mkdud-1.27/README.md
--- old/mkdud-1.26/README.md2016-11-28 13:41:58.0 +0100
+++ new/mkdud-1.27/README.md2016-11-30 16:20:00.0 +0100
@@ -118,7 +118,8 @@
### DUD formats
The DUD will be packaged into an archive and optionally compressed. The
-default is a gzipped cpio archive.
+default is a gzipped cpio archive. For SLE12 and later you can also
+create an rpm.
Situation prior to SLE12, openSUSE 13.2:
@@ -131,7 +132,12 @@
> You can use either a cpio or tar archive and can compress it optionally
> with either gzip or xz. All formats may be used for signed DUDs.
-There is an advantage in using cpio instead of tar: because the Linux kernel
+SLE12-SP1, Leap-42.1 and later versions:
+
+> If you create an RPM (use --format=rpm) you can sign the RPM in the usual
RPM-way
+> to get a signed DUD.
+
+There is an advantage in using cpio instead of tar or rpm: because the Linux
kernel
understands cpio archives, you can just append a DUD to the initrd on the
boot medium to apply it (literally: 'cat my.dud >> initrd'). No need for a
'dud' boot option in this case.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.26/VERSION new/mkdud-1.27/VERSION
--- old/mkdud-1.26/VERSION 2016-11-28 13:41:58.0 +0100
+++ new/mkdud-1.27/VERSION 2016-11-30 16:20:00.0 +0100
@@ -1 +1 @@
-1.26
+1.27
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.26/changelog new/mkdud-1.27/changelog
--- old/mkdud-1.26/changelog2016-11-28 13:41:58.0 +0100
+++ new/mkdud-1.27/changelog2016-11-30 16:20:00.0 +0100
@@ -1,3 +1,11 @@
+2016-11-30:1.27
+ - more readable variable names
+ - be more specific about dists that support DUDs as rpm
+ - squash dashes ('-') to match more dist name spellings
+ - support creating a dud in rpm format (bsc #1006175)
+ - adjust documentation to include rpm format
+ - accept driver updates packed as rpm
+
2016-11-28:1.26
- even more more verbose message
- even more verbose error message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.26/mkdud new/mkdud-1.27/mkdud
--- old/mkdud-1.26/mkdud2016-11-28 13:41:58.0 +0100
+++ new/mkdud-1.27/mkdud2016-11-30 16:20:00.0 +0100
@@ -117,6 +117,8 @@
sub get_sign_key_name;
sub sign_file;
sub get_obs_key;
+sub repack_as_rpm;
+sub sign_rpm;
my %config;
my $opt_create;
@@ -152,8 +154,10 @@
my $use_all_archs = 0;
my $format_archive = "cpio";
my $format_compr = "gz";
+my $format_rpm = 0;# re-package as rpm if set
my $sign_key_dir;
my $sign_key_ok;
+my $sign_key_id;
my $obs;
my $pubkey_info;
my $yast_version = 0;
@@ -276,6 +280,7 @@
die "Error: distribution arg is required; use --dist.\n" if !@opt_dist;
my %d;
@dists = @opt_dist;
+map { tr/-//d } @dists;
map { s/^(tumbleweed|tw).*/tw/g } @dists;
push @dists, "13.2" if grep { $_ eq "leap42.1" } @dists;
@d{map { /^sle([sd]?)(\d+)/i ? $1 eq "" ? ("sles$2",
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-11-29 12:49:18
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 2016-02-16
09:18:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-11-29
12:49:19.0 +0100
@@ -1,0 +2,8 @@
+Mon Nov 28 12:46:21 UTC 2016 - snw...@suse.com
+
+- even more more verbose message
+- even more verbose error message
+- allow to skip distribution check using --force (bsc#1012241)
+- 1.26
+
+---
Old:
mkdud-1.25.tar.xz
New:
mkdud-1.26.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.1QmhSm/_old 2016-11-29 12:49:20.0 +0100
+++ /var/tmp/diff_new_pack.1QmhSm/_new 2016-11-29 12:49:20.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.25
+Version:1.26
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.25.tar.xz -> mkdud-1.26.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.25/VERSION new/mkdud-1.26/VERSION
--- old/mkdud-1.25/VERSION 2016-02-12 10:38:22.0 +0100
+++ new/mkdud-1.26/VERSION 2016-11-28 13:41:58.0 +0100
@@ -1 +1 @@
-1.25
+1.26
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.25/changelog new/mkdud-1.26/changelog
--- old/mkdud-1.25/changelog2016-02-12 10:38:22.0 +0100
+++ new/mkdud-1.26/changelog2016-11-28 13:41:58.0 +0100
@@ -1,3 +1,8 @@
+2016-11-28:1.26
+ - even more more verbose message
+ - even more verbose error message
+ - allow to skip distribution check using --force (bsc #1012241)
+
2016-02-11:1.25
- add support for leap and tumbleweed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.25/mkdud new/mkdud-1.26/mkdud
--- old/mkdud-1.25/mkdud2016-02-12 10:38:22.0 +0100
+++ new/mkdud-1.26/mkdud2016-11-28 13:41:58.0 +0100
@@ -282,7 +282,14 @@
@dists = sort keys %d;
for (@dists) {
- die "unsupported dist \"$_\"\n" if !/^((leap)?\d+\.\d+|tw|sle[sd]\d+)$/;
+ if(!/^((leap)?\d+\.\d+|tw|sle[sd]\d+)$/) {
+if($opt_force) {
+ print STDERR "Warning: using unsupported dist \"$_\"\n";
+}
+else {
+ die "Error: unsupported dist \"$_\" (e.g. sle12, tw; use --help for
supported dists, --force to override)\n";
+}
+ }
}
}
@@ -406,9 +413,11 @@
--no-docs Don't include package documentation in
unpacked instsys tree
(to save space). This is the default setting.
--keep-docs Include package documentation in unpacked
instsys tree.
- --force Allow driver update to contain files that
might break the
+ --force Override some internal consistency checks.
This allows you to
+build driver updates containing files that
might break the
installation. mkdud will normally remove those
files and
-print a warning. Use this option to override.
+print a warning. This also allows you to
specify distributions
+with --dist that mkdud does not know about.
--format FORMAT Specify archive format for DUD.
FORMAT=(cpio|tar|iso)[.(gz|xz)].
Default FORMAT is cpio.gz (gzip compressed
cpio archive).
Note: don't change the default. See README.
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-02-16 09:18:38
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 2016-01-22
01:10:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-02-16
09:18:40.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb 12 09:41:11 UTC 2016 - snw...@suse.com
+
+- add support for leap and tumbleweed
+- 1.25
+
+---
Old:
mkdud-1.24.tar.xz
New:
mkdud-1.25.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.hu9kMg/_old 2016-02-16 09:18:40.0 +0100
+++ /var/tmp/diff_new_pack.hu9kMg/_new 2016-02-16 09:18:40.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.24
+Version:1.25
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.24.tar.xz -> mkdud-1.25.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.24/VERSION new/mkdud-1.25/VERSION
--- old/mkdud-1.24/VERSION 2016-01-21 09:46:54.0 +0100
+++ new/mkdud-1.25/VERSION 2016-02-12 10:38:22.0 +0100
@@ -1 +1 @@
-1.24
+1.25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.24/changelog new/mkdud-1.25/changelog
--- old/mkdud-1.24/changelog2016-01-21 09:46:54.0 +0100
+++ new/mkdud-1.25/changelog2016-02-12 10:38:22.0 +0100
@@ -1,3 +1,6 @@
+2016-02-11:1.25
+ - add support for leap and tumbleweed
+
2016-01-20:1.24
- Remove warning on yast replacement for versions supporting it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.24/mkdud new/mkdud-1.25/mkdud
--- old/mkdud-1.24/mkdud2016-01-21 09:46:54.0 +0100
+++ new/mkdud-1.25/mkdud2016-02-12 10:38:22.0 +0100
@@ -160,13 +160,16 @@
# linuxrc versions in service packs
my $servicepack;
+$servicepack->{10}{0} = "2.0.46";
$servicepack->{10}{1} = "2.0.67";
$servicepack->{10}{2} = "2.0.79";
$servicepack->{10}{3} = "2.0.91";
$servicepack->{10}{4} = "2.0.97";
+$servicepack->{11}{0} = "3.3.34";
$servicepack->{11}{1} = "3.3.59";
$servicepack->{11}{2} = "3.3.81";
$servicepack->{11}{3} = "3.3.91";
+$servicepack->{11}{4} = "3.3.108";
GetOptions(
'create|c=s' => sub { $opt_create = 1; $dud = $_[1] },
@@ -272,8 +275,15 @@
if($need_dist) {
die "Error: distribution arg is required; use --dist.\n" if !@opt_dist;
my %d;
-@d{map { /^sle([sd]?)(\d+)/i ? $1 eq "" ? ("sles$2", "sled$2") :
"sle\L$1$2" : "\L$_" } @opt_dist} = ();
+@dists = @opt_dist;
+map { s/^(tumbleweed|tw).*/tw/g } @dists;
+push @dists, "13.2" if grep { $_ eq "leap42.1" } @dists;
+@d{map { /^sle([sd]?)(\d+)/i ? $1 eq "" ? ("sles$2", "sled$2") :
"sle\L$1$2" : "\L$_" } @dists} = ();
@dists = sort keys %d;
+
+for (@dists) {
+ die "unsupported dist \"$_\"\n" if !/^((leap)?\d+\.\d+|tw|sle[sd]\d+)$/;
+}
}
# cleanup old driver update sources
@@ -357,8 +367,8 @@
Note: if you don't set the architecture and
mkdud can't
find a hint in SOURCES either, an update for
all supported
architectures is created.
- -d, --dist DIST Either an openSUSE version (e.g. 13.2) or SLE
version
-(e.g. sles12).
+ -d, --dist DIST Specify either an openSUSE, SLE, or Leap
version or Tumbleweed.
+(examples: 13.2, sle12, leap42.1, tw).
Note that 'sle12' is a short hand for
specifying both
'sles12' and 'sled12'.
Note also that there are no separate names for
service packs.
@@ -366,8 +376,11 @@
below for a way to target specific service
packs.
Option can be repeated to specify several
distribution targets.
--condition SCRIPTRun SCRIPT and apply DUD only if SCRIPT has
exit status 0.
-If SCRIPT has the special name ServicePackN (N
= 1, 2, ...), a
-script that checks for service pack N is
_generated_ and added.
+If
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-01-21 23:45:04
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 2016-01-20
09:55:21.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-01-22
01:10:46.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 21 08:51:11 UTC 2016 - snw...@suse.com
+
+- Remove warning on yast replacement for versions supporting it.
+- 1.24
+
+---
Old:
mkdud-1.23.tar.xz
New:
mkdud-1.24.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.OZZMLD/_old 2016-01-22 01:10:48.0 +0100
+++ /var/tmp/diff_new_pack.OZZMLD/_new 2016-01-22 01:10:48.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.23
+Version:1.24
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.23.tar.xz -> mkdud-1.24.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.23/VERSION new/mkdud-1.24/VERSION
--- old/mkdud-1.23/VERSION 2016-01-19 14:45:13.0 +0100
+++ new/mkdud-1.24/VERSION 2016-01-21 09:46:54.0 +0100
@@ -1 +1 @@
-1.23
+1.24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.23/changelog new/mkdud-1.24/changelog
--- old/mkdud-1.23/changelog2016-01-19 14:45:13.0 +0100
+++ new/mkdud-1.24/changelog2016-01-21 09:46:54.0 +0100
@@ -1,3 +1,6 @@
+2016-01-20:1.24
+ - Remove warning on yast replacement for versions supporting it.
+
2016-01-19:1.23
- better public key file detection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.23/mkdud new/mkdud-1.24/mkdud
--- old/mkdud-1.23/mkdud2016-01-19 14:45:13.0 +0100
+++ new/mkdud-1.24/mkdud2016-01-21 09:46:54.0 +0100
@@ -95,6 +95,7 @@
our $VERSION = "0.0";
my @all_archs = qw ( x86_64 aarch64 armv7l i386 ia64 ppc ppc64 ppc64le s390
s390x );
+my $REPLACEABLE_YAST = '3.1.135';
sub usage;
sub get_file_arch;
@@ -155,6 +156,7 @@
my $sign_key_ok;
my $obs;
my $pubkey_info;
+my $yast_version = 0;
# linuxrc versions in service packs
my $servicepack;
@@ -571,7 +573,7 @@
if(/^RPM/) {
my $ft = { type => 'rpm', file => $_[0] };
-my $f = `rpm --nosignature -qp --qf
'%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}' $_[0] 2>$tmp_err`;
+my $f = `rpm --nosignature -qp --qf
'%{NAME}\t%{VERSION}\t%{RELEASE}.%{ARCH}' $_[0] 2>$tmp_err`;
if($f eq "") {
print STDERR "failed to read rpm: $_[0]\n";
my $x;
@@ -581,7 +583,13 @@
exit 1;
}
-$ft->{canonical_name} = $f;
+# Check if yast base package is to be replaced and remember its version:
+if($f =~ /^yast2\t(.+)\t/) {
+ $yast_version = $1;
+ # print STDERR "yast version: $yast_version\n";
+}
+
+($ft->{canonical_name} = $f) =~ s/\t/-/g;
my $ar = $f =~ /\.([^.]+)$/ ? $1 : undef;
$ar = "i386" if $ar =~ /^i.86$/;
@@ -1048,10 +1056,13 @@
if(!$opt_force) {
if(lstat "$base/inst-sys/sbin/yast") {
-print STDERR
- "Warning: prevented driver update from replacing /sbin/yast.\n" .
- "If you really need to do this, use --force.\n";
-unlink "$base/inst-sys/sbin/yast";
+if(vercmp($yast_version, $REPLACEABLE_YAST) < 0 ) {
+ print STDERR
+"Warning: prevented driver update from replacing /sbin/yast.\n" .
+"yast2 >=$REPLACEABLE_YAST is considered safely replacable.\n" .
+"If you really need to do this, use --force.\n";
+ unlink "$base/inst-sys/sbin/yast";
+}
}
if(-e "$base/inst-sys/usr/src/packages") {
@@ -2223,3 +2234,11 @@
return undef;
}
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub vercmp {
+ my ($s1, $s2) = @_;
+ $s1 =~ s/(\d+)/sprintf("%010d", $1)/ge;
+ $s2 =~ s/(\d+)/sprintf("%010d", $1)/ge;
+ return $s1 cmp $s2;
+}
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-01-20 09:55:12
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 2016-01-16
11:56:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-01-20
09:55:21.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan 19 13:46:13 UTC 2016 - snw...@suse.com
+
+- better public key file detection
+- 1.23
+
+---
Old:
mkdud-1.22.tar.xz
New:
mkdud-1.23.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.3rN5m5/_old 2016-01-20 09:55:22.0 +0100
+++ /var/tmp/diff_new_pack.3rN5m5/_new 2016-01-20 09:55:22.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.22
+Version:1.23
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.22.tar.xz -> mkdud-1.23.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.22/VERSION new/mkdud-1.23/VERSION
--- old/mkdud-1.22/VERSION 2016-01-14 15:15:40.0 +0100
+++ new/mkdud-1.23/VERSION 2016-01-19 14:45:13.0 +0100
@@ -1 +1 @@
-1.22
+1.23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.22/changelog new/mkdud-1.23/changelog
--- old/mkdud-1.22/changelog2016-01-14 15:15:40.0 +0100
+++ new/mkdud-1.23/changelog2016-01-19 14:45:13.0 +0100
@@ -1,3 +1,6 @@
+2016-01-19:1.23
+ - better public key file detection
+
2016-01-14:1.22
- added --obs-keys option to retrieve necessary obs project keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.22/mkdud new/mkdud-1.23/mkdud
--- old/mkdud-1.22/mkdud2016-01-14 15:15:40.0 +0100
+++ new/mkdud-1.23/mkdud2016-01-19 14:45:13.0 +0100
@@ -706,13 +706,14 @@
}
elsif(-f $_[0] && -s _ && -T _) {
open my $f, $_[0];
+local $/; # complete file
my $l = <$f>;
close $f;
if($l =~ /^#!/) {
push @files, { type => 'bin', file => $_[0] } if -x $_[0];
return;
}
-elsif($l =~ /^-BEGIN PGP PUBLIC KEY BLOCK-/) {
+elsif($l =~ /^-BEGIN PGP PUBLIC KEY BLOCK-/m) {
push @files, { type => 'pubkey', file => $_[0] };
return;
}
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-01-16 11:56:57
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 2016-01-13
22:46:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-01-16
11:56:59.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 14 14:17:15 UTC 2016 - snw...@suse.com
+
+- added --obs-keys option to retrieve necessary obs project keys
+- 1.22
+
+---
Old:
mkdud-1.21.tar.xz
New:
mkdud-1.22.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.RHUBCg/_old 2016-01-16 11:57:01.0 +0100
+++ /var/tmp/diff_new_pack.RHUBCg/_new 2016-01-16 11:57:01.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.21
+Version:1.22
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.21.tar.xz -> mkdud-1.22.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.21/VERSION new/mkdud-1.22/VERSION
--- old/mkdud-1.21/VERSION 2016-01-13 14:51:37.0 +0100
+++ new/mkdud-1.22/VERSION 2016-01-14 15:15:40.0 +0100
@@ -1 +1 @@
-1.21
+1.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.21/changelog new/mkdud-1.22/changelog
--- old/mkdud-1.21/changelog2016-01-13 14:51:37.0 +0100
+++ new/mkdud-1.22/changelog2016-01-14 15:15:40.0 +0100
@@ -1,3 +1,6 @@
+2016-01-14:1.22
+ - added --obs-keys option to retrieve necessary obs project keys
+
2016-01-13:1.21
- use mkpath instead of make_path to be compatible with older perl
versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.21/mkdud new/mkdud-1.22/mkdud
--- old/mkdud-1.21/mkdud2016-01-13 14:51:37.0 +0100
+++ new/mkdud-1.22/mkdud2016-01-14 15:15:40.0 +0100
@@ -115,6 +115,7 @@
sub import_sign_key;
sub get_sign_key_name;
sub sign_file;
+sub get_obs_key;
my %config;
my $opt_create;
@@ -139,6 +140,7 @@
my $opt_preparer;
my $opt_application;
my $opt_volume;
+my $opt_obs_keys;
# global variables
my $dud;
@@ -151,6 +153,8 @@
my $format_compr = "gz";
my $sign_key_dir;
my $sign_key_ok;
+my $obs;
+my $pubkey_info;
# linuxrc versions in service packs
my $servicepack;
@@ -179,6 +183,7 @@
'detached-sign'=> \$opt_sign,
'sign' => sub { $opt_sign = 1; $opt_sign_direct = 1 },
'sign-key=s' => \$opt_sign_key,
+ 'obs-keys' => \$opt_obs_keys,
'force'=> \$opt_force,
'format=s' => \$opt_format,
'prefix=i' => \$opt_dud_prefix,
@@ -220,6 +225,23 @@
$opt_sign_key ||= $config{'sign-key'};
+if($opt_obs_keys) {
+ if(open my $f, "$ENV{HOME}/.oscrc") {
+while(<$f>) {
+ if(m#^\[(https?://([^/\]]+))#) {
+$obs->{server}{$2} = $1;
+ }
+}
+close $f;
+ }
+
+ for (sort keys %{$obs->{server}}) {
+my $x = $_;
+$x =~ s/^[^\.]*\.//;
+$obs->{server_short}{$x} = $obs->{server}{$_};
+ }
+}
+
my $tmp = Tmp::new($opt_save_temp);
my $tmp_dud = $tmp->dir('dud');
@@ -384,6 +406,10 @@
--vendor Set ISO publisher id (if using format 'iso').
--preparerSet ISO data preparer id (if using format
'iso').
--application Set ISO application id (if using format 'iso').
+ --obs-keysRetrieve and add project keys from the
openSUSE build service
+as needed to verify the RPMs in SOURCES.
+See 'Adding RPMs notes' below.
+
Configuration file:
@@ -400,8 +426,7 @@
- RPMs. The packages are used according to the value of the --install option.
- PGP pubic key files (ASCII). The files are added to the rpm key database
for verifying
-RPMs during the installation process. Note that the keys are not copied
-into the target system (the installed system).
+RPMs during the installation process. See 'Adding RPMs notes' below.
- kernel modules.
@@ -426,6 +451,37 @@
- ISO images. The images are unpacked and scanned for driver updates.
+Adding RPMs notes:
+
+ If you add RPMs to SOURCES, these RPMs can be used to update the
installation system
+ and/or to be installed in the target system. See
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2016-01-13 22:46:19
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-10-12
10:02:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2016-01-13
22:46:25.0 +0100
@@ -1,0 +2,12 @@
+Wed Jan 13 13:56:12 UTC 2016 - snw...@suse.com
+
+- use mkpath instead of make_path to be compatible with older perl versions
+- 1.21
+
+---
+Wed Jan 13 11:58:31 UTC 2016 - snw...@suse.com
+
+- suppport adding public pgp keys for rpm verification
+- 1.20
+
+---
Old:
mkdud-1.19.tar.xz
New:
mkdud-1.21.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.rMLFZO/_old 2016-01-13 22:46:26.0 +0100
+++ /var/tmp/diff_new_pack.rMLFZO/_new 2016-01-13 22:46:26.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.19
+Version:1.21
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.19.tar.xz -> mkdud-1.21.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.19/README.md new/mkdud-1.21/README.md
--- old/mkdud-1.19/README.md2015-09-29 11:14:03.0 +0200
+++ new/mkdud-1.21/README.md2016-01-13 14:51:37.0 +0100
@@ -63,6 +63,24 @@
# mkdud --install instsys --dist sle11 --create foo3.dud
yast2-bootloader/binaries/*
+There's still a catch: if you build the RPM yourself or in the openSUSE
+Build Service and so the RPM is probably signed with a key that is not
included on the
+install media, you'll get a warning that the package could not be verified
+during installation.
+
+For this, `mkdud` can handle public gpg keys. You just add them on the command
+line. For example:
+
+
+ # mkdud -c foo.dud -d sle12 bar.rpm bar.pub
+
+
+will integrate bar.pub into the RPM key database so it is used to verify
+bar.rpm.
+
+Note that these keys are not copied into the target system. They are only
+part of the installation environment.
+
### Adding and running programs
Sometimes you need to include and run a script to fix things. For example
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.19/VERSION new/mkdud-1.21/VERSION
--- old/mkdud-1.19/VERSION 2015-09-29 11:14:03.0 +0200
+++ new/mkdud-1.21/VERSION 2016-01-13 14:51:37.0 +0100
@@ -1 +1 @@
-1.19
+1.21
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.19/changelog new/mkdud-1.21/changelog
--- old/mkdud-1.19/changelog2015-09-29 11:14:03.0 +0200
+++ new/mkdud-1.21/changelog2016-01-13 14:51:37.0 +0100
@@ -1,3 +1,9 @@
+2016-01-13:1.21
+ - use mkpath instead of make_path to be compatible with older perl
versions
+
+2016-01-13:1.20
+ - suppport adding public pgp keys for rpm verification
+
2015-09-28:1.19
- Add information about openSUSE development
- Convert README to Markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.19/mkdud new/mkdud-1.21/mkdud
--- old/mkdud-1.19/mkdud2015-09-29 11:14:03.0 +0200
+++ new/mkdud-1.21/mkdud2016-01-13 14:51:37.0 +0100
@@ -113,6 +113,7 @@
sub get_service_pack;
sub set_format;
sub import_sign_key;
+sub get_sign_key_name;
sub sign_file;
my %config;
@@ -398,6 +399,10 @@
- RPMs. The packages are used according to the value of the --install option.
+ - PGP pubic key files (ASCII). The files are added to the rpm key database
for verifying
+RPMs during the installation process. Note that the keys are not copied
+into the target system (the installed system).
+
- kernel modules.
- 'module.order' files. See driver update documentation.
@@ -513,7 +518,8 @@
my $f = `rpm --nosignature -qp --qf
'%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}' $_[0] 2>$tmp_err`;
if($f eq "") {
print STDERR "failed to read rpm: $_[0]\n";
- open my $x, $tmp_err;
+ my $x;
+ open $x, $tmp_err;
print STDERR $_ while (<$x>);
close $x;
exit 1;
@@ -641,6 +647,10 @@
push @files, { type => 'bin', file => $_[0] } if -x $_[0];
return;
}
+elsif($l =~ /^-BEGIN PGP PUBLIC
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-10-12 10:02:20
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-05-02
16:14:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-10-12
10:02:25.0 +0200
@@ -1,0 +2,7 @@
+Tue Sep 29 09:15:16 UTC 2015 - snw...@suse.com
+
+- Add information about openSUSE development
+- Convert README to Markdown
+- 1.19
+
+---
Old:
mkdud-1.18.tar.xz
New:
mkdud-1.19.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.8JYqdl/_old 2015-10-12 10:02:26.0 +0200
+++ /var/tmp/diff_new_pack.8JYqdl/_new 2015-10-12 10:02:26.0 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.18
+Version:1.19
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
@@ -51,6 +51,6 @@
%files
%defattr(-,root,root)
/usr/bin/mkdud
-%doc README COPYING
+%doc README.md COPYING
%changelog
++ mkdud-1.18.tar.xz -> mkdud-1.19.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.18/README new/mkdud-1.19/README
--- old/mkdud-1.18/README 2015-04-30 15:19:35.0 +0200
+++ new/mkdud-1.19/README 1970-01-01 01:00:00.0 +0100
@@ -1,156 +0,0 @@
-This is about driver updates. If you're not familiar with them, please look at
-
- http://ftp.suse.com/pub/people/hvogel/Update-Media-HOWTO/index.html
-
-and
-
- http://en.opensuse.org/SDB:Linuxrc#p_driverupdate
-
-first.
-
-
-1. Updating RPMs
-
-
-If you need to update packages during installation via driver update, either
-in the installation environment or the final installed system, this script
-helps you to setup such a driver update.
-
-There are two ways for this:
-
-(a) The old ('rpm') way: place all rpms into the 'install' directory and
-YaST will run 'rpm -U install/*.rpm' at the end of the first installation
-stage.
-
-(b) Since SLE11/openSUSE 12.1 YaST lets you register a repository
-automatically. The repo priority can be set higher (numerically lower)
-than the default priority (99) to ensure the driver update packages are
-preferred.
-
-Method (b) has the advantage that the old packages are never installed and
-used and conflicts and dependencies are automatically resolved (think of
-different kernel flavors).
-
-This script supports both ways.
-
-Examples:
-
-
-(1)
-- update perl-Bootloader with method (a) _and_ (b), repo priority is 50:
-# mkdud --dist sle11 --create foo1.dud perl-Bootloader.rpm
-
-
-(2)
-- update perl-Bootloader and yast2-bootloader for both i586 and x86_64, using
- only method (b), repo priority is 90:
-
-# ls perl-Bootloader/binaries/* yast2-bootloader/binaries/*
-perl-Bootloader/binaries/perl-Bootloader-0.4.89.30-1.10.i586.rpm
-yast2-bootloader/binaries/yast2-bootloader-2.17.78-1.1.i586.rpm
-perl-Bootloader/binaries/perl-Bootloader-0.4.89.30-1.10.x86_64.rpm
-yast2-bootloader/binaries/yast2-bootloader-2.17.78-1.1.x86_64.rpm
-
-# mkdud --install repo --prio 90 --dist sle11 --create foo2.dud
perl-Bootloader/binaries/* yast2-bootloader/binaries/*
-
-
-(3)
-- replace yast2-bootloader only in the installation system, for i586 and
x86_64:
-
-# ls yast2-bootloader/binaries/*
-yast2-bootloader/binaries/yast2-bootloader-2.17.78-1.1.i586.rpm
-yast2-bootloader/binaries/yast2-bootloader-2.17.78-1.1.x86_64.rpm
-
-# mkdud --install instsys --dist sle11 --create foo3.dud
yast2-bootloader/binaries/*
-
-
-2. Adding and running programms
-
-Sometimes you need to include and run a script to fix things. For example
-
-# mkdud --dist sle11 --exec bar --create foo4.dud bar
-
-adds 'bar' to the 'install' directory and runs it. Unlike the 'update.pre'
-script it is run just after the dud has been read, even _before_ any dud
-modules are loaded.
-
-You can combine this with rpms:
-
-# mkdud --install instsys --dist sle11 --exec fix_it --create foo5.dud
yast2-bootloader/binaries/* fix_it
-
-This replaces yast2-bootloader and also adds and runs the 'fix_it' script.
-
-
-3. Conditional DUDs
-
-If a DUD must only be applied to certain machines or only to specific
-service packs, you can add a condition script that is run when the DUD
-config file is parsed during installation. This script must exit with 0 to
-indicate that
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-05-02 16:14:39
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-03-05
18:17:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-05-02
16:14:40.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr 30 15:21:03 CEST 2015 - snw...@suse.com
+
+- clarify iso usage in README
+- support creating duds in iso9660 format
+- 1.18
+
+---
Old:
mkdud-1.17.tar.xz
New:
mkdud-1.18.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.nzjXN5/_old 2015-05-02 16:14:41.0 +0200
+++ /var/tmp/diff_new_pack.nzjXN5/_new 2015-05-02 16:14:41.0 +0200
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.17
+Version:1.18
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.17.tar.xz - mkdud-1.18.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.17/README new/mkdud-1.18/README
--- old/mkdud-1.17/README 2015-03-04 13:39:59.0 +0100
+++ new/mkdud-1.18/README 2015-04-30 15:19:35.0 +0200
@@ -120,6 +120,10 @@
boot medium to apply it (literally: 'cat my.dud initrd'). No need for a
'dud' boot option in this case.
+It is also possible to create a DUD in ISO9660 format. But note that DUDs in
+*compressed* (gzip or xz) ISO9660 format are currently not suitable to be
+used in the installer's 'dud' boot option.
+
5. DUD directory structure
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.17/VERSION new/mkdud-1.18/VERSION
--- old/mkdud-1.17/VERSION 2015-03-04 13:39:59.0 +0100
+++ new/mkdud-1.18/VERSION 2015-04-30 15:19:35.0 +0200
@@ -1 +1 @@
-1.17
+1.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.17/changelog new/mkdud-1.18/changelog
--- old/mkdud-1.17/changelog2015-03-04 13:39:59.0 +0100
+++ new/mkdud-1.18/changelog2015-04-30 15:19:35.0 +0200
@@ -1,3 +1,7 @@
+2015-04-30:1.18
+ - clarify iso usage in README
+ - support creating duds in iso9660 format
+
2015-03-04:1.17
- adjust permissions of gpg dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.17/mkdud new/mkdud-1.18/mkdud
--- old/mkdud-1.17/mkdud2015-03-04 13:39:59.0 +0100
+++ new/mkdud-1.18/mkdud2015-04-30 15:19:35.0 +0200
@@ -104,6 +104,7 @@
sub cleanup_old_duds;
sub new_dud;
sub analyze_ycp_files;
+sub set_mkisofs_metadata;
sub write_dud;
sub fix_duds;
sub show_dud;
@@ -133,6 +134,10 @@
my $opt_sign_direct;
my $opt_sign_key;
my $opt_dud_prefix;
+my $opt_vendor;
+my $opt_preparer;
+my $opt_application;
+my $opt_volume;
# global variables
my $dud;
@@ -176,6 +181,10 @@
'force'= \$opt_force,
'format=s' = \$opt_format,
'prefix=i' = \$opt_dud_prefix,
+ 'volume=s' = \$opt_volume,
+ 'vendor=s' = \$opt_vendor,
+ 'preparer=s' = \$opt_preparer,
+ 'application=s'= \$opt_application,
'save-temp'= \$opt_save_temp,
'version' = sub { print $VERSION\n; exit 0 },
'help' = sub { usage 0 },
@@ -362,7 +371,7 @@
--force Allow driver update to contain files that
might break the
installation. mkdud will normally remove those
files and
print a warning. Use this option to override.
- --format FORMAT Specify archive format for DUD.
FORMAT=(cpio|tar)[.(gz|xz)].
+ --format FORMAT Specify archive format for DUD.
FORMAT=(cpio|tar|iso)[.(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.
@@ -370,6 +379,10 @@
--detached-sign Sign the driver update. This creates a
detached signature.
--sign-key KEY_FILE Use this key for signing. Alternatively, use
the
'sign-key' entry in ~/.mkdudrc.
+ --volume Set
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-03-05 15:43:08
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-14
13:56:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-03-05
18:17:15.0 +0100
@@ -1,0 +2,6 @@
+Wed Mar 4 13:40:45 CET 2015 - snw...@suse.com
+
+- adjust permissions of gpg dir
+- 1.17
+
+---
Old:
mkdud-1.16.tar.xz
New:
mkdud-1.17.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.4VdFNi/_old 2015-03-05 18:17:15.0 +0100
+++ /var/tmp/diff_new_pack.4VdFNi/_new 2015-03-05 18:17:15.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.16
+Version:1.17
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.16.tar.xz - mkdud-1.17.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.16/VERSION new/mkdud-1.17/VERSION
--- old/mkdud-1.16/VERSION 2015-02-13 12:01:53.0 +0100
+++ new/mkdud-1.17/VERSION 2015-03-04 13:39:59.0 +0100
@@ -1 +1 @@
-1.16
+1.17
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.16/changelog new/mkdud-1.17/changelog
--- old/mkdud-1.16/changelog2015-02-13 12:01:53.0 +0100
+++ new/mkdud-1.17/changelog2015-03-04 13:39:59.0 +0100
@@ -1,3 +1,6 @@
+2015-03-04:1.17
+ - adjust permissions of gpg dir
+
2015-02-13:1.16
- added --prefix option to let users choose the directory prefix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.16/mkdud new/mkdud-1.17/mkdud
--- old/mkdud-1.16/mkdud2015-02-13 12:01:53.0 +0100
+++ new/mkdud-1.17/mkdud2015-03-04 13:39:59.0 +0100
@@ -219,6 +219,7 @@
my $tmp_err = $tmp-file('err');
my $tmp_archive = $tmp-file('dud.xxx');
$sign_key_dir = $tmp-dir('gpg');
+chmod 0700, $sign_key_dir;
set_format;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mkdud for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-02-14
13:56:33.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.X7Kbni/_new 2015-02-14 13:56:34.0 +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.0 +0100
+++ new/mkdud-1.16/README 2015-02-13 12:01:53.0 +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.0 +0100
+++ new/mkdud-1.16/VERSION 2015-02-13 12:01:53.0 +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/changelog2015-02-11 11:28:25.0 +0100
+++ new/mkdud-1.16/changelog2015-02-13 12:01:53.0 +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/mkdud2015-02-11 11:28:25.0 +0100
+++ new/mkdud-1.16/mkdud2015-02-13 12:01:53.0 +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 NUMSet repository priority to NUM (default: 50).
+ -p, --prio NUMSet 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
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-02-11 16:46:06
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-10
20:23:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-02-11
16:46:10.0 +0100
@@ -1,0 +2,6 @@
+Wed Feb 11 11:42:33 CET 2015 - snw...@suse.com
+
+- create and read directly (non-detached) signed updates
+- 1.15
+
+---
Old:
mkdud-1.14.tar.xz
New:
mkdud-1.15.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.VieQuh/_old 2015-02-11 16:46:11.0 +0100
+++ /var/tmp/diff_new_pack.VieQuh/_new 2015-02-11 16:46:11.0 +0100
@@ -23,7 +23,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.14
+Version:1.15
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.14.tar.xz - mkdud-1.15.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.14/VERSION new/mkdud-1.15/VERSION
--- old/mkdud-1.14/VERSION 2015-02-09 14:13:17.0 +0100
+++ new/mkdud-1.15/VERSION 2015-02-11 11:28:25.0 +0100
@@ -1 +1 @@
-1.14
+1.15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.14/changelog new/mkdud-1.15/changelog
--- old/mkdud-1.14/changelog2015-02-09 14:13:17.0 +0100
+++ new/mkdud-1.15/changelog2015-02-11 11:28:25.0 +0100
@@ -1,3 +1,6 @@
+2015-02-11:1.15
+ - create and read directly (non-detached) signed updates
+
2015-02-09:1.14
- support creating signed driver updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.14/mkdud new/mkdud-1.15/mkdud
--- old/mkdud-1.14/mkdud2015-02-09 14:13:17.0 +0100
+++ new/mkdud-1.15/mkdud2015-02-11 11:28:25.0 +0100
@@ -130,6 +130,7 @@
my @opt_condition;
my $opt_format;
my $opt_sign;
+my $opt_sign_direct;
my $opt_sign_key;
# global variables
@@ -142,6 +143,7 @@
my $format_archive = cpio;
my $format_compr = gz;
my $sign_key_dir;
+my $sign_key_ok;
# linuxrc versions in service packs
my $servicepack;
@@ -167,7 +169,8 @@
'may-replace-yast' = \$opt_force,
'no-docs' = \$opt_no_docs,
'keep-docs'= sub { $opt_no_docs = 0 },
- 'sign' = \$opt_sign,
+ 'detached-sign'= \$opt_sign,
+ 'sign' = sub { $opt_sign = 1; $opt_sign_direct = 1 },
'sign-key=s' = \$opt_sign_key,
'force'= \$opt_force,
'format=s' = \$opt_format,
@@ -213,6 +216,7 @@
my $tmp_mnt = $tmp-dir('mnt');
my $tmp_err = $tmp-file('err');
my $tmp_archive = $tmp-file('dud.xxx');
+$sign_key_dir = $tmp-dir('gpg');
set_format;
@@ -357,7 +361,8 @@
--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.
- --signSign the driver update. This creates a
detached signature.
+ --signSign 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
'sign-key' entry in ~/.mkdudrc.
@@ -474,6 +479,8 @@
local $_;
my $dud;
my @i;
+ my $gpg = gpg --homedir=$sign_key_dir --yes --output - 2/dev/null;
+ my $gpg_sign;
if(!-e $_[0]) {
print STDERR $_[0]: error: no such file or directory\n;
@@ -620,6 +627,21 @@
return;
}
}
+ else {
+for (`gpg --homedir=$sign_key_dir --verify $_[0] 21`) {
+ chomp;
+ $gpg_sign = $1, last if /^gpg: Signature made\s*(.*)$/;
+}
+if($gpg_sign) {
+ my $z = `$gpg $_[0] | file -b -`;
+ if($z =~ /^(gzip|XZ) compressed data/) {
+my $cmd = \L$1;
+my $f = $cmd ne 'gzip' ? $cmd : 'gz';
+my $z = `$gpg $_[0] | $cmd -dc | file -b -`;
+$dud = $1.$f if $z =~ / (cpio|tar) archive/;
+ }
+}
+ }
if($dud) {
my $duds = 0;
@@ -632,7 +654,12 @@
my $compr = 'cat';
$compr = 'gzip -dc' if $3 eq 'gz';
$compr = 'xz -dc' if $3 eq 'xz';
- system $compr $_[0] | ( cd $old ;
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-02-10 20:23:08
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-01-27
09:09:21.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-02-10
20:23:09.0 +0100
@@ -1,0 +2,6 @@
+Mon Feb 9 14:16:09 CET 2015 - snw...@suse.com
+
+- support creating signed driver updates
+- 1.14
+
+---
Old:
mkdud-1.13.tar.xz
New:
mkdud-1.14.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.4N8q8v/_old 2015-02-10 20:23:10.0 +0100
+++ /var/tmp/diff_new_pack.4N8q8v/_new 2015-02-10 20:23:10.0 +0100
@@ -19,10 +19,11 @@
Name: mkdud
BuildRequires: xz
+Requires: gpg2
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.13
+Version:1.14
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.13.tar.xz - mkdud-1.14.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.13/README new/mkdud-1.14/README
--- old/mkdud-1.13/README 2015-01-26 16:35:56.0 +0100
+++ new/mkdud-1.14/README 2015-02-09 14:13:17.0 +0100
@@ -120,3 +120,14 @@
boot medium to apply it (literally: 'cat my.dud initrd'). No need for a
'dud' boot option in this case.
+
+5. Signature
+
+
+When downloading a driver update the installer will verify the integrity of
+the update by checking the (detached) signature.
+
+Note that for sle11 due to a limitation in the installer you can only sign
+an uncompressed update. sle12/openSUSE 13.2 and later don't have this
+limitation.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.13/VERSION new/mkdud-1.14/VERSION
--- old/mkdud-1.13/VERSION 2015-01-26 16:35:56.0 +0100
+++ new/mkdud-1.14/VERSION 2015-02-09 14:13:17.0 +0100
@@ -1 +1 @@
-1.13
+1.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.13/changelog new/mkdud-1.14/changelog
--- old/mkdud-1.13/changelog2015-01-26 16:35:56.0 +0100
+++ new/mkdud-1.14/changelog2015-02-09 14:13:17.0 +0100
@@ -1,4 +1,7 @@
-2015-01-26:8bc57e17bc620def784a8130c98d349054c6823d-1.13
+2015-02-09:1.14
+ - support creating signed driver updates
+
+2015-01-26:1.13
- fix git2log script
2015-01-26:1.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.13/git2log new/mkdud-1.14/git2log
--- old/mkdud-1.13/git2log 2015-01-26 16:35:56.0 +0100
+++ new/mkdud-1.14/git2log 2015-02-09 14:13:17.0 +0100
@@ -64,10 +64,16 @@
@tags = get_branch_tags;
die no tags at all?\n unless @tags;
-if(!grep { /^$branch\-/ } @tags) {
- $branch = get_parent_branch;
- die sorry, can't determine branch\n unless $branch;
+if($branch ne 'master') {
+ if(!grep { /^$branch\-/ } @tags) {
+$branch = get_parent_branch;
+die sorry, can't determine branch\n unless $branch;
+@tags = get_branch_tags;
+die no tags at all?\n unless @tags;
+ }
+}
+else {
@tags = get_branch_tags;
die no tags at all?\n unless @tags;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.13/mkdud new/mkdud-1.14/mkdud
--- old/mkdud-1.13/mkdud2015-01-26 16:35:56.0 +0100
+++ new/mkdud-1.14/mkdud2015-02-09 14:13:17.0 +0100
@@ -111,7 +111,10 @@
sub show_single_dir;
sub get_service_pack;
sub set_format;
+sub import_sign_key;
+sub sign_file;
+my %config;
my $opt_create;
my $opt_show;
my @opt_dist;
@@ -126,6 +129,8 @@
my @opt_config;
my @opt_condition;
my $opt_format;
+my $opt_sign;
+my $opt_sign_key;
# global variables
my $dud;
@@ -136,6 +141,7 @@
my $use_all_archs = 0;
my $format_archive = cpio;
my $format_compr = gz;
+my $sign_key_dir;
# linuxrc versions in service packs
my $servicepack;
@@ -161,6 +167,8 @@
'may-replace-yast' = \$opt_force,
'no-docs' = \$opt_no_docs,
'keep-docs'= sub { $opt_no_docs = 0 },
+ 'sign' = \$opt_sign,
+ 'sign-key=s' = \$opt_sign_key,
'force'= \$opt_force,
'format=s' = \$opt_format,
'save-temp'= \$opt_save_temp,
@@ -182,6 +190,21 @@
@opt_arch = map {
commit mkdud for openSUSE:Factory
Hello community,
here is the log from the commit of package mkdud for openSUSE:Factory checked
in at 2015-01-27 09:09:18
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-01-22
00:58:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkdud.new/mkdud.changes 2015-01-27
09:09:21.0 +0100
@@ -1,0 +2,18 @@
+Mon Jan 26 16:41:08 CET 2015 - snw...@suse.com
+
+- fix git2log script
+- 1.13
+
+---
+Mon Jan 26 16:23:15 CET 2015 - snw...@suse.com
+
+- updated git2log script
+- 1.12
+
+---
+Mon Jan 26 16:20:32 CET 2015 - snw...@suse.com
+
+- Fix typo
+- 1.11
+
+---
Old:
mkdud-1.10.tar.xz
New:
mkdud-1.13.tar.xz
Other differences:
--
++ mkdud.spec ++
--- /var/tmp/diff_new_pack.MtN7xp/_old 2015-01-27 09:09:21.0 +0100
+++ /var/tmp/diff_new_pack.MtN7xp/_new 2015-01-27 09:09:21.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mkdud
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Steffen Winterfeldt
#
# All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
Summary:Create driver update from rpms
License:GPL-3.0+
Group: Hardware/Other
-Version:1.10
+Version:1.13
Release:0
Source: %{name}-%{version}.tar.xz
Url:https://github.com/wfeldt/mkdud
++ mkdud-1.10.tar.xz - mkdud-1.13.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.10/Makefile new/mkdud-1.13/Makefile
--- old/mkdud-1.10/Makefile 2014-10-13 15:35:15.0 +0200
+++ new/mkdud-1.13/Makefile 2015-01-26 16:35:56.0 +0100
@@ -1,13 +1,14 @@
GIT2LOG:= $(shell if [ -x ./git2log ] ; then echo ./git2log --update ;
else echo true ; fi)
GITDEPS:= $(shell [ -d .git ] echo .git/HEAD .git/refs/heads
.git/refs/tags)
VERSION:= $(shell $(GIT2LOG) --version VERSION ; cat VERSION)
-BRANCH := $(shell git branch | perl -ne 'print $$_ if s/^\*\s*//')
+BRANCH := $(shell [ -d .git ] git branch | perl -ne 'print $$_ if
s/^\*\s*//')
PREFIX := mkdud-$(VERSION)
BINDIR = /usr/bin
all:archive
archive: changelog
+ @if [ ! -d .git ] ; then echo no git repo ; false ; fi
mkdir -p package
git archive --prefix=$(PREFIX)/ $(BRANCH) package/$(PREFIX).tar
tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root
--mtime=`git show -s --format=%ci` --transform='s:^:$(PREFIX)/:' VERSION
changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.10/README new/mkdud-1.13/README
--- old/mkdud-1.10/README 2014-10-13 15:35:15.0 +0200
+++ new/mkdud-1.13/README 2015-01-26 16:35:56.0 +0100
@@ -28,7 +28,7 @@
preferred.
Method (b) has the advantage that the old packages are never installed and
-used and conficts and dependencies are automatically resolved (think of
+used and conflicts and dependencies are automatically resolved (think of
different kernel flavors).
This script supports both ways.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.10/VERSION new/mkdud-1.13/VERSION
--- old/mkdud-1.10/VERSION 2014-10-13 15:35:15.0 +0200
+++ new/mkdud-1.13/VERSION 2015-01-26 16:35:56.0 +0100
@@ -1 +1 @@
-1.10
+1.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.10/changelog new/mkdud-1.13/changelog
--- old/mkdud-1.10/changelog2014-10-13 15:35:15.0 +0200
+++ new/mkdud-1.13/changelog2015-01-26 16:35:56.0 +0100
@@ -1,3 +1,12 @@
+2015-01-26:8bc57e17bc620def784a8130c98d349054c6823d-1.13
+ - fix git2log script
+
+2015-01-26:1.12
+ - updated git2log script
+
+2015-01-20:1.11
+ - Fix typo
+
2014-10-13:1.10
- added 'archive' Makefile target
- updated git2log script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkdud-1.10/git2log new/mkdud-1.13/git2log
--- old/mkdud-1.10/git2log 2014-10-13 15:35:15.0 +0200
+++ new/mkdud-1.13/git2log 2015-01-26 16:35:56.0 +0100
@@ -1,5 +1,7 @@
#! /usr/bin/perl
+use strict;
+
use Getopt::Long;
use Data::Dumper;
@@
