diff --git a/pattern-definition-32bit.txt b/pattern-definition-32bit.txt index c114fe1..f9cc6a2 100644 --- a/pattern-definition-32bit.txt +++ b/pattern-definition-32bit.txt @@ -25,27 +25,37 @@ The 32bit pattern complementing apparmor. # %package base-32bit Summary: Minimal Base System -Recommends: kmod-32bit -Recommends: polkit-32bit -Recommends: polkit-default-privs-32bit -Recommends: shadow-32bit -Recommends: util-linux-32bit -Recommends: which-32bit -Recommends: systemd-coredump-32bit -Recommends: busybox-static-32bit -Recommends: bash-completion-32bit +Recommends: aaa_base-32bit +Recommends: bash-32bit Recommends: ca-certificates-mozilla-32bit -Recommends: chrony-32bit -Recommends: cron-32bit -Recommends: cronie-32bit +Recommends: coreutils-32bit +Recommends: glibc-32bit +Recommends: libnss_usrfiles2-32bit +Recommends: pam-32bit +Recommends: pam-config-32bit +Recommends: pam_pwquality-32bit +Recommends: rpm-32bit +Recommends: shadow-32bit +Recommends: sysconfig-32bit +Recommends: system-user-nobody-32bit +Recommends: systemd-32bit +Recommends: util-linux-32bit +Recommends: zypper-32bit +Recommends: rollback-helper-32bit +Recommends: SUSEConnect-32bit +Recommends: purge-kernels-service-32bit +Recommends: busybox-static-32bit +Recommends: elfutils-32bit +Recommends: iproute2-32bit +Recommends: system-group-trusted-32bit +Recommends: system-group-wheel-32bit +Recommends: system-user-bin-32bit +Recommends: system-user-daemon-32bit +Recommends: terminfo-32bit +Recommends: terminfo-iterm-32bit +Recommends: terminfo-screen-32bit +Recommends: timezone-32bit Recommends: glibc-locale-base-32bit -Recommends: glibc-locale-32bit -Recommends: systemd-sysvinit-32bit -Recommends: snapper-32bit -Recommends: branding-openSUSE-32bit -Recommends: branding-SLE-32bit -Recommends: lshw-32bit -Recommends: lsvpd-32bit Recommends: ppc64-diag-32bit Recommends: haveged-32bit Recommends: issue-generator-32bit @@ -74,6 +84,7 @@ Recommends: acl-32bit Recommends: alsa-plugins-32bit Recommends: attr-32bit Recommends: autofs-32bit +Recommends: bash-completion-32bit Recommends: bind-utils-32bit Recommends: binutils-32bit Recommends: bzip2-32bit @@ -205,7 +216,6 @@ Recommends: setserial-32bit Recommends: sharutils-32bit Recommends: spax-32bit Recommends: strace-32bit -Recommends: telnet-32bit Recommends: terminfo-32bit Recommends: vlan-32bit Recommends: wol-32bit @@ -225,34 +235,10 @@ The 32bit pattern complementing enhanced_base. # %package minimal_base-32bit Summary: Minimal Appliance Base -Recommends: aaa_base-32bit -Recommends: bash-32bit -Recommends: coreutils-32bit -Recommends: device-mapper-32bit +Recommends: branding-32bit Recommends: distribution-release-32bit Recommends: filesystem-32bit -Recommends: glibc-32bit -Recommends: iproute2-32bit -Recommends: kbd-32bit -Recommends: libnss_usrfiles2-32bit -Recommends: pam-32bit -Recommends: procps-32bit -Recommends: rpm-32bit -Recommends: sysconfig-32bit -Recommends: system-group-hardware-32bit -Recommends: system-group-wheel-32bit -Recommends: system-user-bin-32bit -Recommends: system-user-daemon-32bit -Recommends: system-user-nobody-32bit -Recommends: systemd-32bit -Recommends: udev-32bit -Recommends: zypper-32bit -Recommends: branding-32bit -Recommends: rollback-helper-32bit -Recommends: openSUSE-build-key-32bit -Recommends: SUSEConnect-32bit -Recommends: rollback_helper-32bit -Recommends: suse-build-key-32bit +Recommends: build-key-32bit Provides: pattern() = minimal_base%2d32bit Group: Metapackages Supplements: packageand(patterns-base-32bit:patterns-base-minimal_base) @@ -290,6 +276,7 @@ The 32bit pattern complementing sw_management. %package x11-32bit Summary: X Window System Recommends: pattern()-32bit +Recommends: pattern()-32bit Recommends: xorg-x11-fonts-core-32bit Recommends: xorg-x11-server-32bit Recommends: yast2-qt-32bit diff --git a/patterns-base.changes b/patterns-base.changes index d0d60d2..fcde469 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,9 +1,25 @@ +------------------------------------------------------------------- +Mon Jun 1 12:35:44 UTC 2020 - Michal Suchanek + +- re-add ppc64-diag on ppc64le (bsc#1098849). + ------------------------------------------------------------------- Thu May 28 08:22:09 UTC 2020 - Thorsten Kukuk - Suggest xz in base, as it is now required by aaa_base and we don't want that zypper uses busybox instead [bsc#1172209] +------------------------------------------------------------------- +Thu May 28 07:24:12 UTC 2020 - Michal Suchanek + +- Re-add purge-kernels-service dependency (boo#1168727). + Support multiversion(kernel) with purge-kernels.service separated from dracut + (jsc#SLE-10162). +- Call perl directly in pre_checkin.sh. create_32bit-patterns_file.pl is not + executable when checked out from OBS. +- Skip bootloader in pre_checkin.sh +- Re-generate 32bit patterns. + ------------------------------------------------------------------- Thu May 7 09:19:47 UTC 2020 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 16525b8..2413348 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -143,6 +143,8 @@ Requires: zypper Recommends: rollback-helper Recommends: SUSEConnect %endif +# Support multiversion(kernel) (jsc#SLE-10162) +Requires: purge-kernels-service # Add some static base tool in case system explodes; Recommend only, as users are free to uninstall it Recommends: busybox-static Recommends: elfutils @@ -156,6 +158,10 @@ Recommends: terminfo-iterm Recommends: terminfo-screen Recommends: timezone Recommends: glibc-locale-base +%ifarch ppc64 ppc64le +# bsc#1098849 +Requires: ppc64-diag +%endif # Current systems suffer from entropy starvation (bsc#1131369) %ifarch aarch64 %ix86 x86_64 ppc64 ppc64le s390x Recommends: haveged diff --git a/pre_checkin.sh b/pre_checkin.sh index 49d47ee..befef2f 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 +perl create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s basic_desktop -s bootloader -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