From 4cfd9ceb0310ff27ae412298a7742b15c0795b66ee9ede6477bc3fa92880806e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 9 Apr 2018 12:45:58 +0000 Subject: [PATCH 1/6] - do not delete efi image in skelcd-installer-net (bsc#1088679) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1132 --- installation-images.changes | 5 +++++ installation-images.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/installation-images.changes b/installation-images.changes index f7acb93..e39953a 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 9 14:44:58 CEST 2018 - snwint@suse.de + +- do not delete efi image in skelcd-installer-net (bsc#1088679) + -------------------------------------------------------------------- Fri Apr 6 08:40:35 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 3183f63..2e5f822 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -664,7 +664,7 @@ rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net} # net cp -a %{buildroot}/usr/lib/skelcd/CD1 %{buildroot}/usr/lib/skelcd/NET rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/*.rpm -rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,efi,gdb,libstoragemgmt,rescue,root} +rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,gdb,libstoragemgmt,rescue,root} if [ -n "%{net_repo}" ] ; then CPU=%{_target_cpu} [ "$CPU" = i586 ] && CPU=i386 From 3afaeda38dc8146f791cd3e68cfafb2744618e789e04ce1e73a96b099502bb23 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 9 Apr 2018 13:01:51 +0000 Subject: [PATCH 2/6] - No upgrade option for Kubic (bsc#1088304) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1133 --- installation-images.changes | 5 +++++ installation-images.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index e39953a..129a5df 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 9 15:00:54 CEST 2018 - kukuk@suse.de + +- No upgrade option for Kubic (bsc#1088304) + ------------------------------------------------------------------- Mon Apr 9 14:44:58 CEST 2018 - snwint@suse.de diff --git a/installation-images.spec b/installation-images.spec index 2e5f822..9fa248b 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -105,6 +105,7 @@ BuildRequires: openSUSE-release %define branding_plymouth openSUSE %define branding_grub2 openSUSE %define branding_gfxboot openSUSE +%define config_bootmenu_no_upgrade 1 BuildRequires: openSUSE-Tumbleweed-Kubic-release %endif From 5f64cbd4da4669d0c47413071d67a25eef8f1a023864e92fdfd336df87f283ee Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 11 Apr 2018 13:52:04 +0000 Subject: [PATCH 3/6] - disable Kubic 32-bit build (bsc#1089102) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1134 --- installation-images.changes | 5 +++++ installation-images.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index 129a5df..55126e8 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 11 15:49:43 CEST 2018 - snwint@suse.de + +- disable Kubic 32-bit build (bsc#1089102) + ------------------------------------------------------------------- Mon Apr 9 15:00:54 CEST 2018 - kukuk@suse.de diff --git a/installation-images.spec b/installation-images.spec index 9fa248b..c4abd88 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -49,9 +49,11 @@ ExclusiveArch: do_not_build %if "%flavor" == "Kubic" # don't build on Leap for now %if 0%{?is_opensuse} && !0%{?sle_version} +%ifnarch %ix86 %define theme Kubic %endif %endif +%endif %if "%flavor" == "SLED" # build SLED only on x86_64 From 46c5921e5f6f83e8cd17dc4a23140ee47f3eb4cc2fe7f532099c64fdd5d902a0 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 18 Apr 2018 13:02:47 +0000 Subject: [PATCH 4/6] - release 14.368 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1135 --- installation-images-14.367.tar.xz | 3 --- installation-images-14.368.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.367.tar.xz create mode 100644 installation-images-14.368.tar.xz diff --git a/installation-images-14.367.tar.xz b/installation-images-14.367.tar.xz deleted file mode 100644 index 94e6d6d..0000000 --- a/installation-images-14.367.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ac57e55acaf73edb15fdd4a1c456202e1886222e4abc60686a06a22b2fa6f78 -size 174564 diff --git a/installation-images-14.368.tar.xz b/installation-images-14.368.tar.xz new file mode 100644 index 0000000..c2f16e0 --- /dev/null +++ b/installation-images-14.368.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e24488d4ba3b9d24b2ad4ebff15fbe8cee7e7f03889329d396cf80b158f07a4 +size 174552 diff --git a/installation-images.changes b/installation-images.changes index 55126e8..695886c 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Wed Apr 18 12:57:09 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#243 +- run postin script of yast2-storage-ng (bsc#1081198) +- 14.368 + ------------------------------------------------------------------- Wed Apr 11 15:49:43 CEST 2018 - snwint@suse.de diff --git a/installation-images.spec b/installation-images.spec index c4abd88..c872646 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -511,7 +511,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.367 +Version: 14.368 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From ab80feb5d22c96420d346f8ffbb79e035c6c646f4e2897192cdb991443adda69 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 19 Apr 2018 11:27:43 +0000 Subject: [PATCH 5/6] - release 14.369 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1136 --- installation-images-14.368.tar.xz | 3 --- installation-images-14.369.tar.xz | 3 +++ installation-images.changes | 8 ++++++++ installation-images.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.368.tar.xz create mode 100644 installation-images-14.369.tar.xz diff --git a/installation-images-14.368.tar.xz b/installation-images-14.368.tar.xz deleted file mode 100644 index c2f16e0..0000000 --- a/installation-images-14.368.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e24488d4ba3b9d24b2ad4ebff15fbe8cee7e7f03889329d396cf80b158f07a4 -size 174552 diff --git a/installation-images-14.369.tar.xz b/installation-images-14.369.tar.xz new file mode 100644 index 0000000..4d55d02 --- /dev/null +++ b/installation-images-14.369.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c656a7e2209337dde16366791a1801377f2554b88df27cc1c446b93999110a3 +size 174640 diff --git a/installation-images.changes b/installation-images.changes index 695886c..5e8be56 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,11 @@ +-------------------------------------------------------------------- +Thu Apr 19 11:22:36 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#244 +- remove dmraid from inst-sys (fate#323743, bsc#1088570) +- remove explicit dependency from mozilla-nspr +- 14.369 + -------------------------------------------------------------------- Wed Apr 18 12:57:09 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index c872646..ffd5201 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -511,7 +511,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.368 +Version: 14.369 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 1df38cb5628c23afdb8350b703ada00e6ab928f1199bdbce89a3c8fd3fbe799f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 23 Apr 2018 12:07:44 +0000 Subject: [PATCH 6/6] - release 14.370 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1137 --- installation-images-14.369.tar.xz | 3 --- installation-images-14.370.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.369.tar.xz create mode 100644 installation-images-14.370.tar.xz diff --git a/installation-images-14.369.tar.xz b/installation-images-14.369.tar.xz deleted file mode 100644 index 4d55d02..0000000 --- a/installation-images-14.369.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c656a7e2209337dde16366791a1801377f2554b88df27cc1c446b93999110a3 -size 174640 diff --git a/installation-images-14.370.tar.xz b/installation-images-14.370.tar.xz new file mode 100644 index 0000000..32b7222 --- /dev/null +++ b/installation-images-14.370.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e254fe175e735c3ac3f33a3c32a8b938d2f0f9e8ecae00969eb6a159faa8793 +size 174576 diff --git a/installation-images.changes b/installation-images.changes index 5e8be56..ca9189d 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Mon Apr 23 12:02:37 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#245 +- remove last mozilla-nspr reference +- 14.370 + -------------------------------------------------------------------- Thu Apr 19 11:22:36 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index ffd5201..8c282a5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -511,7 +511,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.369 +Version: 14.370 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)