diff --git a/pattern-definition-32bit.txt b/pattern-definition-32bit.txt index 6764c10..a7df0b4 100644 --- a/pattern-definition-32bit.txt +++ b/pattern-definition-32bit.txt @@ -1,6 +1,5 @@ %package apparmor-32bit Summary: AppArmor -Recommends: pattern()-32bit Recommends: apparmor-abstractions-32bit Recommends: apparmor-parser-32bit Recommends: apparmor-profiles-32bit @@ -9,6 +8,7 @@ Recommends: apparmor-utils-32bit Recommends: yast2-apparmor-32bit Recommends: audit-32bit Recommends: audit-32bit +Recommends: apparmor-docs-32bit Provides: pattern() = apparmor%2d32bit Group: Metapackages Supplements: packageand(patterns-base-32bit:patterns-base-apparmor) @@ -25,9 +25,7 @@ The 32bit pattern complementing apparmor. # %package base-32bit Summary: Minimal Base System -Recommends: e2fsprogs-32bit Recommends: kmod-32bit -Recommends: openssh-32bit Recommends: polkit-32bit Recommends: polkit-default-privs-32bit Recommends: shadow-32bit @@ -36,24 +34,14 @@ Recommends: which-32bit Recommends: systemd-coredump-32bit Recommends: busybox-static-32bit Recommends: bash-completion-32bit -Recommends: btrfsprogs-32bit Recommends: ca-certificates-mozilla-32bit Recommends: chrony-32bit Recommends: cron-32bit Recommends: cronie-32bit -Recommends: grub2-32bit Recommends: glibc-locale-32bit Recommends: systemd-sysvinit-32bit -Recommends: snapper-32bit Recommends: branding-openSUSE-32bit Recommends: branding-SLE-32bit -Recommends: efibootmgr-32bit -Recommends: shim-32bit -Recommends: grub2-x86_64-efi-32bit -Recommends: shim-32bit -Recommends: grub2-arm64-efi-32bit -Recommends: efibootmgr-32bit -Recommends: grub2-arm-efi-32bit Recommends: lshw-32bit Recommends: lsvpd-32bit Recommends: ppc64-diag-32bit @@ -78,7 +66,7 @@ Summary: Enhanced Base System Recommends: pattern()-32bit Recommends: pattern()-32bit Recommends: pattern()-32bit -Recommends: pattern()-32bit +Recommends: openssh-32bit Recommends: aaa_base-extras-32bit Recommends: acl-32bit Recommends: alsa-plugins-32bit @@ -123,7 +111,6 @@ Recommends: hdparm-32bit Recommends: hwinfo-32bit Recommends: info-32bit Recommends: initviocons-32bit -Recommends: iproute2-32bit Recommends: iputils-32bit Recommends: irqbalance-32bit Recommends: joe-32bit @@ -147,7 +134,6 @@ Recommends: nscd-32bit Recommends: ntfs-3g-32bit Recommends: ntfsprogs-32bit Recommends: openslp-32bit -Recommends: openssh-32bit Recommends: pam-config-32bit Recommends: parted-32bit Recommends: pciutils-32bit @@ -159,6 +145,7 @@ Recommends: postfix-32bit Recommends: psmisc-32bit Recommends: rsync-32bit Recommends: rsyslog-32bit +Recommends: systemd-logger-32bit Recommends: scout-32bit Recommends: screen-32bit Recommends: sed-32bit @@ -183,11 +170,6 @@ Recommends: hfsutils-32bit Recommends: mouseemu-32bit Recommends: pdisk-32bit Recommends: powerpc32-32bit -Recommends: grub2-branding-openSUSE-32bit -Recommends: plymouth-32bit -Recommends: plymouth-branding-openSUSE-32bit -Recommends: release-notes-openSUSE-32bit -Recommends: grub2-branding-SLE-32bit Recommends: plymouth-32bit Recommends: dmraid-32bit Recommends: dosfstools-32bit @@ -209,6 +191,22 @@ Recommends: mcelog-32bit Recommends: numactl-32bit Recommends: ucode-amd-32bit Recommends: ucode-intel-32bit +Recommends: joe-32bit +Recommends: mpt-status-32bit +Recommends: perl-TermReadLine-Gnu-32bit +Recommends: prctl-32bit +Recommends: procinfo-32bit +Recommends: procmail-32bit +Recommends: providers-32bit +Recommends: setserial-32bit +Recommends: sharutils-32bit +Recommends: spax-32bit +Recommends: strace-32bit +Recommends: tcpdump-32bit +Recommends: telnet-32bit +Recommends: terminfo-32bit +Recommends: vlan-32bit +Recommends: wol-32bit Provides: pattern() = enhanced_base%2d32bit Group: Metapackages Supplements: packageand(patterns-base-32bit:patterns-base-enhanced_base) @@ -230,7 +228,6 @@ Recommends: bash-32bit Recommends: coreutils-32bit Recommends: device-mapper-32bit Recommends: distribution-release-32bit -Recommends: dracut-32bit Recommends: filesystem-32bit Recommends: glibc-32bit Recommends: iproute2-32bit @@ -247,6 +244,7 @@ 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 @@ -268,8 +266,8 @@ The 32bit pattern complementing minimal_base. # %package sw_management-32bit Summary: Software Management -Recommends: pattern()-32bit Recommends: zypper-32bit +Recommends: pattern()-32bit Recommends: lifecycle-data-32bit Recommends: zypper-lifecycle-plugin-32bit Provides: pattern() = sw_management%2d32bit @@ -289,12 +287,10 @@ 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 Recommends: dejavu-fonts-32bit -Recommends: google-roboto-fonts-32bit Recommends: libyui-qt-32bit Recommends: libyui-qt-pkg-32bit Recommends: lightdm-32bit @@ -330,7 +326,6 @@ The 32bit pattern complementing x11. %package x11_enhanced-32bit Summary: X Window System Recommends: pattern()-32bit -Recommends: pattern()-32bit Recommends: glibc-locale-32bit Recommends: xkeyboard-config-32bit Recommends: xorg-x11-essentials-32bit @@ -345,6 +340,7 @@ Recommends: fonts-config-32bit Recommends: fribidi-32bit Recommends: ghostscript-x11-32bit Recommends: numlockx-32bit +Recommends: opensuse-welcome-32bit Recommends: translation-update-32bit Recommends: xauth-32bit Recommends: xdmbgrd-32bit @@ -359,6 +355,8 @@ Recommends: numlockx-32bit Recommends: openssh-askpass-32bit Recommends: susepaste-32bit Recommends: susepaste-screenshot-32bit +Recommends: x11-tools-32bit +Recommends: xorg-x11-libX11-ccache-32bit Provides: pattern() = x11_enhanced%2d32bit Group: Metapackages Supplements: packageand(patterns-base-32bit:patterns-base-x11_enhanced) diff --git a/patterns-base.changes b/patterns-base.changes index 6db4b9d..7c1f122 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Sep 4 09:02:58 UTC 2019 - Ludwig Nussel + +- minimal_base: remove dracut. Only useful when there is also a + kernel and the kernel requires it anyways. +- base: + * remove bootloader packages. They are only required on real + hardware or VMs. YaST will add them. + * remove btrfsprogs. Has supplemements on btrfs so will be auto + installed when on btrfs. Also yast installs it. + * remove snapper (supplements btrfsprogs) + * move openssh to enhanced_base +- enhanced_base: + * iproute2 already in minimal_base + * remove explicit grub and plymouth branding. They are pulled + via supplements +- documentation: + * remove info2html, old tool not useful today. + * susehelp and sled manuals no longer exist + * Use minimal_base as Basesystem is just an alias +- sw_management: + * require zypper also on TW + ------------------------------------------------------------------- Wed Aug 28 15:42:20 UTC 2019 - Ludwig Nussel diff --git a/patterns-base.spec b/patterns-base.spec index 72a3d67..08ed8c1 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -123,9 +123,7 @@ Provides: pattern-visible() %obsolete_legacy_pattern minimal Requires: pattern() = minimal_base -Requires: e2fsprogs Requires: kmod -Requires: openssh Requires: polkit Requires: polkit-default-privs Requires: shadow @@ -137,16 +135,13 @@ Requires: systemd-coredump # 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 Recommends: chrony Recommends: cron # we rely on cron for daily/hourly Recommends: cronie -Recommends: grub2 Recommends: glibc-locale Recommends: systemd-sysvinit -Recommends: snapper %if 0%{?is_opensuse} # get it branded @@ -154,19 +149,6 @@ Recommends: branding-openSUSE %else Recommends: branding-SLE %endif -%ifarch x86_64 -Recommends: efibootmgr -Recommends: shim -Recommends: grub2-x86_64-efi -%endif -%ifarch aarch64 -Recommends: shim -Recommends: grub2-arm64-efi -%endif -%ifarch %arm -Recommends: efibootmgr -Recommends: grub2-arm-efi -%endif %ifarch ppc ppc64 ppc64le %if !0%{?is_opensuse} Recommends: lshw @@ -295,22 +277,13 @@ Provides: pattern() = documentation Provides: pattern-icon() = pattern-documentation Provides: pattern-order() = 1005 Provides: pattern-visible() -Requires: pattern() = basesystem +Requires: pattern() = minimal_base %obsolete_legacy_pattern documentation -Recommends: info2html +Requires: man Recommends: man-pages # note pam is in every install so no point in using packageand Recommends: pam-doc -Recommends: susehelp -Recommends: susehelp_en -%if !0%{?is_opensuse} -Recommends: sled-admin_en-pdf -Recommends: sled-gnomeuser_en-pdf -Recommends: sled-manuals_en-pdf -Recommends: sled-security_en-pdf -Recommends: sled-tuning_en-pdf -%endif %description documentation Help and Support Documentation @@ -335,6 +308,7 @@ Recommends: pattern() = apparmor Recommends: pattern() = sw_management Recommends: pattern() = yast2_basis +Requires: openssh Recommends: aaa_base-extras # getfacl and setfacl Recommends: acl @@ -390,8 +364,6 @@ Recommends: hdparm Recommends: hwinfo Recommends: info Recommends: initviocons -# /bin/ip considered useful -Recommends: iproute2 # ping is required for network tests Recommends: iputils Recommends: irqbalance @@ -422,8 +394,6 @@ Recommends: nscd Recommends: ntfs-3g Recommends: ntfsprogs Recommends: openslp -# we want a ssh server to be available -Recommends: openssh # TODO: should this be in more places Recommends: pam-config Recommends: parted @@ -487,17 +457,7 @@ Recommends: mouseemu Recommends: pdisk Recommends: powerpc32 %endif -# openSUSE Branding packages first -%if 0%{?is_opensuse} -# we want a branded grub2 too #757683 -Recommends: grub2-branding-openSUSE Recommends: plymouth -Recommends: plymouth-branding-openSUSE -Recommends: release-notes-openSUSE -%else -Recommends: grub2-branding-SLE -Recommends: plymouth -%endif # Other packages we have in openSUSE and not SLE-15 %if 0%{?is_opensuse} Recommends: dmraid @@ -599,7 +559,6 @@ Requires: bash Requires: coreutils Requires: device-mapper Requires: distribution-release -Requires: dracut Requires: filesystem Requires: glibc Requires: iproute2 @@ -616,6 +575,9 @@ Requires: system-user-nobody Requires: systemd Requires: udev Requires: zypper +# the release package recommends a specific branding package so +# the solver should pick the right one +Requires: branding # 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. @@ -683,11 +645,11 @@ Provides: pattern-icon() = pattern-software-management Provides: pattern-order() = 1360 Provides: pattern-visible() %obsolete_legacy_pattern sw_management +# Zypper is the basic sw_management stack for *SUSE +Requires: zypper %if 0%{?sle_version} Recommends: pattern() = sw_management_x11 -# Zypper is the basic sw_management stack for *SUSE -Requires: zypper Recommends: lifecycle-data Recommends: zypper-lifecycle-plugin %endif