Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2018-11-05 15:34:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Mon Nov 5 15:34:39 2018 rev:58 rq:646428 version:14.388 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2018-10-25 08:09:56.412282433 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2018-11-05 15:34:47.291115151 +0100 @@ -1,0 +2,17 @@ +Mon Nov 5 13:36:59 UTC 2018 - snwint@suse.de + +- merge gh#openSUSE/installation-images#270 +- Kubic has its own skelcd package now (bsc#1114455) +- 14.388 + +------------------------------------------------------------------- +Mon Nov 5 12:56:35 UTC 2018 - Richard Brown <rbrown@suse.com> + +- Use skelcd-control-Kubic for Kubic flavour (boo#1114455) + +------------------------------------------------------------------- +Mon Oct 22 13:35:04 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org> + +- Handle aarch64 and ppc64/ppc64le repos + +-------------------------------------------------------------------- Old: ---- installation-images-14.387.tar.xz New: ---- installation-images-14.388.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.19djkC/_old 2018-11-05 15:34:47.815114602 +0100 +++ /var/tmp/diff_new_pack.19djkC/_new 2018-11-05 15:34:47.815114602 +0100 @@ -34,6 +34,14 @@ %bcond_with xen %bcond_with xenkmp +# === Repo arch may differ from OBS build arch === + +%define the_arch %{_target_cpu} +%ifarch ppc64 ppc64le +%define the_arch ppc +%endif + + # === sort out which flavor to build === %if "%flavor" == "openSUSE" @@ -44,12 +52,20 @@ %if "%{the_version}" == "" %error "bad version string" %endif +%ifarch aarch64 ppc64 ppc64le +%define net_repo http://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/ +%else %define net_repo http://download.opensuse.org/distribution/leap/%{the_version}/repo/oss +%endif +%else +%ifarch aarch64 ppc64 ppc64le +%define net_repo http://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/ %else %define net_repo http://download.opensuse.org/tumbleweed/repo/oss %endif %endif %endif +%endif %if "%flavor" == "Kubic" # don't build on Leap for now @@ -107,7 +123,7 @@ %if "%theme" == "Kubic" %define with_storage_ng 1 -%define branding_skelcd CAASP +%define branding_skelcd Kubic %define branding_systemd CAASP %define branding_plymouth openSUSE %define branding_grub2 openSUSE @@ -525,7 +541,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.387 +Version: 14.388 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) ++++++ installation-images-14.387.tar.xz -> installation-images-14.388.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.387/VERSION new/installation-images-14.388/VERSION --- old/installation-images-14.387/VERSION 2018-10-19 15:07:45.000000000 +0200 +++ new/installation-images-14.388/VERSION 2018-11-05 14:36:59.000000000 +0100 @@ -1 +1 @@ -14.387 +14.388 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.387/changelog new/installation-images-14.388/changelog --- old/installation-images-14.387/changelog 2018-10-19 15:07:45.000000000 +0200 +++ new/installation-images-14.388/changelog 2018-11-05 14:36:59.000000000 +0100 @@ -1,3 +1,6 @@ +2018-11-05: 14.388 + - Kubic has its own skelcd package now (bsc #1114455) + 2018-10-19: 14.387 - don't use 'iterm' terminfo (fate #325746) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.387/etc/config new/installation-images-14.388/etc/config --- old/installation-images-14.387/etc/config 2018-10-19 15:07:45.000000000 +0200 +++ new/installation-images-14.388/etc/config 2018-11-05 14:36:59.000000000 +0100 @@ -137,7 +137,7 @@ image = 350 release = openSUSE-Tumbleweed-Kubic skelcd = openSUSE -skelcd_ctrl = CAASP +skelcd_ctrl = Kubic yast = openSUSE gfxboot = openSUSE grub2 = openSUSE