Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-10-11 22:41:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07 18:23:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-10-11 22:41:45.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 10 12:06:00 CEST 2014 - [email protected]
+
+- add grub2-mkpasswd-pbkdf2 to inst-sys (bnc #900358)
+- added 'archive' target to Makefile
+- 14.146
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.145.tar.xz
New:
----
installation-images-14.146.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.Qxizkh/_old 2014-10-11 22:41:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Qxizkh/_new 2014-10-11 22:41:46.000000000 +0200
@@ -358,10 +358,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.145
+Version: 14.146
Release: 0
Provides: installation-images = %version-%release
-Source: installation-images-14.145.tar.xz
+Source: installation-images-14.146.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.145.tar.xz -> installation-images-14.146.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.145/Makefile
new/installation-images-14.146/Makefile
--- old/installation-images-14.145/Makefile 2014-10-06 10:56:05.000000000
+0200
+++ new/installation-images-14.146/Makefile 2014-10-10 11:49:25.000000000
+0200
@@ -3,7 +3,11 @@
ARCH := i386
endif
-GIT2LOG = $(shell [ -x ./git2log ] && echo ./git2log )
+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*//')
+PREFIX := installation-images-$(VERSION)
COMMON_TARGETS := rescue root root+rescue bind gdb mini-iso-rmlist
COMMON_INSTSYS_PARTS := config rpmlist root common rescue bind gdb
@@ -63,13 +67,12 @@
all: $(ALL_TARGETS) VERSION changelog
@rm images/*.log
-ifneq ($(GIT2LOG),)
-changelog: .git/HEAD .git/refs/heads .git/refs/tags
- $(GIT2LOG) --log >changelog
+changelog: $(GITDEPS)
+ $(GIT2LOG) --changelog changelog
-VERSION: .git/HEAD .git/refs/heads .git/refs/tags
- $(GIT2LOG) --version >VERSION
-endif
+version.h: VERSION
+ @echo "#define LXRC_VERSION \"`cut -d. -f1-2 VERSION`\"" >$@
+ @echo "#define LXRC_FULL_VERSION \"`cat VERSION`\"" >>$@
install:
@@ -223,13 +226,19 @@
debuginfo:
./install.debuginfo
+archive: changelog
+ 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
+ xz -f package/$(PREFIX).tar
+
clean:
-@make -C src/mboot clean
-@make -C src/eltorito clean
-@rm -rf images tmp
-@rm -f `find -name '*~'`
-@rm -rf /tmp/mk_initrd_* /tmp/mk_image_*
- -@rm -rf data/initrd/gen data/boot/gen data/base/gen data/cd1/gen
+ -@rm -rf data/initrd/gen data/boot/gen data/base/gen data/cd1/gen
package
-@rm -f gpg/trustdb.gpg gpg/random_seed
install:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.145/VERSION
new/installation-images-14.146/VERSION
--- old/installation-images-14.145/VERSION 2014-10-06 11:36:41.000000000
+0200
+++ new/installation-images-14.146/VERSION 2014-10-10 12:05:18.000000000
+0200
@@ -1 +1 @@
-14.145
+14.146
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.145/changelog
new/installation-images-14.146/changelog
--- old/installation-images-14.145/changelog 2014-10-06 11:37:21.000000000
+0200
+++ new/installation-images-14.146/changelog 2014-10-10 12:05:55.000000000
+0200
@@ -1,3 +1,7 @@
+2014-10-10: 14.146
+ - add grub2-mkpasswd-pbkdf2 to inst-sys (bnc 900358)
+ - added 'archive' target to Makefile
+
2014-10-06: 14.145
- improved git2log script
- Add boot support for aarch64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.145/data/root/root.file_list
new/installation-images-14.146/data/root/root.file_list
--- old/installation-images-14.145/data/root/root.file_list 2014-09-19
14:19:41.000000000 +0200
+++ new/installation-images-14.146/data/root/root.file_list 2014-10-10
11:51:59.000000000 +0200
@@ -184,6 +184,9 @@
/usr/lib*
r /usr/lib*/rpm-plugins/sepolicy.so
+?grub2:
+ /usr/bin/grub2-mkpasswd-pbkdf2
+
gawk:
/usr/bin/gawk
s gawk usr/bin/awk
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
