Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-10-14 07:10:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-11 22:41:45.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-10-14 07:10:24.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 13 14:11:09 CEST 2014 - [email protected]
+
+- updated git2log script
+- 14.147
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.146.tar.xz
New:
----
installation-images-14.147.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.lW6DIT/_old 2014-10-14 07:10:25.000000000 +0200
+++ /var/tmp/diff_new_pack.lW6DIT/_new 2014-10-14 07:10:25.000000000 +0200
@@ -358,10 +358,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.146
+Version: 14.147
Release: 0
Provides: installation-images = %version-%release
-Source: installation-images-14.146.tar.xz
+Source: installation-images-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.146.tar.xz -> installation-images-14.147.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/.gitignore
new/installation-images-14.147/.gitignore
--- old/installation-images-14.146/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/installation-images-14.147/.gitignore 2014-10-13 14:10:35.000000000
+0200
@@ -0,0 +1,3 @@
+changelog
+Changelog
+VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/MAINTAINER
new/installation-images-14.147/MAINTAINER
--- old/installation-images-14.146/MAINTAINER 1970-01-01 01:00:00.000000000
+0100
+++ new/installation-images-14.147/MAINTAINER 2014-10-13 14:10:35.000000000
+0200
@@ -0,0 +1 @@
+Steffen Winterfeldt ([email protected])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/VERSION
new/installation-images-14.147/VERSION
--- old/installation-images-14.146/VERSION 2014-10-10 12:05:18.000000000
+0200
+++ new/installation-images-14.147/VERSION 2014-10-13 14:10:35.000000000
+0200
@@ -1 +1 @@
-14.146
+14.147
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/bin/ci_y2image_for_ppc
new/installation-images-14.147/bin/ci_y2image_for_ppc
--- old/installation-images-14.146/bin/ci_y2image_for_ppc 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.147/bin/ci_y2image_for_ppc 2014-10-13
14:10:35.000000000 +0200
@@ -0,0 +1,52 @@
+#! /bin/sh
+set -x
+# check in y2image to /work/src/done/PPC
+# it creates the initrd, used in k_deflt etc.
+# call from the installation-images directory
+
+ver=`cat VERSION`
+y2image_tmpdir=/tmp/y2image-$ver
+work_done=/work/src/done/PPC/y2image
+work_SRC=/work/SRC/arch/ppc/y2image
+
+if [ "$ver" = "" ] ; then
+ echo "no version info?"
+ exit 1
+fi
+
+echo "going to check in y2image version $ver..."
+
+make clean
+[ -e $y2image_tmpdir ] && rm -rf $y2image_tmpdir
+mkdir $y2image_tmpdir || exit 1
+tar -cf - * | tar -C $y2image_tmpdir -xf -
+cd $y2image_tmpdir
+find . -depth -name CVS -exec rm -r {} \;
+find . -depth -name .cvsignore -exec rm -r {} \;
+rm -rf bin/ci_* MAINTAINER cache data/boot/linux.loopc
+cd /tmp
+
+tar -jcf $y2image_tmpdir.tar.bz2 y2image-$ver
+
+if [ "$1" = test ] ; then
+ echo "y2image directory tree: $y2image_tmpdir"
+ exit
+fi
+
+if mkdir $work_done ; then
+ cd $work_done
+ cp $y2image_tmpdir.tar.bz2 ${work_SRC}/y2image.{changes,spec} .
+ [ -f ${work_SRC}/config-dist.sh ] && cp ${work_SRC}/config-dist.sh .
+ perl -pi -e 's/^(Version:\s+)\S+/${1}'$ver'/' ${work_done}/y2image.spec
+ perl -pi -e 's/^(Source.+-)\S+?(\.tar\.bz2)/${1}'$ver'${2}/'
${work_done}/y2image.spec
+ sleep 2
+ . /work/src/bin/.profile
+ vc y2image
+ rm -fv ${work_done}/*~
+ pwd
+ check_if_valid_source_dir
+ echo "ok"
+else
+ echo oops
+ exit 1
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/changelog
new/installation-images-14.147/changelog
--- old/installation-images-14.146/changelog 2014-10-10 12:05:55.000000000
+0200
+++ new/installation-images-14.147/changelog 2014-10-13 14:10:35.000000000
+0200
@@ -1,3 +1,6 @@
+2014-10-13: 14.147
+ - updated git2log script
+
2014-10-10: 14.146
- add grub2-mkpasswd-pbkdf2 to inst-sys (bnc 900358)
- added 'archive' target to Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.146/git2log
new/installation-images-14.147/git2log
--- old/installation-images-14.146/git2log 1970-01-01 01:00:00.000000000
+0100
+++ new/installation-images-14.147/git2log 2014-10-13 14:10:35.000000000
+0200
@@ -0,0 +1,205 @@
+#! /usr/bin/perl
+
+use Getopt::Long;
+
+use Data::Dumper;
+$Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Terse = 1;
+$Data::Dumper::Indent = 1;
+
+sub usage;
+
+usage 0 if !@ARGV;
+
+@deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags );
+
+GetOptions(
+ 'help' => sub { usage 0 },
+ 'version' => \$opt_version,
+ 'update' => \$opt_update,
+ 'log|changelog' => \$opt_log,
+) || usage 1;
+
+usage 1 if @ARGV > 1 || !($opt_log || $opt_version);
+$opt_file = @ARGV ? shift : '-';
+
+die "no git repo\n" unless -d ".git";
+
+if($opt_update && $opt_file ne '-' && -f($opt_file)) {
+ $ok = 1;
+
+ $t = (stat $opt_file)[9];
+
+ for (@deps) {
+ $ok = 0 if (stat)[9] > $t;
+ }
+
+ exit 0 if $ok;
+}
+
+for (`git branch`) {
+ if(/^\*\s+(\S+)/) {
+ $branch = $1;
+ last;
+ }
+}
+
+$branch = "master" if $branch eq '(no';
+
+die "no branch?\n" unless $branch;
+
+# print STDERR "writing log for branch $branch\n";
+
+@tags = `git tag`;
+
+chomp @tags;
+
+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 = sort @ntags;
+
+die "no tags at all?\n" unless @tags;
+
+$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;
+}
+
+$current_version =~ s/^$branch\-//;
+
+if($opt_version) {
+ open F, ">$opt_file";
+ print F "$current_version\n";
+ close F;
+
+ exit 0;
+}
+
+if($branch ne 'master') {
+ for ($i = 0; $i < @tags; $i++) {
+ if($tags[$i] =~ /^$branch\-(\S+)/) {
+ $i2 = $i;
+ $bi = $1;
+ last;
+ }
+ }
+
+ # print STDERR ">> $branch-$bi\n";
+
+ warn "no tags in this branch yet\n" unless $bi;
+
+ for ($i = 0; $i < $i2; $i++) {
+ if($tags[$i] ge $bi) {
+ if($tags[$i] eq $bi) {
+ $i1 = $i;
+ }
+ elsif($i > 0) {
+ $i1 = $i - 1;
+ }
+ last;
+ }
+ }
+
+ splice @tags, $i1, $i2 - $i1;
+}
+
+map { s/(\d+)/$1 + 0/eg } @tags;
+
+push @tags, "HEAD";
+
+# print Dumper(\@tags);
+
+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]'`;
+
+ # print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t, "---\n";
+
+ undef @t2;
+ $merge = 0;
+ for (@t) {
+ $merge = 1 if /^Merge: /;
+ $merge = 0 if /^commit /;
+ push @t2, $_ if !$merge;
+ }
+ @t = @t2;
+
+ undef @t2;
+ $detail = 0;
+ for (@t) {
+ $detail = 1 if /^ $/;
+ $detail = 0 if /^commit /;
+ if($detail && /^ [^\-\s]/) {
+ # push @t2, "# $_";
+ }
+ else {
+ push @t2, $_;
+ }
+ }
+ @t = @t2;
+
+ # print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t;
+
+ chomp @t;
+ for (@t) {
+ if(/^Date:\s*(\S+)/) {
+ $date = $1;
+ last;
+ }
+ }
+ @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/\(#/(bnc #/g } @t;
+ map { s/bug\s*#/bnc #/g } @t;
+ map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t;
+ map { s/^ {4}// } @t;
+ map { s/^ {8}// } @t;
+ map { s/^ +/ / } @t;
+ map { s/^\s*[+\-][\-\s]*/- / } @t;
+ map { s/^([^ \-])/- $1/ } @t;
+ map { s/^/\t/ } @t;
+ map { s/\\'/'/ } @t;
+
+# print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t);
+
+ $t = $tags[$i];
+ $t = "${branch}-$t" if $branch ne 'master' && $t eq "HEAD";
+ $t =~ s/HEAD/$current_version/;
+ print F "$date:\t$t\n";
+ print F join("\n", @t), "\n\n";
+ }
+}
+
+close F;
+
+sub usage
+{
+ my $err = shift;
+
+ print <<" usage";
+Usage: git2log [OPTIONS] [FILE]
+Create changelog and project version from git repo.
+ --changelog Write changelog to FILE.
+ --version Write version number to FILE.
+ --update Write changelog or version only if FILE is outdated.
+ --help Print this help text.
+ usage
+
+ exit $err;
+}
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
