Update packages file for version 35150

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -17,7 +17,7 @@ SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || $(call queryspec,%{NVR}\n,$(SPECFILE)
 SRPMFILE = results/$(SRPMVERS).src.rpm
 
 LATEST_RPMS = $(wildcard rpms/*.rpm)
-DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm)
+DEBUGINFO_RPM = $(wildcard rpms/${PKG_NAME}-debuginfo-$(shell $(call queryspec,%{V}-%{R},${SPECFILE})).*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -78,7 +78,7 @@ configemail:
 
 #help checkblacklist: Verify rpms files to not include banned files for Clear Linux OS.
 checkblacklist:
-	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist results/*.rpm
+	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(filter-out ${DEBUGINFO_RPM},${RPMS})
 
 prebuild-checks:
 
@@ -451,6 +451,10 @@ install-debuginfo-local:
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \
 	done; \
+	find $$tmpdir/usr/share/debug/.build-id -type l 2> /dev/null | while read -r link; do \
+		new_target=$$(readlink $$link | sed 's|/usr/share/debug|/usr/lib/debug|'); \
+		sudo ln -sf "$$new_target" "$$link"; \
+	done; \
 	find $$tmpdir/usr/share/debug/ -mindepth 1 -maxdepth 1 -regextype awk -regex '.*/(.build-id|boot|lib|sbin|usr)$$' 2> /dev/null | while read -r d; do \
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \
@@ -518,6 +522,44 @@ cloc: $(SRPMFILE)
 	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
 	cat results/cloc.txt
 
+.PHONY: whatrequires
+#help whatrequires: Output a list of packages that directly depend on this one,
+#help showing the subpackage-level breakdown. Each line of output has the format
+#help "SUBPACKAGE(|SYMBOL)? <- PACKAGE (ARCH)". If ARCH is "src", the meaning is
+#help "PACKAGE has a BuildRequires (build dependency) on SUBPACKAGE". And if ARCH
+#help is "x86_64", the meaning is "PACKAGE has a Requires (runtime dependency) on
+#help SUBPACKAGE". The optional "|SYMBOL" portion is printed when the symbol
+#help required does not match the subpackage name. Note that the ability to query
+#help version-qualified dependencies is not yet implemented... (For example, if
+#help python3-core provides the version-qualified symbol "python(abi) = 3.9",
+#help running `make whatrequires` for `python3` will detect packages that depend on
+#help "python(abi)", but not "python(abi) = 3.9".)
+whatrequires:
+	@Q="dnf --config=${PM_CONF} repoquery --quiet --releasever=clear"; \
+	TMP=$$(mktemp -d); trap "rm -rf $$TMP" EXIT; \
+	$${Q} --provides ${PKG_NAME} | awk '{ print $$1 }' > $$TMP/${PKG_NAME}; \
+	( \
+	while read -r provide; do \
+		$${Q} --qf="${PKG_NAME} <- %{NAME} (x86_64)" --arch=x86_64 --srpm --whatrequires $$provide; \
+		$${Q} --qf="${PKG_NAME} <- %{NAME} (src)" --arch=src --whatrequires $$provide; \
+	done < $$TMP/${PKG_NAME} \
+	) | awk '$$3 != "${PKG_NAME}"' | LC_COLLATE=C sort -u; \
+	sed -n 's/^%package *\(.*\)$$/\1/p' ${PKG_NAME}.spec | sort > $$TMP/subpkgs; \
+	while read -r val; do \
+		if grep -qE '^-n +' <<< $$val; then \
+			subpkg=$$(awk '{ print $$2 }' <<< $$val); \
+		else \
+			subpkg=${PKG_NAME}-$$val; \
+		fi; \
+		$${Q} --provides $$subpkg | awk '{ print $$1 }' > $$TMP/$$subpkg; \
+		( \
+		while read -r provide; do \
+			$${Q} --qf="$$subpkg|$$provide <- %{NAME} (x86_64)" --arch=x86_64 --srpm --whatrequires $$provide; \
+			$${Q} --qf="$$subpkg|$$provide <- %{NAME} (src)" --arch=src --whatrequires $$provide; \
+		done < $$TMP/$$subpkg \
+		) | awk '$$3 != "${PKG_NAME}"' | sed "s/^$$subpkg|\($$subpkg\)/\1/" | LC_COLLATE=C sort -u; \
+	done < $$TMP/subpkgs
+
 # Define LTS-specific targets in a separate makefile
 -include $(TOPLVL)/projects/common/Makefile.common.lts
 

Makefile.toplevel

@@ -163,7 +163,7 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #help diffstat. Requires that diffstat is installed.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
 	done
 
 #help log: Run git log origin/master..HEAD for all package repos, thus

conf/clear.cfg

@@ -4,14 +4,14 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'groupinstall build srpm-build'
 config_opts['dist'] = 'clear'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s'
+config_opts['useradd'] = '/usr/sbin/useradd -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}}  {{chrootuser}}'
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['root_cache_opts']['compress_program'] = 'zstd -5'
 config_opts['plugin_conf']['root_cache_opts']['extension'] = '.zst'
 config_opts['releasever'] = 'clear'
 config_opts['package_manager'] = 'dnf'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['use_bootstrap_container'] = False
+config_opts['use_bootstrap'] = False
 
 
 config_opts['dnf.conf'] = """

licenses-spdx

@@ -45,11 +45,14 @@ BSD-3-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
 BSD-3-Clause-LBNL
+BSD-3-Clause-Modification
+BSD-3-Clause-No-Military-License
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
 BSD-4-Clause
+BSD-4-Clause-Shortened
 BSD-4-Clause-UC
 BSD-Protection
 BSD-Source-Code
@@ -62,49 +65,64 @@ BitTorrent-1.0
 BitTorrent-1.1
 BlueOak-1.0.0
 Borceux
+C-UDA-1.0
 CAL-1.0
 CAL-1.0-Combined-Work-Exception
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
+CC-BY-2.5-AU
 CC-BY-3.0
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
 CC-BY-NC-3.0
+CC-BY-NC-3.0-DE
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
 CC-BY-NC-ND-3.0
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
 CC-BY-NC-SA-2.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.5
 CC-BY-NC-SA-3.0
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
 CC-BY-ND-3.0
+CC-BY-ND-3.0-DE
 CC-BY-ND-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0
 CC-BY-SA-2.0-UK
+CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-4.0
 CC-PDDC
 CC0-1.0
 CDDL-1.0
 CDDL-1.1
+CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -132,6 +150,7 @@ CrystalStacker
 Cube
 D-FSL-1.0
 DOC
+DRL-1.0
 DSDP
 Dotseqn
 ECL-1.0
@@ -154,7 +173,9 @@ FSFULLR
 FTL
 Fair
 Frameworx-1.0
+FreeBSD-DOC
 FreeImage
+GD
 GFDL-1.1
 GFDL-1.1-invariants-only
 GFDL-1.1-invariants-or-later
@@ -252,6 +273,7 @@ Linux-OpenIB
 MIT
 MIT-0
 MIT-CMU
+MIT-Modern-Variant
 MIT-advertising
 MIT-enna
 MIT-feh
@@ -271,6 +293,7 @@ MulanPSL-1.0
 MulanPSL-2.0
 Multics
 Mup
+NAIST-2003
 NASA-1.3
 NBPL-1.0
 NCGL-UK-2.0
@@ -279,6 +302,7 @@ NGPL
 NIST-PD
 NIST-PD-fallback
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -306,6 +330,7 @@ OFL-1.1
 OFL-1.1-RFN
 OFL-1.1-no-RFN
 OGC-1.0
+OGDL-Taiwan-1.0
 OGL-Canada-2.0
 OGL-UK-1.0
 OGL-UK-2.0
@@ -329,6 +354,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1

pkg-mapping

@@ -1,2 +1,3 @@
+compat-libsigc++-soname20	compat-libsigc-plus-plus-soname20
 gtk+	gtk-plus
 libsigc++	libsigc-plus-plus