Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2015-02-05 10:59:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-02-01 12:28:17.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2015-02-05 10:59:26.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Feb 3 11:58:36 CET 2015 - [email protected]
+
+- fix dangling service links
+- 14.161
+
+-------------------------------------------------------------------
+Tue Feb 3 10:19:46 CET 2015 - [email protected]
+
+- fix git2log script
+- 14.160
+
+-------------------------------------------------------------------
+Tue Feb 3 09:56:12 CET 2015 - [email protected]
+
+- fix git2log to work if there's only a master branch
+- fix install.i386 script
+- overlayfs module comes in different names
+- reduce zenroot image size
+- 14.159
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.158.tar.xz
New:
----
installation-images-14.161.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.YaWb8y/_old 2015-02-05 10:59:27.000000000 +0100
+++ /var/tmp/diff_new_pack.YaWb8y/_new 2015-02-05 10:59:27.000000000 +0100
@@ -360,7 +360,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.158
+Version: 14.161
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
++++++ installation-images-14.158.tar.xz -> installation-images-14.161.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/Makefile
new/installation-images-14.161/Makefile
--- old/installation-images-14.158/Makefile 2015-01-30 13:56:45.000000000
+0100
+++ new/installation-images-14.161/Makefile 2015-02-03 11:09:11.000000000
+0100
@@ -13,7 +13,7 @@
COMMON_INSTSYS_PARTS := config rpmlist root common rescue bind gdb
ifneq ($(filter i386, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot
boot-themes $(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot
boot-themes $(COMMON_TARGETS) zenroot
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS := boot/* initrd biostest
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/VERSION
new/installation-images-14.161/VERSION
--- old/installation-images-14.158/VERSION 2015-01-30 13:56:45.000000000
+0100
+++ new/installation-images-14.161/VERSION 2015-02-03 11:09:11.000000000
+0100
@@ -1 +1 @@
-14.158
+14.161
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/changelog
new/installation-images-14.161/changelog
--- old/installation-images-14.158/changelog 2015-01-30 13:56:45.000000000
+0100
+++ new/installation-images-14.161/changelog 2015-02-03 11:09:11.000000000
+0100
@@ -1,4 +1,16 @@
-2015-01-30: 124e3172781dcf6e66a6d439aaf53e24fae43e24-14.158
+2015-02-03: 14.161
+ - fix dangling service links
+
+2015-02-03: 14.160
+ - fix git2log script
+
+2015-02-02: 14.159
+ - fix git2log to work if there's only a master branch
+ - fix install.i386 script
+ - overlayfs module comes in different names
+ - reduce zenroot image size
+
+2015-01-30: 14.158
- add overlayfs module
2015-01-20: 14.157
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/data/base/base.file_list
new/installation-images-14.161/data/base/base.file_list
--- old/installation-images-14.158/data/base/base.file_list 2015-01-30
13:56:45.000000000 +0100
+++ new/installation-images-14.161/data/base/base.file_list 2015-02-03
11:09:11.000000000 +0100
@@ -113,6 +113,8 @@
E prein
E postin
t etc/fstab
+ /sbin/service
+ /usr/sbin/service
yast2-trans-allpacks: requires,nodeps
x mk_yast2_trans bin/mk_yast2_trans
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.158/data/root/zenroot.file_list
new/installation-images-14.161/data/root/zenroot.file_list
--- old/installation-images-14.158/data/root/zenroot.file_list 2015-01-30
13:56:45.000000000 +0100
+++ new/installation-images-14.161/data/root/zenroot.file_list 2015-02-03
11:09:11.000000000 +0100
@@ -51,6 +51,7 @@
openSUSE-release-mini:
endif
+?grub:
bzip2:
coreutils:
cpio:
@@ -73,19 +74,14 @@
iputils:
joe:
klogd:
-kmod-compat:
-kmod:
-lilo:
lvm2:
ntfsprogs:
parted:
polkit:
procps:
reiserfs:
-suse-module-tools:
-systemd-presets-branding-<base_theme>:
-systemd-sysvinit:
-systemd:
+systemd-presets-branding-<base_theme>: ignore
+systemd-sysvinit: ignore
tar:
unzip:
usbutils:
@@ -98,11 +94,19 @@
ftp:
tftp:
checkmedia:
-?grub2-i386-pc:
-?grub2-x86_64-efi:
-?grub2-arm64-efi:
-?grub2-powerpc-ieee1275:
+?grub2-i386-pc: ignore
+?grub2-x86_64-efi: ignore
+?grub2-arm64-efi: ignore
+?grub2-powerpc-ieee1275: ignore
?grub2:
+dbus-1-x11: ignore
+kmod: ignore
+kbd: ignore
+wicked-service: ignore
+
+
+systemd:
+ /usr/lib*/libsystemd*.so.*
krb5:
/etc
@@ -223,6 +227,9 @@
:
+# remove locale
+r /usr/share/locale
+
# remove files we don't want to show up at all
r /usr/share/{doc,info,man} /usr/src/packages /var/adm/fillup-templates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/etc/module.config
new/installation-images-14.161/etc/module.config
--- old/installation-images-14.158/etc/module.config 2015-01-30
13:56:45.000000000 +0100
+++ new/installation-images-14.161/etc/module.config 2015-02-03
11:09:11.000000000 +0100
@@ -388,6 +388,7 @@
autofs4,,-
dmapi,,-
overlay,,-
+overlayfs,,-
[ppc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/git2log
new/installation-images-14.161/git2log
--- old/installation-images-14.158/git2log 2015-01-30 13:56:45.000000000
+0100
+++ new/installation-images-14.161/git2log 2015-02-03 11:09:11.000000000
+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;
}
@@ -147,12 +153,10 @@
my $detail = 0;
for (@t) {
$detail = 1 if /^ $/;
+ $detail = 2 if /^ Conflicts:$/;
$detail = 0 if /^commit /;
- if($detail && /^ [^\-\s]/) {
- # push @t2, "# $_";
- }
- else {
- push @t2, $_;
+ if(!$detail || !/^ [^\-\s]/) {
+ push @t2, $_ if $detail < 2;
}
}
@t = @t2;
@@ -170,7 +174,7 @@
# handle white space in every first line once and for all
my $empty = 1;
for (@t) {
- $empty = 1, next if $_ eq "";
+ $empty = 1, $_ = "", next if $_ =~ /^\s*$/;
next if !$empty;
s/^\s*//;
$empty = 0;
@@ -273,7 +277,7 @@
# print "parent = $p\n";
- return $p;
+ return $p || "master";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.158/install.i386
new/installation-images-14.161/install.i386
--- old/installation-images-14.158/install.i386 2015-01-30 13:56:45.000000000
+0100
+++ new/installation-images-14.161/install.i386 2015-02-03 11:09:11.000000000
+0100
@@ -92,7 +92,7 @@
cp images/zenroot $dst/root
echo "root: root" >$dst/config
cp -a $DESTDIR/CD1/boot/$ARCH/loader $DESTDIR/branding/$t/CD1/boot/$ARCH/*
$dst
- cp -a $DESTDIR/branding/$t/CD1/EFI $DESTDIR/branding/Zen/CD1
+ [ -d "$DESTDIR/branding/$t/CD1/EFI" ] && cp -a $DESTDIR/branding/$t/CD1/EFI
$DESTDIR/branding/Zen/CD1
cp data/boot/syslinux-zen.cfg $dst/loader/isolinux.cfg
cp data/boot/message-zen $dst/loader/message
fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
