Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2016-07-01 09:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-31 12:12:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2016-07-01 09:52:03.000000000 +0200 @@ -1,0 +2,49 @@ +Tue Jun 21 11:30:24 UTC 2016 - snwint@suse.com + +- add 'make' target to build ISO image for testing +- 14.254 + +------------------------------------------------------------------- +Tue Jun 21 11:20:37 UTC 2016 - snwint@suse.com + +- fix handling of blacklisted packages +- really exclude yast2-storage when atorage-ng is selected +- support new yast storage code +- 14.253 + +------------------------------------------------------------------- +Tue Jun 21 11:10:24 UTC 2016 - snwint@suse.com + +- check if /tmp/host_name really exists (bsc#985804) +- 14.252 + +------------------------------------------------------------------- +Fri Jun 17 14:45:26 UTC 2016 - snwint@suse.com + +- handle build id in Makefile +- 14.251 + +------------------------------------------------------------------- +Wed Jun 15 14:00:23 UTC 2016 - snwint@suse.com + +- add xrandr to inst-sys and pass XVideo option to install.inf (bsc#974821) +- 14.250 + +------------------------------------------------------------------- +Wed Jun 15 11:45:24 UTC 2016 - snwint@suse.com + +- change how rubygem-byebug is added to inst-sys +- 14.249 + +------------------------------------------------------------------- +Mon Jun 13 10:45:29 UTC 2016 - snwint@suse.com + +- Add xen-tools-domU on x86 to get its udev rules (bsc#979002) +- 14.248 + +------------------------------------------------------------------- +Wed Jun 1 14:40:22 UTC 2016 - dimstar@opensuse.org + +- Up the disk constraints to 9GB. + +------------------------------------------------------------------- @@ -11,0 +61,5 @@ + +------------------------------------------------------------------- +Mon May 23 14:11:23 UTC 2016 - lnussel@suse.de + +- disable i586 on Leap Old: ---- installation-images-14.247.tar.xz New: ---- installation-images-14.254.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.e66d4u/_old 2016-07-01 09:52:04.000000000 +0200 +++ /var/tmp/diff_new_pack.e66d4u/_new 2016-07-01 09:52:04.000000000 +0200 @@ -34,8 +34,11 @@ %bcond_with xen %bcond_with xenkmp -%if %theme == SLES +# no i586 in Leap +%if %suse_version == 1315 ExcludeArch: %ix86 +%endif +%if %theme == SLES BuildRequires: sle12-desktop-migration BuildRequires: sles-release BuildRequires: sles-release-MINI @@ -248,6 +251,7 @@ BuildRequires: xntp BuildRequires: xorg-x11-fonts BuildRequires: xorg-x11-server +BuildRequires: xrandr BuildRequires: xrefresh BuildRequires: xset BuildRequires: xterm @@ -371,7 +375,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.247 +Version: 14.254 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.e66d4u/_old 2016-07-01 09:52:04.000000000 +0200 +++ /var/tmp/diff_new_pack.e66d4u/_new 2016-07-01 09:52:04.000000000 +0200 @@ -1,7 +1,7 @@ <constraints> <hardware> <disk> - <size unit="G">7</size> + <size unit="G">9</size> </disk> </hardware> </constraints> ++++++ installation-images-14.247.tar.xz -> installation-images-14.254.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/Makefile new/installation-images-14.254/Makefile --- old/installation-images-14.247/Makefile 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/Makefile 2016-06-21 13:25:17.000000000 +0200 @@ -8,6 +8,7 @@ VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) BRANCH := $(shell [ -d .git ] && git branch | perl -ne 'print $$_ if s/^\*\s*//') PREFIX := installation-images-$(VERSION) +BUILD_ID := $(shell [ -f .build_id ] || bin/build_id > .build_id ; cat .build_id) COMMON_TARGETS := rescue root root+rescue bind libstoragemgmt gdb mini-iso-rmlist COMMON_INSTSYS_PARTS := config rpmlist root common rescue bind libstoragemgmt gdb @@ -57,12 +58,12 @@ # THEMES += Zen endif -export ARCH THEMES DESTDIR INSTSYS_PARTS BOOT_PARTS WITH_FLOPPY +export ARCH THEMES DESTDIR INSTSYS_PARTS BOOT_PARTS WITH_FLOPPY BUILD_ID .PHONY: all dirs base fbase biostest initrd \ boot boot-efi root rescue root+rescue gdb bind libstoragemgmt clean \ boot-themes initrd-themes root-themes zenroot install \ - install-initrd mini-iso-rmlist debuginfo cd1 + install-initrd mini-iso-rmlist debuginfo cd1 iso all: $(ALL_TARGETS) VERSION changelog @rm images/*.log @@ -74,8 +75,6 @@ @echo "#define LXRC_VERSION \"`cut -d. -f1-2 VERSION`\"" >$@ @echo "#define LXRC_FULL_VERSION \"`cat VERSION`\"" >>$@ -install: - dirs: @[ -d images ] || ( mkdir images ; cd images ; mkdir $(THEMES) ) @[ -d tmp ] || mkdir tmp @@ -199,7 +198,14 @@ zenroot: theme=$(THEMES) libdeps=zenroot alternatives=1 image=zenroot src=root fs=squashfs bin/mk_image -cd1: base +iso: cd1 + if [ -x /usr/bin/mksusecd ] ; then \ + HOME=tmp /usr/bin/mksusecd -c images/cd1.iso tmp/cd1/CD1 ; \ + else \ + echo 'please install mksusecd package to create an ISO' ; \ + fi + +cd1: install mkdir -p data/cd1/gen rm -f data/cd1/gen/rpm.file_list for i in `cat images/rpmlist` ; do \ @@ -242,8 +248,9 @@ -@rm -rf /tmp/mk_initrd_* /tmp/mk_image_* -@rm -rf data/initrd/gen data/boot/gen data/base/gen data/cd1/gen package -@rm -f gpg/trustdb.gpg gpg/random_seed + -@rm -f .build_id -install: +install: base -@rm -rf $(DESTDIR) @mkdir -p $(DESTDIR) ./install.$(ARCH) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/VERSION new/installation-images-14.254/VERSION --- old/installation-images-14.247/VERSION 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/VERSION 2016-06-21 13:25:17.000000000 +0200 @@ -1 +1 @@ -14.247 +14.254 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/changelog new/installation-images-14.254/changelog --- old/installation-images-14.247/changelog 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/changelog 2016-06-21 13:25:17.000000000 +0200 @@ -1,3 +1,26 @@ +2016-06-21: 14.254 + - add 'make' target to build ISO image for testing + +2016-06-21: 14.253 + - fix handling of blacklisted packages + - really exclude yast2-storage when atorage-ng is selected + - support new yast storage code + +2016-06-21: 14.252 + - check if /tmp/host_name really exists (bsc #985804) + +2016-06-17: 14.251 + - handle build id in Makefile + +2016-06-15: 14.250 + - add xrandr to inst-sys and pass XVideo option to install.inf (bsc #974821) + +2016-06-15: 14.249 + - change how rubygem-byebug is added to inst-sys + +2016-06-10: 14.248 + - Add xen-tools-domU on x86 to get its udev rules (bsc #979002) + 2016-05-30: 14.247 - adjust to update-alternative package change diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/data/initrd/initrd.file_list new/installation-images-14.254/data/initrd/initrd.file_list --- old/installation-images-14.247/data/initrd/initrd.file_list 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/data/initrd/initrd.file_list 2016-06-21 13:25:17.000000000 +0200 @@ -95,6 +95,7 @@ util-linux-systemd: vlan: which: +?xen-tools-domU: if theme eq 'SLES' sles-release: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/data/initrd/theme.file_list new/installation-images-14.254/data/initrd/theme.file_list --- old/installation-images-14.247/data/initrd/theme.file_list 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/data/initrd/theme.file_list 2016-06-21 13:25:17.000000000 +0200 @@ -76,6 +76,6 @@ e echo "KexecReboot: 1" >>linuxrc.config -e echo "PTOptions: AutoUpgrade,productprofile,addon" >>linuxrc.config +e echo "PTOptions: AutoUpgrade,productprofile,addon,XVideo" >>linuxrc.config e echo -e "\n# Note: you can put config files also into /etc/linuxrc.d/." >>linuxrc.config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/data/rescue/rescue.file_list new/installation-images-14.254/data/rescue/rescue.file_list --- old/installation-images-14.247/data/rescue/rescue.file_list 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/data/rescue/rescue.file_list 2016-06-21 13:25:17.000000000 +0200 @@ -165,6 +165,7 @@ vlan: wget: ?wicked: +?xen-tools-domU: xfsdump: xfsprogs: xz: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/data/root/etc/inst_setup new/installation-images-14.254/data/root/etc/inst_setup --- old/installation-images-14.247/data/root/etc/inst_setup 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/data/root/etc/inst_setup 2016-06-21 13:25:17.000000000 +0200 @@ -56,7 +56,7 @@ # get hostname & hostips hostip_from_wicked /tmp/host_ips /tmp/host_name -host_name=`cat /tmp/host_name` +host_name=`[ -f /tmp/host_name ] && cat /tmp/host_name` # # a few files should be restored when installation has completed if we diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/data/root/root.file_list new/installation-images-14.254/data/root/root.file_list --- old/installation-images-14.247/data/root/root.file_list 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/data/root/root.file_list 2016-06-21 13:25:17.000000000 +0200 @@ -29,6 +29,12 @@ # avoid update-alternatives e cd usr/bin ; ln -snf SUSEConnect* SUSEConnect +# fix the symlinks for the Ruby debugger if it is present +TEMPLATE ruby.*-rubygem-byebug: + / + # avoid update-alternatives, remove the dangling symlinks and create a new one + e cd usr/bin ; find . -type l | grep byebug | xargs rm -rf ; ln -snf byebug.ruby* byebug + # ruby maintainers can't really make up their minds on how to name their packages... TEMPLATE ruby.*-rubygem-yard: ignore # just a template that does nothing @@ -169,6 +175,13 @@ p11-kit: ?sle12-desktop-migration: +# either new yast storage or the old one +if exists(yast2-storage-ng) + yast2-storage-ng: + libstorage7: ignore + yast2-storage: ignore +endif + if theme eq 'SLES' sles-release: sles-release-MINI: @@ -186,12 +199,6 @@ ?skelcd-control-SLES-for-VMware: ?skelcd-control-SLED: -# fix the symlinks for the Ruby debugger if it is present -?ruby*.*-rubygem-byebug: - / - # avoid update-alternatives, remove the dangling symlinks and create a new one - e cd usr/bin ; find . -type l | grep byebug | xargs rm -rf ; ln -snf byebug.ruby* byebug - rpm: /bin /etc @@ -431,6 +438,7 @@ # avoid update-alternatives e [ -f usr/<lib>/xorg/modules/extensions/xorg/xorg-libglx.so ] && ln -snf xorg/xorg-libglx.so usr/<lib>/xorg/modules/extensions/libglx.so ; true + xrandr: xf86-input-evdev: xf86-input-synaptics: ?xf86-input-vmmouse: @@ -590,13 +598,15 @@ / E postin -yast2-storage: - / - E postin +if !exists(yast2-storage-ng) + yast2-storage: + / + E postin -libstorage*: - / - E postin + libstorage*: + / + E postin +endif openssh: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.247/lib/ReadConfig.pm new/installation-images-14.254/lib/ReadConfig.pm --- old/installation-images-14.247/lib/ReadConfig.pm 2016-05-30 16:19:57.000000000 +0200 +++ new/installation-images-14.254/lib/ReadConfig.pm 2016-06-21 13:25:17.000000000 +0200 @@ -732,10 +732,12 @@ $blackpkg->{name} = "blacklist_package"; $blackpkg->{arch} = "noarch"; + my %blacklisted; for (@$ignore) { my $id = $pool->str2id($_); next if $pool->Job($solv::Job::SOLVER_SOLVABLE_NAME, $id)->solvables(); $blackpkg->add_deparray($solv::SOLVABLE_PROVIDES, $id); + $blacklisted{$_} = 1; } $pool->createwhatprovides(); @@ -760,6 +762,18 @@ } } } + + if (%blacklisted) { + for ($pool->Selection_all()->solvables()) { + my @deps = $_->lookup_idarray($solv::SOLVABLE_CONFLICTS, 0); + my @fdeps = grep { !$blacklisted{$pool->id2str($_)} } @deps; + next if @fdeps == @deps; + $_->unset($solv::SOLVABLE_CONFLICTS); + for my $id (@fdeps) { + $_->add_deparray($solv::SOLVABLE_CONFLICTS, $id, 0); + } + } + } } else { warn "$Script: outdated perl-solv: solver will not work properly"; @@ -1265,7 +1279,7 @@ $ConfigData{instsys_complain} = $ENV{instsys_complain}; $ConfigData{instsys_complain_root} = $ENV{instsys_complain_root}; - $ConfigData{instsys_build_id} = $ENV{instsys_build_id}; + $ConfigData{instsys_build_id} = $ENV{BUILD_ID}; if(!$ENV{silent}) { my ($r, $kmp);