Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-04-13 13:13:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2014-04-05 14:43:07.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-04-13 13:13:27.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Apr 10 11:32:56 CEST 2014 - [email protected]
+
+- added raleway-fonts (used by new yast theme)
+
+-------------------------------------------------------------------
+Mon Apr 7 10:12:48 CEST 2014 - [email protected]
+
+- no perl in initrd
+- fix Makefile
+
+-------------------------------------------------------------------
+Mon Apr 7 09:46:10 CEST 2014 - [email protected]
+
+- switch to xz for initrd compression
+- adjust module config
+- simplify initrd creation
+- keep original yast script out of the way
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.73.tar.bz2
New:
----
installation-images-14.76.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.3UmxvR/_old 2014-04-13 13:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.3UmxvR/_new 2014-04-13 13:13:28.000000000 +0200
@@ -45,6 +45,7 @@
BuildRequires: openSUSE-release
BuildRequires: openSUSE-release-mini
%endif
+BuildRequires: raleway-fonts
BuildRequires: kdump
BuildRequires: Mesa
BuildRequires: Mesa-libEGL1
@@ -354,10 +355,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.73
+Version: 14.76
Release: 0
Provides: installation-images = %version-%release
-Source: installation-images-14.73.tar.bz2
+Source: installation-images-14.76.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.73.tar.bz2 -> installation-images-14.76.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/Makefile
new/installation-images-14.76/Makefile
--- old/installation-images-14.73/Makefile 2014-03-14 13:22:34.000000000
+0100
+++ new/installation-images-14.76/Makefile 2014-04-07 10:03:32.000000000
+0200
@@ -84,10 +84,10 @@
theme=$(THEMES) nostrip=1 libdeps=base image=base fs=none bin/mk_image
biostest: base
- theme=$(THEMES) libdeps=initrd,biostest image=biostest src=initrd
fs=cpio.gz disjunct=initrd bin/mk_image
+ theme=$(THEMES) libdeps=initrd,biostest image=biostest src=initrd
fs=cpio.xz disjunct=initrd bin/mk_image
initrd: base
- theme=$(THEMES) libdeps=initrd image=initrd-base.gz tmpdir=initrd
src=initrd filelist=initrd fs=cpio.gz bin/mk_image
+ theme=$(THEMES) libdeps=initrd image=initrd-base.xz tmpdir=initrd
src=initrd filelist=initrd fs=cpio.xz bin/mk_image
[ -s tmp/initrd/bin/bash ]
modules: base
@@ -104,19 +104,11 @@
bin/mlist1
bin/mlist2
rm -rf tmp/initrd/modules tmp/initrd/lib/modules
- mode=keep,add image=$${image:-initrd} tmpdir=initrd filelist=modules
src=initrd fs=cpio bin/mk_image
+ mode=add tmpdir=initrd image=modules src=initrd fs=none bin/mk_image
mkdir -p images/module-config/$${MOD_CFG:-default}
ls -I module.config tmp/initrd/modules | sed -e 's#.*/##'
>images/module-config/$${MOD_CFG:-default}/module.list
cp tmp/initrd/modules/module.config
images/module-config/$${MOD_CFG:-default}
- # now theme it
- for theme in $(THEMES) ; do \
- cp images/$${image:-initrd} images/$$theme/$${image:-initrd} ; \
- i=`pwd` ; ( cd tmp/initrd-$$theme ; find . | cpio --quiet -o -H newc
-A -F $$i/images/$$theme/$${image:-initrd} ) ; \
- gzip -9f images/$$theme/$${image:-initrd} ; mv
images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \
- done
- rm -f images/$${image:-initrd}
- # still ok?
- [ -s tmp/initrd/bin/bash ]
+ mode=keep image=$(THEMES)/$${image:-initrd} tmpdir=initrd fs=cpio.xz
bin/mk_image
initrd+modules+gefrickel: base
image=modules-config src=initrd fs=none bin/mk_image
@@ -125,19 +117,12 @@
rm -rf tmp/initrd/modules tmp/initrd/lib/modules tmp/initrd_gefrickel
# work on a copy to not modify the origial tree
cp -a tmp/initrd tmp/initrd_gefrickel
- mode=keep,add image=$${image:-initrd} tmpdir=initrd_gefrickel
filelist=modules src=initrd fs=none bin/mk_image
+ mode=add tmpdir=initrd_gefrickel image=modules src=initrd fs=none
bin/mk_image
mkdir -p images/module-config/$${MOD_CFG:-default}
ls -I module.config tmp/initrd_gefrickel/modules | sed -e 's#.*/##'
>images/module-config/$${MOD_CFG:-default}/module.list
cp tmp/initrd_gefrickel/modules/module.config
images/module-config/$${MOD_CFG:-default}
./gefrickel tmp/initrd_gefrickel
- mode=keep image=$${image:-initrd} tmpdir=initrd_gefrickel src=initrd
filelist=initrd fs=cpio bin/mk_image
- # now theme it
- for theme in $(THEMES) ; do \
- cp images/$${image:-initrd} images/$$theme/$${image:-initrd} ; \
- i=`pwd` ; ( cd tmp/initrd-$$theme ; find . | cpio --quiet -o -H newc
-A -F $$i/images/$$theme/$${image:-initrd} ) ; \
- gzip -9f images/$$theme/$${image:-initrd} ; mv
images/$$theme/$${image:-initrd}.gz images/$$theme/$${image:-initrd} ; \
- done
- rm -f images/$${image:-initrd}
+ mode=keep image=$(THEMES)/$${image:-initrd} tmpdir=initrd_gefrickel
fs=cpio.xz bin/mk_image
kernel: base
image=vmlinuz-$${MOD_CFG:-default} src=initrd filelist=kernel
kernel=kernel-$${MOD_CFG:-default} fs=dir bin/mk_image
@@ -200,9 +185,7 @@
done
initrd-themes: base
- for theme in $(THEMES) ; do \
- theme=$$theme image=$$theme/install-initrd tmpdir=initrd-$$theme
src=initrd filelist=theme fs=dir bin/mk_image ; \
- done
+ mkdir -p images/$(THEMES)/install-initrd
root-themes: base
for theme in $(THEMES) ; do \
@@ -259,7 +242,7 @@
install-initrd:
-@rm -rf $(DESTDIR)
@mkdir -p $(DESTDIR)/default
- cp images/initrd-base.gz $(DESTDIR)
+ cp images/initrd-base.xz $(DESTDIR)
cp -a images/module-config/* $(DESTDIR)
for theme in $(THEMES) ; do \
cp -a images/$$theme/install-initrd $(DESTDIR)/$$theme ; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/VERSION
new/installation-images-14.76/VERSION
--- old/installation-images-14.73/VERSION 2014-04-03 12:01:38.000000000
+0200
+++ new/installation-images-14.76/VERSION 2014-04-10 11:32:49.000000000
+0200
@@ -1 +1 @@
-14.73
+14.76
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/changelog
new/installation-images-14.76/changelog
--- old/installation-images-14.73/changelog 2014-04-03 12:01:43.000000000
+0200
+++ new/installation-images-14.76/changelog 2014-04-10 11:32:54.000000000
+0200
@@ -1,4 +1,17 @@
-2014-04-03: HEAD
+2014-04-08: HEAD
+ - added raleway-fonts (used by new yast theme)
+
+2014-04-07: 14.75
+ - no perl in initrd
+ - fix Makefile
+
+2014-04-07: 14.74
+ - swtich to xz for initrd compression
+ - adjust module config
+ - simplify initrd creation
+ - keep original yast script out of the way
+
+2014-04-03: 14.73
- go for kmod
2014-04-01: 14.72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.73/data/initrd/initrd.file_list
new/installation-images-14.76/data/initrd/initrd.file_list
--- old/installation-images-14.73/data/initrd/initrd.file_list 2014-04-03
11:14:57.000000000 +0200
+++ new/installation-images-14.76/data/initrd/initrd.file_list 2014-04-07
10:09:04.000000000 +0200
@@ -88,6 +88,7 @@
update-alternatives: ignore
?dracut: ignore
?mkinitrd: ignore
+perl: ignore
samba-libs: nodeps
/usr/lib*/samba/libreplace.so
@@ -506,6 +507,9 @@
endif
+:
+
+include theme.file_list
:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/data/root/root.file_list
new/installation-images-14.76/data/root/root.file_list
--- old/installation-images-14.73/data/root/root.file_list 2014-04-03
11:15:59.000000000 +0200
+++ new/installation-images-14.76/data/root/root.file_list 2014-04-08
13:26:50.000000000 +0200
@@ -239,7 +239,7 @@
r /usr/lib/YaST2/servers_non_y2/ag_cron
s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast
s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast.ssh
- r /usr/lib/YaST2/bin/yast2
+ r /usr/sbin/yast{,2}
ruby:
/
@@ -513,6 +513,8 @@
efont-unicode-bitmap-fonts:
/usr/share/fonts/misc/b16.pcf.gz
+?raleway-fonts:
+
dmz-icon-theme-cursors:
/usr/share/icons/DMZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/etc/mkinstallinitrd
new/installation-images-14.76/etc/mkinstallinitrd
--- old/installation-images-14.73/etc/mkinstallinitrd 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.76/etc/mkinstallinitrd 2014-04-07
09:38:22.000000000 +0200
@@ -43,7 +43,7 @@
die "oops, broken install-initrd package\n" unless -d "$lib_dir/default";
-die "base file \"$opt_base.gz\" missing\n" unless -f "$lib_dir/$opt_base.gz";
+die "base file \"$opt_base.xz\" missing\n" unless -f "$lib_dir/$opt_base.xz";
mkdir "$tmp_dir/i", 0755;
@@ -125,7 +125,7 @@
# add branding
system "cp -a $lib_dir/$opt_theme/* $tmp_dir/i" if -d "$lib_dir/$opt_theme";
-system "gunzip -c $lib_dir/$opt_base.gz >$tmp_dir/initrd";
+system "xz -d -c $lib_dir/$opt_base.xz >$tmp_dir/initrd";
system "cd $tmp_dir/i ; find . | cpio --quiet -o -H newc -A -F
$tmp_dir/initrd";
@@ -135,9 +135,9 @@
rename "$tmp_dir/initrd", "$tmp_dir/$initrd";
-system "gzip -f9N '$tmp_dir/$initrd'";
+system "xz --check=crc32 -f '$tmp_dir/$initrd'";
-system "cp '$tmp_dir/$initrd'.gz $opt_file";
+system "cp '$tmp_dir/$initrd'.xz $opt_file";
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub help
@@ -151,7 +151,7 @@
" --kernel=kernel-version\tuse modules from this kernel (installed)\n" .
" --kernel-rpm=rpm\t\tuse modules from this kernel rpm\n" .
" --libdir=dir\t\t\tsearch files in directory dir\n" .
- " --initrd=foo\t\t\tuse /usr/lib/install-initrd/foo.gz as base\n" .
+ " --initrd=foo\t\t\tuse /usr/lib/install-initrd/foo.xz as base\n" .
" --theme=foo\t\t\tuse theme foo\n\n" .
"Examples:\n" .
" $p foo\n" .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/etc/module.config
new/installation-images-14.76/etc/module.config
--- old/installation-images-14.73/etc/module.config 2014-03-28
14:54:10.000000000 +0100
+++ new/installation-images-14.76/etc/module.config 2014-04-04
15:22:52.000000000 +0200
@@ -148,6 +148,12 @@
mlx4_en
inet_lro
iscsi_target_mod
+8021q
+llc
+llc2
+
+caif_virtio
+vringh
kernel/drivers/infiniband/.*
@@ -171,6 +177,7 @@
kernel/net/phonet/.*
kernel/drivers/gpu/.*
kernel/net/ceph/.*
+kernel/net/802/.*
; acpi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/etc/module.list
new/installation-images-14.76/etc/module.list
--- old/installation-images-14.73/etc/module.list 2014-03-28
14:55:52.000000000 +0100
+++ new/installation-images-14.76/etc/module.list 2014-04-04
15:22:20.000000000 +0200
@@ -226,6 +226,14 @@
kernel/drivers/target/iscsi/iscsi_target_mod.ko
kernel/drivers/infiniband/
+kernel/net/8021q/
+kernel/net/802/garp.ko
+kernel/net/802/stp.ko
+kernel/net/802/mrp.ko
+kernel/net/llc/
+
+kernel/drivers/vhost/vringh.ko
+
# kmps
updates/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.73/lib/CompressImage.pm
new/installation-images-14.76/lib/CompressImage.pm
--- old/installation-images-14.73/lib/CompressImage.pm 2014-01-21
13:24:28.000000000 +0100
+++ new/installation-images-14.76/lib/CompressImage.pm 2014-04-04
14:01:19.000000000 +0200
@@ -37,7 +37,7 @@
print "compressing $image...\n";
$prog_opt = '-cf9N' if $prog eq 'gzip';
- $prog_opt = '-cf' if $prog eq 'xz';
+ $prog_opt = '--check=crc32 -cf' if $prog eq 'xz';
die "$Script: $prog failed" if system "$prog $prog_opt '$image2'
>'$image2.tmp'";
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
