Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-12-19 09:41:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11-26 10:35:41.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-12-19 09:40:29.000000000 +0100
@@ -1,0 +2,50 @@
+Tue Dec 11 15:03:53 UTC 2014 - [email protected]
+
+- Drop bind-libs from BuildRequires as they got separated into single packages.
+
+-------------------------------------------------------------------
+Thu Dec 11 15:01:55 CET 2014 - [email protected]
+
+- i586: give up on xen-kmp
+
+-------------------------------------------------------------------
+Thu Dec 11 09:11:11 CET 2014 - [email protected]
+
+- improve git2log to work with sub-branches
+- 14.155
+
+-------------------------------------------------------------------
+Thu Dec 11 09:06:13 CET 2014 - [email protected]
+
+- Rescue: bind-libs is in fact just a collection of libraries, that are
automatically required by dependencies.
+- 14.154
+
+-------------------------------------------------------------------
+Tue Dec 9 14:42:10 UTC 2014 - [email protected]
+
+- No longer exclude valgrind and ltrace on ppc64le and aarch64
+
+-------------------------------------------------------------------
+Mon Dec 8 12:10:49 CET 2014 - [email protected]
+
+- adjust s390x module config
+- 14.153
+
+-------------------------------------------------------------------
+Mon Dec 8 10:55:50 CET 2014 - [email protected]
+
+- fix Makefile
+- 14.152
+
+-------------------------------------------------------------------
+Mon Dec 8 10:50:52 CET 2014 - [email protected]
+
+- aarch64: move kernel and initrd back to boot/aarch64
+- 14.151
+
+-------------------------------------------------------------------
+Tue Nov 25 14:17:08 CET 2014 - [email protected]
+
+- enable xen on i586 (bnc #906248)
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.150.tar.xz
New:
----
installation-images-14.155.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.Ou76CA/_old 2014-12-19 09:40:30.000000000 +0100
+++ /var/tmp/diff_new_pack.Ou76CA/_new 2014-12-19 09:40:30.000000000 +0100
@@ -33,7 +33,7 @@
%bcond_without vnc
%ifarch %ix86
# FIXME: xen not working on i586
-%bcond_with xen
+%bcond_without xen
%else
%bcond_without xen
%endif
@@ -58,7 +58,6 @@
BuildRequires: arabic-kacst-fonts
BuildRequires: audit-libs
BuildRequires: bc
-BuildRequires: bind-libs
BuildRequires: bind-utils
BuildRequires: blueprint-cursor-theme
BuildRequires: btrfsprogs
@@ -224,10 +223,8 @@
BuildRequires: usbutils
BuildRequires: util-linux
BuildRequires: util-linux-systemd
-%ifnarch ppc64le aarch64
BuildRequires: ltrace
BuildRequires: valgrind
-%endif
BuildRequires: skelcd-control-%theme
BuildRequires: vim
BuildRequires: wget
@@ -268,7 +265,9 @@
BuildRequires: tftp
%if %{with xen}
BuildRequires: kernel-xen
+%ifnarch %ix86
BuildRequires: xen-kmp-default
+%endif
%else
##BuildIgnore: kernel-xen
%endif
@@ -361,7 +360,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.150
+Version: 14.155
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
++++++ installation-images-14.150.tar.xz -> installation-images-14.155.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/Makefile
new/installation-images-14.155/Makefile
--- old/installation-images-14.150/Makefile 2014-11-25 13:04:33.000000000
+0100
+++ new/installation-images-14.155/Makefile 2014-12-11 09:09:40.000000000
+0100
@@ -6,7 +6,7 @@
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 := installation-images-$(VERSION)
COMMON_TARGETS := rescue root root+rescue bind gdb mini-iso-rmlist
@@ -227,6 +227,7 @@
./install.debuginfo
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/installation-images-14.150/VERSION
new/installation-images-14.155/VERSION
--- old/installation-images-14.150/VERSION 2014-11-25 13:04:33.000000000
+0100
+++ new/installation-images-14.155/VERSION 2014-12-11 09:09:40.000000000
+0100
@@ -1 +1 @@
-14.150
+14.155
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/changelog
new/installation-images-14.155/changelog
--- old/installation-images-14.150/changelog 2014-11-25 13:04:33.000000000
+0100
+++ new/installation-images-14.155/changelog 2014-12-11 09:09:40.000000000
+0100
@@ -1,3 +1,18 @@
+2014-12-11: 124e3172781dcf6e66a6d439aaf53e24fae43e24-14.155
+ - improve git2log to work with sub-branches
+
+2014-12-10: 14.154
+ - Rescue: bind-libs is in fact just a collection of libraries, that are
automatically required by dependencies.
+
+2014-12-08: 14.153
+ - adjust s390x module config
+
+2014-12-08: 14.152
+ - fix Makefile
+
+2014-11-17: 14.151
+ - aarch64: move kernel and initrd back to boot/aarch64
+
2014-11-25: 14.150
- auto-add kernel modules needed due to module dependencies
@@ -12,7 +27,7 @@
- updated git2log script
2014-10-10: 14.146
- - add grub2-mkpasswd-pbkdf2 to inst-sys (bnc 900358)
+ - add grub2-mkpasswd-pbkdf2 to inst-sys (bnc #900358)
- added 'archive' target to Makefile
2014-10-06: 14.145
@@ -371,7 +386,7 @@
2014-03-10: 14.56
- load autoyast.xml and driver updates from OEMDRV partition (fate
#316530)
- Put grub2 on ppc media
- - add all of Xvnc package (bnc 867273)
+ - add all of Xvnc package (bnc #867273)
2014-03-06: 14.55
- add sg3_utils to initrd (bnc #866933)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/data/boot/boot.file_list
new/installation-images-14.155/data/boot/boot.file_list
--- old/installation-images-14.150/data/boot/boot.file_list 2014-11-25
13:04:33.000000000 +0100
+++ new/installation-images-14.155/data/boot/boot.file_list 2014-12-11
09:09:40.000000000 +0100
@@ -1,12 +1,10 @@
-d loader
if arch eq 'i386' || arch eq 'x86_64'
+ d loader
x syslinux.cfg /loader/isolinux.cfg
-endif
-<kernel_rpm>:
- a /boot/<kernel_img> /loader/linux
+ <kernel_rpm>:
+ a /boot/<kernel_img> /loader/linux
-if arch eq 'i386' || arch eq 'x86_64'
memtest86+:
m /boot/memtest.bin /loader/memtest
@@ -14,5 +12,10 @@
m /usr/share/syslinux/isolinux.bin /loader
m /usr/share/syslinux/gfxboot.c32 /loader
e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+
+elsif arch eq 'aarch64'
+ <kernel_rpm>:
+ a /boot/<kernel_img> /linux
+
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.150/data/rescue/rescue.file_list
new/installation-images-14.155/data/rescue/rescue.file_list
--- old/installation-images-14.150/data/rescue/rescue.file_list 2014-11-25
13:04:33.000000000 +0100
+++ new/installation-images-14.155/data/rescue/rescue.file_list 2014-12-11
09:09:40.000000000 +0100
@@ -77,7 +77,6 @@
attr:
bash:
bc:
-bind-libs:
bind-utils:
btrfsprogs:
bzip2:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/etc/module.config
new/installation-images-14.155/etc/module.config
--- old/installation-images-14.150/etc/module.config 2014-11-25
13:04:33.000000000 +0100
+++ new/installation-images-14.155/etc/module.config 2014-12-11
09:09:40.000000000 +0100
@@ -164,6 +164,7 @@
kernel/arch/.*/kernel/.*,,-
kernel/crypto/.*
kernel/drivers/crypto/.*
+kernel/drivers/.*/crypto/.*
kernel/drivers/firmware/.*
kernel/drivers/leds/.*
kernel/drivers/md/.*
@@ -644,5 +645,4 @@
veth
vmlogrdr
vmwatchdog
-ap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/git2log
new/installation-images-14.155/git2log
--- old/installation-images-14.150/git2log 2014-11-25 13:04:33.000000000
+0100
+++ new/installation-images-14.155/git2log 2014-12-11 09:09:40.000000000
+0100
@@ -1,5 +1,7 @@
#! /usr/bin/perl
+use strict;
+
use Getopt::Long;
use Data::Dumper;
@@ -8,27 +10,43 @@
$Data::Dumper::Indent = 1;
sub usage;
+sub get_branch_tags;
+sub get_branch;
+sub get_parent_branch;
+sub get_version;
usage 0 if !@ARGV;
-@deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags );
+my @deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags );
+
+my $branch;
+my $current_version;
+my @tags;
+my @all_tags;
+
+my $opt_log;
+my $opt_version;
+my $opt_branch;
+my $opt_update;
+my $opt_file;
GetOptions(
'help' => sub { usage 0 },
'version' => \$opt_version,
+ 'branch' => \$opt_branch,
'update' => \$opt_update,
'log|changelog' => \$opt_log,
) || usage 1;
-usage 1 if @ARGV > 1 || !($opt_log || $opt_version);
+usage 1 if @ARGV > 1 || !($opt_log || $opt_version || $opt_branch);
$opt_file = @ARGV ? shift : '-';
die "no git repo\n" unless -d ".git";
if($opt_update && $opt_file ne '-' && -f($opt_file)) {
- $ok = 1;
+ my $ok = 1;
- $t = (stat $opt_file)[9];
+ my $t = (stat $opt_file)[9];
for (@deps) {
$ok = 0 if (stat)[9] > $t;
@@ -37,57 +55,45 @@
exit 0 if $ok;
}
-for (`git branch`) {
- if(/^\*\s+(\S+)/) {
- $branch = $1;
- last;
- }
-}
-
-$branch = "master" if $branch eq '(no';
+@all_tags = `git tag`;
+chomp @all_tags;
+$branch = get_branch;
die "no branch?\n" unless $branch;
-# print STDERR "writing log for branch $branch\n";
-
-@tags = `git tag`;
+@tags = get_branch_tags;
+die "no tags at all?\n" unless @tags;
-chomp @tags;
+if(!grep { /^$branch\-/ } @tags) {
+ $branch = get_parent_branch;
+ die "sorry, can't determine branch\n" unless $branch;
-for (@tags) {
- if(/^\d/) {
- s/(\d+)/sprintf "%04d", $1/eg;
- push @ntags, $_;
- }
- elsif(s/^$branch\-//) {
- s/(\d+)/sprintf "%04d", $1/eg;
- push @ntags, "$branch-$_";
- }
+ @tags = get_branch_tags;
+ die "no tags at all?\n" unless @tags;
}
-@tags = sort @ntags;
-
-die "no tags at all?\n" unless @tags;
+if($opt_branch) {
+ open my $f, ">$opt_file";
+ print $f "$branch\n";
+ close $f;
-$current_version = $tags[-1];
-$current_version =~ s/(\d+)/$1 + 0/eg;
-
-if(`git log --pretty=medium --date=iso '$current_version..HEAD'`) {
- $current_version =~ s/(\d+)$/$1 + 1/e;
+ exit 0;
}
-$current_version =~ s/^$branch\-//;
+$current_version = get_version;
if($opt_version) {
- open F, ">$opt_file";
- print F "$current_version\n";
- close F;
+ open my $f, ">$opt_file";
+ print $f "$current_version\n";
+ close $f;
exit 0;
}
if($branch ne 'master') {
- for ($i = 0; $i < @tags; $i++) {
+ my ($i1, $i2, $bi);
+
+ for (my $i = 0; $i < @tags; $i++) {
if($tags[$i] =~ /^$branch\-(\S+)/) {
$i2 = $i;
$bi = $1;
@@ -99,7 +105,7 @@
warn "no tags in this branch yet\n" unless $bi;
- for ($i = 0; $i < $i2; $i++) {
+ for (my $i = 0; $i < $i2; $i++) {
if($tags[$i] ge $bi) {
if($tags[$i] eq $bi) {
$i1 = $i;
@@ -122,14 +128,14 @@
open F, ">$opt_file";
-for ($i = @tags - 1; $i > 0; $i--) {
- $date = undef;
- @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`;
+for (my $i = @tags - 1; $i > 0; $i--) {
+ my ($date, @t2);
+
+ my @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`;
# print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t, "---\n";
- undef @t2;
- $merge = 0;
+ my $merge = 0;
for (@t) {
$merge = 1 if /^Merge: /;
$merge = 0 if /^commit /;
@@ -138,7 +144,7 @@
@t = @t2;
undef @t2;
- $detail = 0;
+ my $detail = 0;
for (@t) {
$detail = 1 if /^ $/;
$detail = 0 if /^commit /;
@@ -160,10 +166,21 @@
last;
}
}
+
+ # handle white space in every first line once and for all
+ my $empty = 1;
+ for (@t) {
+ $empty = 1, next if $_ eq "";
+ next if !$empty;
+ s/^\s*//;
+ $empty = 0;
+ }
+
@t = grep { !/^(commit|Author:|Date:|Merge:|\s*$)|created.*tag/ } @t;
if(@t) {
# rewrite a bit to have it look more consistent
- map { s/(fate|bnc)#/$1 #/g } @t;
+ map { s/(fate|bnc|bsc)#/$1 #/g } @t;
+ map { s/(fate|bnc|bsc)\s*(\d{4})/$1 #$2/g } @t;
map { s/\(#/(bnc #/g } @t;
map { s/bug\s*#/bnc #/g } @t;
map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t;
@@ -175,9 +192,9 @@
map { s/^/\t/ } @t;
map { s/\\'/'/ } @t;
-# print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t);
+ # print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t);
- $t = $tags[$i];
+ my $t = $tags[$i];
$t = "${branch}-$t" if $branch ne 'master' && $t eq "HEAD";
$t =~ s/HEAD/$current_version/;
print F "$date:\t$t\n";
@@ -187,6 +204,8 @@
close F;
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub usage
{
my $err = shift;
@@ -196,6 +215,7 @@
Create changelog and project version from git repo.
--changelog Write changelog to FILE.
--version Write version number to FILE.
+ --branch Write current branch to FILE.
--update Write changelog or version only if FILE is outdated.
--help Print this help text.
usage
@@ -203,3 +223,72 @@
exit $err;
}
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_branch_tags
+{
+ my @ntags;
+
+ for (@all_tags) {
+ if(/^\d/) {
+ s/(\d+)/sprintf "%04d", $1/eg;
+ push @ntags, $_;
+ }
+ elsif(s/^$branch\-//) {
+ s/(\d+)/sprintf "%04d", $1/eg;
+ push @ntags, "$branch-$_";
+ }
+ }
+
+ return sort @ntags;
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_branch
+{
+ my $b;
+
+ for (`git branch`) {
+ if(/^\*\s+(\S+)/) {
+ $b = $1;
+ last;
+ }
+ }
+
+ $b = "master" if $b eq '(no';
+
+ return $b;
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_parent_branch
+{
+ my $p;
+
+ for (`git log -g --pretty=oneline`) {
+ $p = $1 if /checkout: moving from (\S+) to $branch/;
+ }
+
+ # print "parent = $p\n";
+
+ return $p;
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_version
+{
+ my $v = $tags[-1];
+ $v =~ s/(\d+)/$1 + 0/eg;
+
+ if(`git log --pretty=medium --date=iso '$v..HEAD'`) {
+ $v =~ s/(\d+)$/$1 + 1/e;
+ }
+
+ $v =~ s/^$branch\-//;
+
+ return $v;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.150/install.aarch64
new/installation-images-14.155/install.aarch64
--- old/installation-images-14.150/install.aarch64 2014-11-25
13:04:33.000000000 +0100
+++ new/installation-images-14.155/install.aarch64 2014-12-11
09:09:40.000000000 +0100
@@ -5,7 +5,7 @@
set -e
# create directory layout
-mkdir -p $DESTDIR/CD1/boot/$ARCH/loader
+mkdir -p $DESTDIR/CD1/boot/$ARCH
for theme in $THEMES ; do
mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH
done
@@ -25,14 +25,6 @@
mkdir -p $DESTDIR/branding/$theme/CD1/EFI/BOOT
cp -r images/$theme/EFI/EFI/BOOT/* $DESTDIR/branding/$theme/CD1/EFI/BOOT
fi
-
- # might be missing if theme does not really exist
- mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader
-
- # initrd goes to 'loader' dir
- if [ -e $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd ] ; then
- mv $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd
$DESTDIR/branding/$theme/CD1/boot/$ARCH/loader/initrd
- fi
done
mkdir -p $DESTDIR/usr/share
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
