Accepting request 877773 from home:favogt:branches:system:install:head

- Require shim and mokutil on AArch64 as well now (boo#1183181)
- Fix bug in create_32bit-patterns_file.pl leading to bogus
  "Recommends: pattern()-32bit"
- Skip selinux pattern in pre_checkin.sh
- Ignore boolean deps in create_32bit-patterns_file.pl for now
- Run pre_checkin.sh, was overdue
- Drop unneeded condition in %install

- Recommend issue-generator on Leap as well

OBS-URL: https://build.opensuse.org/request/show/877773
OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=170

create_32bit-patterns_file.pl

@@ -45,7 +45,12 @@ sub parse_line {
 	# XXX simplify me
 	if ($to_parse =~ /Recommends:\s*([^\s]*)\s*/) {
 		$tmp = "$1";
+		return "" if ($tmp =~ m/pattern()/);
 		return "" if ($tmp =~ m/.*-64bit\s*$/);
+		if ($tmp =~ m/\(/) {
+			print STDERR "WARN: Unhandled boolean dep at $to_parse\n";
+			return "";
+		}
 		$tmp = "${tmp}-32bit" if($tmp !~ m/.*-32bit/);
 		return "Recommends:     ${tmp}\n";
 	}

pattern-definition-32bit.txt

@@ -26,6 +26,7 @@ The 32bit pattern complementing apparmor.
 %package base-32bit
 Summary:        Minimal Base System
 Recommends:     aaa_base-32bit
+Recommends:     aaa_base-malloccheck-32bit
 Recommends:     bash-32bit
 Recommends:     ca-certificates-mozilla-32bit
 Recommends:     coreutils-32bit
@@ -33,9 +34,7 @@ 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
@@ -46,7 +45,11 @@ Recommends:     SUSEConnect-32bit
 Recommends:     purge-kernels-service-32bit
 Recommends:     busybox-static-32bit
 Recommends:     elfutils-32bit
+Recommends:     hostname-32bit
 Recommends:     iproute2-32bit
+Recommends:     issue-generator-32bit
+Recommends:     pam_pwquality-32bit
+Recommends:     shadow-32bit
 Recommends:     system-group-trusted-32bit
 Recommends:     system-group-wheel-32bit
 Recommends:     system-user-bin-32bit
@@ -58,7 +61,6 @@ Recommends:     timezone-32bit
 Recommends:     glibc-locale-base-32bit
 Recommends:     ppc64-diag-32bit
 Recommends:     haveged-32bit
-Recommends:     issue-generator-32bit
 Provides:       pattern() = base%2d32bit
 Group:          Metapackages
 Supplements:    packageand(patterns-base-32bit:patterns-base-base)
@@ -75,9 +77,6 @@ The 32bit pattern complementing base.
 #
 %package enhanced_base-32bit
 Summary:        Enhanced Base System
-Recommends:     pattern()-32bit
-Recommends:     pattern()-32bit
-Recommends:     pattern()-32bit
 Recommends:     openssh-32bit
 Recommends:     aaa_base-extras-32bit
 Recommends:     acl-32bit
@@ -256,7 +255,6 @@ The 32bit pattern complementing minimal_base.
 %package sw_management-32bit
 Summary:        Software Management
 Recommends:     zypper-32bit
-Recommends:     pattern()-32bit
 Recommends:     lifecycle-data-32bit
 Recommends:     zypper-lifecycle-plugin-32bit
 Provides:       pattern() = sw_management%2d32bit
@@ -275,15 +273,11 @@ 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:     libyui-qt-32bit
 Recommends:     libyui-qt-pkg-32bit
-Recommends:     lightdm-32bit
 Recommends:     noto-sans-fonts-32bit
 Recommends:     tigervnc-32bit
 Recommends:     x11-tools-32bit
@@ -315,7 +309,6 @@ The 32bit pattern complementing x11.
 #
 %package x11_enhanced-32bit
 Summary:        X Window System
-Recommends:     pattern()-32bit
 Recommends:     glibc-locale-32bit
 Recommends:     glibc-locale-base-32bit
 Recommends:     xkeyboard-config-32bit
@@ -339,7 +332,7 @@ Recommends:     xkeyboard-config-32bit
 Recommends:     xorg-x11-fonts-32bit
 Recommends:     xorg-x11-fonts-core-32bit
 Recommends:     yast2-control-center-gnome-32bit
-Recommends:     yast2-scanner-32bit
+Recommends:     yast2-network-32bit
 Recommends:     MozillaFirefox-branding-SLE-32bit
 Recommends:     desktop-data-SLE-32bit
 Recommends:     numlockx-32bit

patterns-base.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Mar  8 14:47:29 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Require shim and mokutil on AArch64 as well now (boo#1183181)
+- Fix bug in create_32bit-patterns_file.pl leading to bogus
+  "Recommends: pattern()-32bit"
+- Skip selinux pattern in pre_checkin.sh
+- Ignore boolean deps in create_32bit-patterns_file.pl for now
+- Run pre_checkin.sh, was overdue
+- Drop unneeded condition in %install
+
+-------------------------------------------------------------------
+Fri Mar  5 10:21:02 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Recommend issue-generator on Leap as well
+
 -------------------------------------------------------------------
 Wed Mar  3 08:50:02 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
 

patterns-base.spec

@@ -151,6 +151,7 @@ Recommends:     busybox-static
 Recommends:     elfutils
 Recommends:     hostname
 Recommends:     iproute2
+Recommends:     issue-generator
 Recommends:     pam_pwquality
 Recommends:     shadow
 Recommends:     system-group-trusted
@@ -170,10 +171,6 @@ Requires:       ppc64-diag
 %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
 # hint for aaa_base requiring /usr/bin/xz
 Suggests:       xz
 # if anything wants to recommend an MTA, openSUSE defaults to postfix (boo#1136078)
@@ -608,7 +605,7 @@ Requires:       grub2-arm64-efi
 Requires:       grub2-arm-efi
 Requires:       grub2-arm-uboot
 %endif
-%ifarch x86_64
+%ifarch aarch64 x86_64
 Requires:       mokutil
 Requires:       shim
 %endif
@@ -990,12 +987,7 @@ The X Window System provides the only standard platform-independent networked gr
 
 %install
 mkdir -p %{buildroot}%{_docdir}/patterns
-%if 0%{?is_opensuse}
-for i in apparmor base enhanced_base minimal_base \
-     sw_management x11 x11_enhanced; do
-%else
 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"
     echo "This file marks the pattern $i to be installed." \

pre_checkin.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-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
+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 selinux -s transactional_base -s update_test -s x11_opt -s x11_raspberrypi > pattern-definition-32bit.txt