From a77f27b79450988fc25dd7db186612bdfa10e48e432e6937d8dd9f852d72fa71 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 16 Mar 2018 12:05:55 +0000 Subject: [PATCH 01/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1117 --- installation-images.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index 381c60e..c2362aa 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -654,7 +654,7 @@ echo '%dir' /usr/lib/install-initrd >>install-initrd.files echo /usr/sbin/mkinstallinitrd >>install-initrd.files # cd1 mkdir -p %{buildroot}/usr/lib/skelcd/CD1 -cp -a %{buildroot}/srv/tftpboot/*/* %{buildroot}/usr/lib/skelcd/CD1 +cp -a %{buildroot}/usr/share/tftpboot-installation/*/* %{buildroot}/usr/lib/skelcd/CD1 rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/rpmlist rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/mkbootdisk rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net} @@ -694,8 +694,8 @@ rm -rf %{buildroot} %files -n tftpboot-installation-%{product_name} %defattr(-,root,root) -%dir %attr(0755,tftp,tftp) /srv/tftpboot -/srv/tftpboot +%dir %attr(0755,tftp,tftp) /usr/share/tftpboot-installation +/usr/share/tftpboot-installation %files -n skelcd-installer-%{theme} %defattr(-,root,root) From ae77908d7c62d700d7e6974208a65e77954cafba58628941062b7ac16bee8212 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 16 Mar 2018 12:07:16 +0000 Subject: [PATCH 02/10] - release 14.362 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1118 --- installation-images-14.361.tar.xz | 3 --- installation-images-14.362.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.361.tar.xz create mode 100644 installation-images-14.362.tar.xz diff --git a/installation-images-14.361.tar.xz b/installation-images-14.361.tar.xz deleted file mode 100644 index 21d4540..0000000 --- a/installation-images-14.361.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88f87834971b7d77b5bc7d40503aa36a903e10898680bd8842b192aa7dbff591 -size 174300 diff --git a/installation-images-14.362.tar.xz b/installation-images-14.362.tar.xz new file mode 100644 index 0000000..a214baa --- /dev/null +++ b/installation-images-14.362.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84b5a042c04443f5580ad3e7239d4f788ab7bc4fb4ff5fc0fac4e6099e1f7c5f +size 174276 diff --git a/installation-images.changes b/installation-images.changes index 8070353..83f699c 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Fri Mar 16 12:06:05 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#237 +- move tftpboot location (bsc#1085479) +- 14.362 + -------------------------------------------------------------------- Fri Mar 9 10:06:25 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index c2362aa..09f80dc 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -505,7 +505,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.361 +Version: 14.362 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 4b4cb6cef71e7dd43ecdd75c7eab361f7dd23d6cc9a9d6e1323e6e6047a9e835 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 16 Mar 2018 12:09:15 +0000 Subject: [PATCH 03/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1119 --- installation-images.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/installation-images.spec b/installation-images.spec index 09f80dc..f5f7b05 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -178,6 +178,7 @@ BuildRequires: noto-sans-fonts %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif +BuildRequires: tftpboot-installation-common BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: Mesa-libGL1 From 2384848e82ac7d44e57360a5003e8322e20da50b40520e4e2e55e1231feca0f2 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 16 Mar 2018 12:10:54 +0000 Subject: [PATCH 04/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1120 --- installation-images.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.spec b/installation-images.spec index f5f7b05..ffdadaa 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -178,7 +178,7 @@ BuildRequires: noto-sans-fonts %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif -BuildRequires: tftpboot-installation-common +# BuildRequires: tftpboot-installation-common BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: Mesa-libGL1 From 61eb514f42b0f3a09d6cb8381de0737dc38db619f951465f7dfe127dda3e4c17 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 21 Mar 2018 13:48:17 +0000 Subject: [PATCH 05/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1121 --- installation-images.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.spec b/installation-images.spec index ffdadaa..f5f7b05 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -178,7 +178,7 @@ BuildRequires: noto-sans-fonts %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif -# BuildRequires: tftpboot-installation-common +BuildRequires: tftpboot-installation-common BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: Mesa-libGL1 From 2d25830d5e2e7edfa85edfd9da072525fea3d8c8c8452b11e39043d6a1073ca0 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 22 Mar 2018 12:17:06 +0000 Subject: [PATCH 06/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1122 --- installation-images.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index f5f7b05..09ed045 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -178,7 +178,6 @@ BuildRequires: noto-sans-fonts %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif -BuildRequires: tftpboot-installation-common BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: Mesa-libGL1 @@ -313,6 +312,7 @@ BuildRequires: suse-module-tools BuildRequires: systemd BuildRequires: systemd-presets-branding BuildRequires: sysvinit-tools +BuildRequires: tftpboot-installation-common BuildRequires: thai-fonts BuildRequires: tunctl BuildRequires: udev @@ -689,7 +689,8 @@ rm -rf %{buildroot} /CD1 /SuSE %exclude /usr/share/debuginfodeps -/usr/share +/usr/share/mini-iso-rmlist +/usr/share/rescue-server %files -n install-initrd-%{theme} -f install-initrd.files From 9cb424e063a63fcb9b31501e30435eaf5edb6cd796dfb95cb1cb7c83f5efc154 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 22 Mar 2018 12:18:18 +0000 Subject: [PATCH 07/10] - release 14.363 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1123 --- installation-images-14.362.tar.xz | 3 --- installation-images-14.363.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.362.tar.xz create mode 100644 installation-images-14.363.tar.xz diff --git a/installation-images-14.362.tar.xz b/installation-images-14.362.tar.xz deleted file mode 100644 index a214baa..0000000 --- a/installation-images-14.362.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84b5a042c04443f5580ad3e7239d4f788ab7bc4fb4ff5fc0fac4e6099e1f7c5f -size 174276 diff --git a/installation-images-14.363.tar.xz b/installation-images-14.363.tar.xz new file mode 100644 index 0000000..6b6b901 --- /dev/null +++ b/installation-images-14.363.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b779109bd28aa384cbabaf2c8b76fb7ce3b407f5e5dd28385d8c3549075b2f8c +size 174304 diff --git a/installation-images.changes b/installation-images.changes index 83f699c..35de981 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Thu Mar 22 12:15:14 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#238 +- allow udevd to be run with --debug (bsc#1085212) +- 14.363 + -------------------------------------------------------------------- Fri Mar 16 12:06:05 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 09ed045..c7f07a5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -506,7 +506,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.362 +Version: 14.363 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 47f56428cfd4e62fda99cc47a4c43a00b5540dcaafecae8d7facb3d89906c816 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 22 Mar 2018 13:01:03 +0000 Subject: [PATCH 08/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1124 --- installation-images.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/installation-images.spec b/installation-images.spec index c7f07a5..67bdf05 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -281,6 +281,7 @@ BuildRequires: netpbm BuildRequires: nfs-client BuildRequires: nfs-kernel-server BuildRequires: nfs-utils +BuildRequires: novnc BuildRequires: ntfs-3g BuildRequires: ntfsprogs BuildRequires: open-iscsi @@ -305,6 +306,7 @@ BuildRequires: perl-XML-Simple BuildRequires: perl-solv BuildRequires: pinentry BuildRequires: plymouth-theme-tribar +BuildRequires: python3-websockify BuildRequires: raleway-fonts BuildRequires: samba BuildRequires: snapper @@ -690,7 +692,9 @@ rm -rf %{buildroot} /SuSE %exclude /usr/share/debuginfodeps /usr/share/mini-iso-rmlist +%ifarch x86_64 /usr/share/rescue-server +%endif %files -n install-initrd-%{theme} -f install-initrd.files From a4613522a617d03a256cefe880243452bb241b11596727f1e25f2ef853d9f2a6 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 22 Mar 2018 13:08:27 +0000 Subject: [PATCH 09/10] - release 14.364 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1125 --- installation-images-14.363.tar.xz | 3 --- installation-images-14.364.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.363.tar.xz create mode 100644 installation-images-14.364.tar.xz diff --git a/installation-images-14.363.tar.xz b/installation-images-14.363.tar.xz deleted file mode 100644 index 6b6b901..0000000 --- a/installation-images-14.363.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b779109bd28aa384cbabaf2c8b76fb7ce3b407f5e5dd28385d8c3549075b2f8c -size 174304 diff --git a/installation-images-14.364.tar.xz b/installation-images-14.364.tar.xz new file mode 100644 index 0000000..92af9c0 --- /dev/null +++ b/installation-images-14.364.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20e57baf2a474de382f41050adff60878632fd8bccc214d680a2e799b47ce77e +size 174360 diff --git a/installation-images.changes b/installation-images.changes index 35de981..faa77e8 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Thu Mar 22 13:05:27 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#239 +- add novnc & python3-websockify (bsc#1078785) +- 14.364 + -------------------------------------------------------------------- Thu Mar 22 12:15:14 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 67bdf05..2639130 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -508,7 +508,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.363 +Version: 14.364 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 690015ea5ba92a887a3d101e95dfa5e53748d2b5bce08774088a09b4288ff4b2 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 22 Mar 2018 14:01:46 +0000 Subject: [PATCH 10/10] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1126 --- installation-images.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index 2639130..c9a4c77 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -705,16 +705,12 @@ rm -rf %{buildroot} %files -n skelcd-installer-%{theme} %defattr(-,root,root) -%if 0%{?skelcd_compat} %dir /usr/lib/skelcd -%endif /usr/lib/skelcd/CD1 %files -n skelcd-installer-net-%{theme} %defattr(-,root,root) -%if 0%{?skelcd_compat} %dir /usr/lib/skelcd -%endif /usr/lib/skelcd/NET %files -n installation-images-debuginfodeps-%{theme}