Update packages file for version 34360

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Improve detection of the debuginfo rpm
2026-06-17 19:45:59 +00:00 · 2021-03-09 00:06:34 -08:00 · 2021-03-09 06:19:40 +00:00 · 2021-03-09 06:02:10 +00:00 · 2021-03-08 22:43:34 +00:00
2 changed files with 5 additions and 2 deletions
@@ -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:

@@ -107,6 +107,7 @@ R-DT
 R-DendSer
 R-Deriv
 R-DescTools
+R-DiagrammeR
 R-DistributionUtils
 R-DoseFinding
 R-Ecdat
@@ -670,6 +671,7 @@ R-pkgload
 R-pkgmaker
 R-plm
 R-plogr
+R-plot3D
 R-plotly
 R-plotmo
 R-plotrix
@@ -870,6 +872,7 @@ R-subselect
 R-superpc
 R-survey
 R-svUnit
+R-svglite
 R-sys
 R-systemfit
 R-systemfonts
Author	SHA1	Message	Date
clrbuilder	b443e169d5	Update packages file for version 34360 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-03-09 00:06:34 -08:00
Patrick McCarty	cd55363a3c	Improve detection of the debuginfo rpm It's not likely for a package name to have the substring "-debuginfo", but just in case, implement more robust detection of the actual debuginfo rpm for a package by constructing the name more carefully. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-09 06:19:40 +00:00
Patrick McCarty	e0054520f8	Filter out debuginfo rpms when scanning for banned files The debuginfo subpackages are automatically generated, with content installed according to a predefined directory layout, so there is little value in checking for banned files they may ship. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-09 06:02:10 +00:00
Patrick McCarty	ecb84bfabf	Add two new CRAN packages Needed to satisfy new updates for `R-kableExtra` and `R-ks`. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-08 22:43:34 +00:00