From f73afbbabe2470268fcac2ba0e16f9c56d3686abd90112f42245bdd8f58fadb6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 28 Mar 2019 08:54:24 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/patterns-base revision 35.0 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=de15f3cd227f408b358e65e761052472 --- pattern-definition-32bit.txt | 9 +++++- patterns-base.changes | 10 ------- patterns-base.spec | 57 +++++++++++++++--------------------- pre_checkin.sh | 2 +- 4 files changed, 32 insertions(+), 46 deletions(-) diff --git a/pattern-definition-32bit.txt b/pattern-definition-32bit.txt index 61aa4d9..e005302 100644 --- a/pattern-definition-32bit.txt +++ b/pattern-definition-32bit.txt @@ -34,6 +34,7 @@ Recommends: shadow-32bit Recommends: util-linux-32bit Recommends: which-32bit Recommends: systemd-coredump-32bit +Recommends: busybox-static-32bit Recommends: bash-completion-32bit Recommends: btrfsprogs-32bit Recommends: ca-certificates-mozilla-32bit @@ -245,7 +246,6 @@ Recommends: system-user-nobody-32bit Recommends: systemd-32bit Recommends: udev-32bit Recommends: zypper-32bit -Recommends: busybox-static-32bit Recommends: rollback-helper-32bit Recommends: openSUSE-build-key-32bit Recommends: SUSEConnect-32bit @@ -294,10 +294,13 @@ Recommends: xorg-x11-server-32bit Recommends: yast2-qt-32bit Recommends: dejavu-fonts-32bit Recommends: google-roboto-fonts-32bit +Recommends: icewm-default-32bit +Recommends: icewm-theme-branding-32bit Recommends: libyui-qt-32bit Recommends: libyui-qt-pkg-32bit Recommends: lightdm-32bit Recommends: noto-sans-fonts-32bit +Recommends: openssh-askpass-gnome-32bit Recommends: tigervnc-32bit Recommends: x11-tools-32bit Recommends: xdmbgrd-32bit @@ -343,7 +346,10 @@ Recommends: fontconfig-32bit Recommends: fonts-config-32bit Recommends: fribidi-32bit Recommends: ghostscript-x11-32bit +Recommends: icewm-default-32bit +Recommends: lightdm-32bit Recommends: numlockx-32bit +Recommends: tigervnc-32bit Recommends: translation-update-32bit Recommends: xauth-32bit Recommends: xdmbgrd-32bit @@ -354,6 +360,7 @@ Recommends: yast2-control-center-gnome-32bit Recommends: yast2-scanner-32bit Recommends: MozillaFirefox-branding-SLE-32bit Recommends: desktop-data-SLE-32bit +Recommends: numlockx-32bit Recommends: openssh-askpass-32bit Recommends: susepaste-32bit Recommends: susepaste-screenshot-32bit diff --git a/patterns-base.changes b/patterns-base.changes index 2c58570..5809a9a 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 20 00:09:25 UTC 2019 - Simon Lees - -- Update version to 20190320 -- Create basic_desktop pattern containing the desktop packages like - icewm that are wanted on a basic sles desktop but not in every - openSUSE install (boo#1124865) -- .Remove some duplicated packages in x11_enhanced -- Regenerate 32bit patterns - ------------------------------------------------------------------- Fri Mar 15 08:50:30 UTC 2019 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 8be20e6..0e3fada 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_with betatest Name: patterns-base -Version: 20190320 +Version: 20190206 Release: 0 Summary: Patterns for Installation (base patterns) License: MIT @@ -187,6 +187,8 @@ Requires: which %if ! 0%{?is_opensuse} Requires: systemd-coredump %endif +# Add some static base tool in case system explodes; Recommend only, as users are free to uninstall it +Recommends: busybox-static Recommends: bash-completion Recommends: btrfsprogs Recommends: ca-certificates-mozilla @@ -238,33 +240,6 @@ This is the base runtime system. It contains only a minimal multiuser booting s ################################################################################ -# This pattern contains everything the SLES x11 package used to have that -# doesn't need to be in the openSUSE x11 package -%package basic_desktop -%pattern_graphicalenvironments -Summary: A very basic desktop (previously part of x11 pattern) -Group: Metapackages -Provides: pattern-icon() = pattern-desktop -Provides: pattern-order() = 1802 -Provides: pattern-visible() -# We want SLES-15 systems to install this pattern on upgrade to SLES-16 -%if !0%{?is_opensuse} -Obsoletes: patterns-base-x11 < %{version} -%endif -Requires: pattern() = x11 - -# choose icewm-default if you have a choice -# icewm-lite is too lightweight in new release -Requires: icewm-default -Requires: icewm-theme-branding -Recommends: libgnomesu -Recommends: openssh-askpass-gnome - -%description basic_desktop -This pattern installs a rather basic desktop (icewm) - -################################################################################ - %if 0%{?is_opensuse} %package console %pattern_basetechnologies @@ -687,8 +662,10 @@ Requires: system-user-nobody Requires: systemd Requires: udev Requires: zypper -# Add some static base tool in case system explodes -Recommends: busybox-static +# Note it makes no sense to recommend packages in minimal_base as it can't +# be installed with --no-recommends if your package can be Recommended rather +# then required it likely belongs in base and not here. +# rollback-helper is useful on Leap / SLE but not tumbleweed %if 0%{?sle_version} Requires: rollback-helper %endif @@ -830,13 +807,17 @@ Requires: xorg-x11-server Requires: yast2-qt Recommends: dejavu-fonts Recommends: google-roboto-fonts +# choose icewm-default if you have a choice +# icewm-lite is too lightweight in new release +Recommends: icewm-default +Recommends: icewm-theme-branding Recommends: libyui-qt Recommends: libyui-qt-pkg # Recommend lightdm so it gets installed by default # rather then xdm bsc#1081760 -# Todo: Require DisplayManger and suggest lightdm Recommends: lightdm Recommends: noto-sans-fonts +Recommends: openssh-askpass-gnome Recommends: tigervnc Recommends: x11-tools Recommends: xdmbgrd @@ -901,7 +882,14 @@ Recommends: fontconfig Recommends: fonts-config Recommends: fribidi Recommends: ghostscript-x11 +# choose icewm-default if you have a choice +# icewm-lite is too lightweight in new release +Recommends: icewm-default +# Recommend lightdm so it gets installed by default +# rather then xdm bsc#1081760 +Recommends: lightdm Recommends: numlockx +Recommends: tigervnc # #353229 - drag in empty replacements Recommends: translation-update Recommends: xauth @@ -924,6 +912,7 @@ Recommends: desktop-data-SLE %endif %if 0%{?is_opensuse} # people love having numlock configurable +Recommends: numlockx Recommends: openssh-askpass Recommends: susepaste Recommends: susepaste-screenshot @@ -1095,7 +1084,7 @@ mkdir -p %{buildroot}%{_docdir}/patterns for i in apparmor base enhanced_base minimal_base \ sw_management x11 x11_enhanced; do %else -for i in apparmor base basic_desktop enhanced_base minimal_base sw_management x11 x11_enhanced; do +for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhanced; do %endif echo "This file marks the pattern $i to be installed." \ >"%{buildroot}%{_docdir}/patterns/$i.txt" @@ -1111,7 +1100,7 @@ apparmor_opt basesystem console documentation enhanced_base_opt transactional_ba %ifnarch s390 s390x 32bit \ %endif -basesystem basic_desktop documentation \ +basesystem documentation \ %endif %ifarch armv6hl armv7hl aarch64 x11_raspberrypi \ diff --git a/pre_checkin.sh b/pre_checkin.sh index 49d47ee..de2fd15 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,3 +1,3 @@ #!/bin/sh -./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s basic_desktop -s console -s documentation -s enhanced_base_opt -s minimal_base_conflicts -s readonly_root_tools -s transactional_base -s update_test -s x11_opt -s x11_raspberrypi > pattern-definition-32bit.txt +./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s console -s documentation -s enhanced_base_opt -s minimal_base_conflicts -s readonly_root_tools -s transactional_base -s update_test -s x11_opt -s x11_raspberrypi > pattern-definition-32bit.txt From 6744eafe0ff953fd133bded764dedbc8122ad29604ef44458ab40a08e19ca2e8 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 1 May 2019 00:04:42 +0000 Subject: [PATCH 2/4] Accepting request 699577 from home:fcrozat:branches:system:install:head - Move haveged from enhanced_base to minimal_base (bsc#1131369). OBS-URL: https://build.opensuse.org/request/show/699577 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=95 --- patterns-base.changes | 5 +++++ patterns-base.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 5809a9a..ef7fa18 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 29 12:37:44 UTC 2019 - Frederic Crozat + +- Move haveged from enhanced_base to minimal_base (bsc#1131369). + ------------------------------------------------------------------- Fri Mar 15 08:50:30 UTC 2019 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 0e3fada..34c4d77 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -496,10 +496,6 @@ Suggests: zip %ifarch aarch64 %ix86 x86_64 Recommends: dmidecode %endif -# Current systems suffer from entropy starvation -%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le -Recommends: haveged -%endif %ifarch ppc Recommends: hfsutils %endif @@ -678,6 +674,10 @@ Requires: SUSEConnect Requires: rollback_helper Requires: suse-build-key %endif +# Current systems suffer from entropy starvation (bsc#1131369) +%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le s390x +Recommends: haveged +%endif %if 0%{?is_opensuse} %description minimal_base From 855405a8f865405e15e9609341d44384f27bb5729bc6baaa166e49980f406353 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 2 May 2019 08:18:18 +0000 Subject: [PATCH 3/4] - move haveged to base instead of minimal_base as the comment indicates that minimal_base should not have recommended packages. - recomment issue-generator in the base pattern rather than the release package (boo#1133636) OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=96 --- patterns-base.changes | 8 ++++++++ patterns-base.spec | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index ef7fa18..1907767 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 2 08:16:54 UTC 2019 - lnussel@suse.de + +- move haveged to base instead of minimal_base as the comment indicates that + minimal_base should not have recommended packages. +- recomment issue-generator in the base pattern rather than the release package + (boo#1133636) + ------------------------------------------------------------------- Mon Apr 29 12:37:44 UTC 2019 - Frederic Crozat diff --git a/patterns-base.spec b/patterns-base.spec index 34c4d77..109332f 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -230,6 +230,14 @@ Recommends: lsvpd # bsc#1098849 Requires: ppc64-diag %endif +# Current systems suffer from entropy starvation (bsc#1131369) +%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le s390x +Recommends: haveged +%endif +# issue-generator is not used on Leap so far +%if !(0%{?is_opensuse} && 0%{?sle_version}) +Recommends: issue-generator +%endif %description base This is the base runtime system. It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own. @@ -674,10 +682,6 @@ Requires: SUSEConnect Requires: rollback_helper Requires: suse-build-key %endif -# Current systems suffer from entropy starvation (bsc#1131369) -%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le s390x -Recommends: haveged -%endif %if 0%{?is_opensuse} %description minimal_base From 77c965b2b6d3baac6c84ac70c49119ab2fe58d868f1e5f6654202eb88a914f20 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 2 May 2019 08:18:57 +0000 Subject: [PATCH 4/4] Accepting request 689098 from home:favogt:jscSLE-4142 - Fix x11_raspberrypi (jsc#SLE-4142): * Use only Requires, on JeOS recommmends and suggests are no-ops * Remove xf86-input-void, obsolete (and not in SLE) * Require base and x11 patterns * Add some YaST modules, otherwise the control center is empty OBS-URL: https://build.opensuse.org/request/show/689098 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=97 --- patterns-base.changes | 9 +++ patterns-base.spec | 157 ++++++++++++++++++++++-------------------- 2 files changed, 90 insertions(+), 76 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 1907767..e784562 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -11,6 +11,15 @@ Mon Apr 29 12:37:44 UTC 2019 - Frederic Crozat - Move haveged from enhanced_base to minimal_base (bsc#1131369). +------------------------------------------------------------------- +Tue Mar 26 12:51:08 UTC 2019 - Fabian Vogt + +- Fix x11_raspberrypi (jsc#SLE-4142): + * Use only Requires, on JeOS recommmends and suggests are no-ops + * Remove xf86-input-void, obsolete (and not in SLE) + * Require base and x11 patterns + * Add some YaST modules, otherwise the control center is empty + ------------------------------------------------------------------- Fri Mar 15 08:50:30 UTC 2019 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 109332f..5c784a4 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -982,91 +982,96 @@ Provides: pattern() = x11_raspberrypi Provides: pattern-icon() = pattern-x11 Provides: pattern-order() = 1803 Provides: pattern-visible() - +# Use only Requires - it's meant to be used on JeOS, which ignores Recommends # Based on SUSE:SLE-15:GA:RaspberryPI/kiwi-templates-SLES15-JeOS/JeOS.kiwi +# Patterns +Requires: pattern() = base +Requires: pattern() = x11 # Drivers -Recommends: xf86-input-evdev -Recommends: xf86-input-void -Recommends: xf86-input-libinput -Recommends: xf86-video-fbdev +Requires: xf86-input-evdev +Requires: xf86-input-libinput +Requires: xf86-video-fbdev # Other X11 packages -Suggests: gconf2 -Suggests: xfd -Suggests: xfontsel -Suggests: xgamma -Suggests: xhost -Suggests: xinit -Suggests: xinput -Suggests: xkbcomp -Suggests: xkbevd -Suggests: xkbprint -Suggests: xkbutils -Suggests: xkeyboard-config -Suggests: xkill -Suggests: xlogo -Suggests: xlsatoms -Suggests: xlsclients -Suggests: xlsfonts -Suggests: xmag -Suggests: xmessage -Suggests: xmodmap -Suggests: xorg-x11 -Suggests: xorg-x11-fonts-core -Suggests: xorg-x11-server -Suggests: xorg-x11-server-extra -Suggests: xprop -Suggests: xrandr -Suggests: xrdb -Suggests: xrestop -Suggests: xscope -Suggests: xscreensaver -Suggests: xscreensaver-data -Suggests: xset -Suggests: xsetmode -Suggests: xsetpointer -Suggests: xsetroot -Suggests: xterm -Suggests: xtermset -Suggests: xvinfo -Suggests: xwd -Suggests: xwininfo -Suggests: xdm -Suggests: x11-tools -Suggests: x11perf -Suggests: xauth -Suggests: xbacklight -Suggests: xclock -Suggests: xconsole -Suggests: xcursor-themes -Suggests: xcursorgen -Suggests: xdg-user-dirs -Suggests: xdg-user-dirs-gtk -Suggests: xdg-user-dirs-gtk-lang -Suggests: xdg-utils -Suggests: xdmbgrd -Suggests: xdpyinfo -Suggests: xev -Suggests: xeyes -Suggests: yast2-x11 +Requires: gconf2 +Requires: gtk2-metatheme-adwaita +Requires: gtk3-metatheme-adwaita +Requires: x11-tools +Requires: x11perf +Requires: xauth +Requires: xbacklight +Requires: xclock +Requires: xconsole +Requires: xcursor-themes +Requires: xcursorgen +Requires: xdg-user-dirs +Requires: xdg-user-dirs-gtk +Requires: xdg-user-dirs-gtk-lang +Requires: xdg-utils +Requires: xdm +Requires: xdmbgrd +Requires: xdpyinfo +Requires: xev +Requires: xeyes +Requires: xfd +Requires: xfontsel +Requires: xgamma +Requires: xhost +Requires: xinit +Requires: xinput +Requires: xkbcomp +Requires: xkbevd +Requires: xkbprint +Requires: xkbutils +Requires: xkeyboard-config +Requires: xkill +Requires: xlogo +Requires: xlsatoms +Requires: xlsclients +Requires: xlsfonts +Requires: xmag +Requires: xmessage +Requires: xmodmap +Requires: xorg-x11 +Requires: xorg-x11-fonts-core +Requires: xorg-x11-server +Requires: xorg-x11-server-extra +Requires: xprop +Requires: xrandr +Requires: xrdb +Requires: xrestop +Requires: xscope +Requires: xscreensaver +Requires: xscreensaver-data +Requires: xset +Requires: xsetmode +Requires: xsetpointer +Requires: xsetroot +Requires: xterm +Requires: xtermset +Requires: xvinfo +Requires: xwd +Requires: xwininfo +Requires: yast2-packager +Requires: yast2-snapper +Requires: yast2-x11 # bsc#1095870 -Recommends: libyui-qt-pkg -Recommends: yast2-control-center-qt -Suggests: gtk3-metatheme-adwaita -Suggests: gtk2-metatheme-adwaita +Requires: libyui-ncurses-pkg +Requires: libyui-qt-pkg +Requires: yast2-control-center-qt # Branding %if ! 0%{?is_opensuse} -Suggests: MozillaFirefox-branding-SLE +Requires: MozillaFirefox-branding-SLE %endif # X11/IceWM-specific packages -Recommends: icewm -Suggests: icewm-lite -Recommends: icewm-default -Recommends: icewm-theme-branding -Suggests: polkit-gnome-lang -Recommends: polkit-default-privs +Requires: icewm +Requires: icewm-default +Requires: icewm-lite +Requires: icewm-theme-branding +Requires: polkit-default-privs +Requires: polkit-gnome-lang # for IceWM taskbar mailbox icon (bsc#1093913) -Recommends: mutt -Suggests: mutt-lang +Requires: mutt +Requires: mutt-lang %description x11_raspberrypi The X Window System provides the only standard platform-independent networked graphical window system bridging the heterogeneous platforms in today's enterprise: from network servers to desktops, thin clients, laptops, and handhelds, independent of operating system and hardware.