Update packages file for version 27570

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

Makefile

@@ -17,5 +17,9 @@ update:
 	curl -f -o packages ${BASE_URL}/source/package-sources
 	cut -f1 packages | LC_ALL=C sort > packages.new && mv packages.new packages
 
+.PHONY: spdx
 spdx:
-	curl -s spdx.org/licenses/ | sed '0,/<tbody>/d;/<\/tbody>/q;s/<tr>/\f/g;s/$$/,/g;s/<[^>]*>//g' | awk 'BEGIN{RS="\f";FS=","} {print $$4}' | sed '/^$$/d;s/^[ ]*//' > spdx
+	JSON=$$(mktemp); \
+	trap "rm $$JSON" EXIT; \
+	curl -f -S -s https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json > $$JSON || exit 1; \
+	jq -r '.licenses[] | .licenseId' < $$JSON | LC_COLLATE=C sort > licenses-spdx

Makefile.common

@@ -15,6 +15,7 @@ SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --
 SRPMFILE = results/$(SRPMVERS).src.rpm
 
 LATEST_RPMS = $(wildcard rpms/*.rpm)
+DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -45,7 +46,7 @@ upstream:
 #help or that it is in the exceptions list.
 spdxcheck: $(SPECFILE)
 	@for LICENSE in `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{LICENSE}\n' $(SPECFILE)`; do \
-		if ! grep -q "^$$LICENSE$$" $(TOPLVL)/projects/common/licenses-spdx && ! grep -q "$$LICENSE$$" $(TOPLVL)/projects/common/licenses-exceptions; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
+		if ! grep -qx "$$LICENSE" $(TOPLVL)/projects/common/licenses-{spdx,exceptions,extra}; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
 	done; test -z "$$FAIL"
 
 #help cvecheck: Checks
@@ -61,7 +62,7 @@ clean:
 
 #help proper: Brings your copy of the package to a nearly clean git checkout state.
 proper: repodel
-	rm -rf results
+	rm -rf results rpms
 	rm -f build.log.round*
 	rm -f mock_build.log mock_srpm.log $(__allsources) report.html
 
@@ -154,13 +155,15 @@ pullrebase:
 		fi \
 	fi
 
+preautospec-checks:
+
 #help autospec: automatically generates a specfile. If there is
 #help already a specfile, it will be overwritten. Several files used by
 #help autospec will be created in the process.
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options
 #help to autospec.
 #help For more information, see the project at https://github.com/clearlinux/autospec
-autospec: pullrebase localreponotice clean-old-content
+autospec: preautospec-checks pullrebase localreponotice clean-old-content
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
@@ -406,6 +409,36 @@ install:
 	done
 	@$(MAKE) loop-down DEVICE=6
 
+#help install-debuginfo-local: Install locally built debuginfo RPM to
+#help the automatic debuginfo cache location (/var/cache/debuginfo)
+install-debuginfo-local:
+	tmpdir=$$(mktemp -d); \
+	rpm2cpio ${DEBUGINFO_RPM} | ( cd $$tmpdir; cpio -i -d -u); \
+	dest=/var/cache/debuginfo/lib; \
+	find $$tmpdir/usr/lib/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
+		sudo chown -R dbginfo:dbginfo "$$d"; \
+		sudo cp -a "$$d" $$dest/; \
+	done; \
+	dest=/var/cache/debuginfo/src; \
+	find $$tmpdir/usr/src/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
+		sudo chown -R dbginfo:dbginfo "$$d"; \
+		sudo cp -a "$$d" $$dest/; \
+	done; \
+	sudo rm -rf $$tmpdir
+
+#help install-local: Install locally built RPMs to the root filesystem. Note that the
+#help debuginfo RPM installs to /var/cache/debuginfo
+install-local:
+	for r in $(filter-out ${DEBUGINFO_RPM},${RPMS}); do \
+		rpm2cpio $$r | (cd /; sudo cpio -i -d -u); \
+	done
+	$(MAKE) install-debuginfo-local
+
+#help install-mock: Install locally built RPMs to the mock rootcache
+#help filesystem. This command is usually used with "make shell".
+install-mock: repoadd
+	$(MOCK) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME) -i $(filter-out ${DEBUGINFO_RPM},${RPMS})
+
 #help generateupstream: Run this rule to create or update the 'upstream' file
 #help by downloading the upstream source tarballs listed in the spec file and
 #help calculating their hashes. Autospec performs this step automatically, so
@@ -433,6 +466,15 @@ generateupstream:
 drop-abandoned: $(SPECFILE)
 	python3 $(TOPLVL)/projects/common/drop-abandoned-patches.py $(SPECFILE)
 
+#help cloc: Count lines of code with the `cloc` tool on the full sources of package
+cloc: $(SRPMFILE)
+	@$(MOCK) -r $(TOPLVL)/repo/clear.cfg $(SRPMFILE) --result=results/ --no-cleanup-after
+	@$(MOCK) --chroot --copyin /usr/bin/cloc /usr/bin/cloc --result=results/ --no-cleanup-after
+	@$(MOCK) --result=results/ --no-cleanup-after --chroot '/usr/bin/cloc /builddir > /tmp/cloc.txt'
+	@$(MOCK) --copyout /tmp/cloc.txt results/ --result=results/
+	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
+	cat results/cloc.txt
+
 # Define site local common targets in a separate makefile
 -include $(TOPLVL)/projects/common/Makefile.common.site_local
 

Makefile.toplevel

@@ -136,11 +136,11 @@ clean-pkgs-dir: $(PACKAGES_FILE)
 	done
 	@echo "packages directory cleaned";
 
-clean_PKGS = $(addprefix clean_,$(PKGS))
+clean_PKGS = $(addprefix clean_,$(PKGS_LOCAL))
 #help clean: Run 'make clean' for every package.
 clean: $(clean_PKGS)
 
-proper_PKGS = $(addprefix proper_,$(PKGS))
+proper_PKGS = $(addprefix proper_,$(PKGS_LOCAL))
 #help proper: Run 'make proper' for every package, and purge the local
 #help repo and image.
 proper: $(proper_PKGS)
@@ -154,34 +154,34 @@ proper: $(proper_PKGS)
 
 $(clean_PKGS):
 	@echo "cleaning $(patsubst clean_%,%,$@)"
-	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
+	-@$(MAKE) -s -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
 
 $(proper_PKGS):
-	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
+	-@$(MAKE) -s -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
 
 #help status: Runs git status for all package repos, thus displaying untracked
 #help and unstaged files in addition to staged files.
-status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
+status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
-	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
+	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
 	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
 #help diff: Runs git diff for all package repos and displays the output using
 #help diffstat. Requires that diffstat is installed.
-diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
+diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
-	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
+	@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)) ;\
 	done
 
 #help versions: Displays the version of each package in the ./packages tree.
-versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
+versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
-	@for p in $(addprefix packages/,$(PKGS)); do \
+	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
 		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}\n' *.spec | head -n1; fi) ;\
 	done
 
 #help releases: Like 'make versions', but also displays the release number.
-releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
+releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
-	@for p in $(addprefix packages/,$(PKGS)); do \
+	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
 		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' *.spec | head -n1; fi) ;\
 	done
 
@@ -190,13 +190,15 @@ releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
 provides:
 	@$(TOPLVL)/projects/common/provides.sh -f $(FP) -r $(RN)
 
+preautospecnew-checks:
+
 #help autospecnew: Creates a new autospec package with for a given URL=$(URL)
 #help with NAME=$(NAME). Several files used by autospec will be created in the
 #help process.
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options
 #help to autospec.
 #help For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
-autospecnew: localreponotice
+autospecnew: preautospecnew-checks localreponotice
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \

licenses-extra

@@ -0,0 +1,7 @@
+# This file contains SPDX license identifiers that are not defined in the
+# latest version of SPDX but still needed (or possibly needed) for Clear Linux
+# packages.
+GFDL-1.3+
+MIT-Opengroup
+WXwindows
+w3c

licenses-spdx

@@ -1,56 +1,63 @@
+0BSD
 AAL
-Abstyles
-Adobe-2006
-Adobe-Glyph
 ADSL
 AFL-1.1
 AFL-1.2
 AFL-2.0
 AFL-2.1
 AFL-3.0
-Afmparse
 AGPL-1.0
+AGPL-1.0-only
+AGPL-1.0-or-later
 AGPL-3.0
-Aladdin
+AGPL-3.0-only
+AGPL-3.0-or-later
 AMDPLPA
 AML
 AMPAS
 ANTLR-PD
-Apache-1.0
-Apache-1.1
-Apache-2.0
 APAFML
 APL-1.0
 APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
+Abstyles
+Adobe-2006
+Adobe-Glyph
+Afmparse
+Aladdin
+Apache-1.0
+Apache-1.1
+Apache-2.0
 Artistic-1.0
-Artistic-1.0-cl8
 Artistic-1.0-Perl
+Artistic-1.0-cl8
 Artistic-2.0
+BSD-1-Clause
+BSD-2-Clause
+BSD-2-Clause-FreeBSD
+BSD-2-Clause-NetBSD
+BSD-2-Clause-Patent
+BSD-3-Clause
+BSD-3-Clause-Attribution
+BSD-3-Clause-Clear
+BSD-3-Clause-LBNL
+BSD-3-Clause-No-Nuclear-License
+BSD-3-Clause-No-Nuclear-License-2014
+BSD-3-Clause-No-Nuclear-Warranty
+BSD-4-Clause
+BSD-4-Clause-UC
+BSD-Protection
+BSD-Source-Code
+BSL-1.0
 Bahyph
 Barr
 Beerware
 BitTorrent-1.0
 BitTorrent-1.1
 Borceux
-BSD-2-Clause
-BSD-2-Clause-FreeBSD
-BSD-2-Clause-NetBSD
-BSD-3-Clause
-BSD-3-Clause-Attribution
-BSD-3-Clause-Clear
-BSD-3-Clause-LBNL
-BSD-4-Clause
-BSD-4-Clause-UC
-BSD-Protection
-BSL-1.0
-bzip2-1.0.5
-bzip2-1.0.6
-Caldera
 CATOSL-1.1
-CC0-1.0
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
@@ -81,96 +88,117 @@ CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-4.0
+CC0-1.0
 CDDL-1.0
 CDDL-1.1
+CDLA-Permissive-1.0
+CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
 CECILL-2.0
+CECILL-2.1
 CECILL-B
 CECILL-C
-ClArtistic
+CNRI-Jython
 CNRI-Python
 CNRI-Python-GPL-Compatible
-Condor-1.1
 CPAL-1.0
 CPL-1.0
 CPOL-1.02
-Crossword
 CUA-OPL-1.0
+Caldera
+ClArtistic
+Condor-1.1
+Crossword
+CrystalStacker
 Cube
 D-FSL-1.0
-diffmark
 DOC
-Dotseqn
 DSDP
-dvipdfm
+Dotseqn
 ECL-1.0
 ECL-2.0
-eCos-2.0
 EFL-1.0
 EFL-2.0
-eGenix
-Entessa
 EPL-1.0
-ErlPL-1.1
+EPL-2.0
 EUDatagrid
 EUPL-1.0
 EUPL-1.1
+EUPL-1.2
+Entessa
+ErlPL-1.1
 Eurosym
-Fair
+FSFAP
-Frameworx-1.0
-FreeImage
 FSFUL
 FSFULLR
 FTL
+Fair
+Frameworx-1.0
+FreeImage
 GFDL-1.1
+GFDL-1.1-only
+GFDL-1.1-or-later
 GFDL-1.2
+GFDL-1.2-only
+GFDL-1.2-or-later
 GFDL-1.3
-GFDL-1.3+
+GFDL-1.3-only
-Giftware
+GFDL-1.3-or-later
 GL2PS
-Glide
-Glulxe
-gnuplot
 GPL-1.0
 GPL-1.0+
+GPL-1.0-only
+GPL-1.0-or-later
 GPL-2.0
 GPL-2.0+
+GPL-2.0-only
+GPL-2.0-or-later
+GPL-2.0-with-GCC-exception
 GPL-2.0-with-autoconf-exception
 GPL-2.0-with-bison-exception
 GPL-2.0-with-classpath-exception
 GPL-2.0-with-font-exception
-GPL-2.0-with-GCC-exception
 GPL-3.0
 GPL-3.0+
-GPL-3.0-with-autoconf-exception
+GPL-3.0-only
+GPL-3.0-or-later
 GPL-3.0-with-GCC-exception
-gSOAP-1.3b
+GPL-3.0-with-autoconf-exception
-HaskellReport
+Giftware
+Glide
+Glulxe
 HPND
+HaskellReport
 IBM-pibs
 ICU
 IJG
-ImageMagick
-iMatix
-Imlib2
-Intel
-Intel-ACPI
 IPA
 IPL-1.0
 ISC
-JasPer-2.0
+ImageMagick
+Imlib2
+Info-ZIP
+Intel
+Intel-ACPI
+Interbase-1.0
 JSON
-Latex2e
+JasPer-2.0
-Leptonica
+LAL-1.2
+LAL-1.3
 LGPL-2.0
 LGPL-2.0+
+LGPL-2.0-only
+LGPL-2.0-or-later
 LGPL-2.1
 LGPL-2.1+
+LGPL-2.1-only
+LGPL-2.1-or-later
 LGPL-3.0
 LGPL-3.0+
-Libpng
+LGPL-3.0-only
-libtiff
+LGPL-3.0-or-later
+LGPLLR
 LPL-1.0
 LPL-1.02
 LPPL-1.0
@@ -178,17 +206,20 @@ LPPL-1.1
 LPPL-1.2
 LPPL-1.3a
 LPPL-1.3c
-MakeIndex
+Latex2e
-MirOS
+Leptonica
+LiLiQ-P-1.1
+LiLiQ-R-1.1
+LiLiQ-Rplus-1.1
+Libpng
+Linux-OpenIB
 MIT
-MIT-advertising
+MIT-0
 MIT-CMU
+MIT-advertising
 MIT-enna
 MIT-feh
-MIT-Opengroup
 MITNFA
-Motosoto
-mpich2
 MPL-1.0
 MPL-1.1
 MPL-2.0
@@ -196,26 +227,33 @@ MPL-2.0-no-copyleft-exception
 MS-PL
 MS-RL
 MTLL
+MakeIndex
+MirOS
+Motosoto
 Multics
 Mup
 NASA-1.3
-Naumen
 NBPL-1.0
 NCSA
-NetCDF
-Newsletr
 NGPL
+NLOD-1.0
 NLPL
-Nokia
 NOSL
-Noweb
 NPL-1.0
 NPL-1.1
 NPOSL-3.0
 NRL
 NTP
+Naumen
+Net-SNMP
+NetCDF
+Newsletr
+Nokia
+Noweb
 Nunit
+OCCT-PL
 OCLC-2.0
+ODC-By-1.0
 ODbL-1.0
 OFL-1.0
 OFL-1.1
@@ -237,77 +275,102 @@ OLDAP-2.6
 OLDAP-2.7
 OLDAP-2.8
 OML
-OpenSSL
 OPL-1.0
+OSET-PL-2.1
 OSL-1.0
 OSL-1.1
 OSL-2.0
 OSL-2.1
 OSL-3.0
+OpenSSL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
 Plexus
 PostgreSQL
-psfrag
-psutils
 Python-2.0
-Qhull
 QPL-1.0
-Rdisc
+Qhull
 RHeCos-1.1
 RPL-1.1
 RPL-1.5
 RPSL-1.0
+RSA-MD
 RSCPL
+Rdisc
 Ruby
-Saxpath
 SAX-PD
 SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
-SimPL-2.0
 SISSL
 SISSL-1.2
-Sleepycat
 SMLNJ
+SMPPL
 SNIA
 SPL-1.0
+SWL
+Saxpath
+Sendmail
+SimPL-2.0
+Sleepycat
+Spencer-86
+Spencer-94
+Spencer-99
 StandardML-NJ
 SugarCRM-1.1.3
-SWL
 TCL
+TCP-wrappers
 TMate
 TORQUE-1.1
 TOSL
+TU-Berlin-1.0
+TU-Berlin-2.0
+UPL-1.0
+Unicode-DFS-2015
+Unicode-DFS-2016
 Unicode-TOU
 Unlicense
-Vim
 VOSTROM
 VSL-1.0
+Vim
 W3C
 W3C-19980720
+W3C-20150513
+WTFPL
 Watcom-1.0
 Wsuipa
-WTFPL
-WXwindows
 X11
-Xerox
 XFree86-1.1
-xinetd
-Xnet
-xpp
 XSkat
+Xerox
+Xnet
 YPL-1.0
 YPL-1.1
+ZPL-1.1
+ZPL-2.0
+ZPL-2.1
 Zed
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
+bzip2-1.0.5
+bzip2-1.0.6
+curl
+diffmark
+dvipdfm
+eCos-2.0
+eGenix
+gSOAP-1.3b
+gnuplot
+iMatix
+libtiff
+mpich2
+psfrag
+psutils
+wxWindows
+xinetd
+xpp
 zlib-acknowledgement
-ZPL-1.1
-ZPL-2.0
-ZPL-2.1
-w3c

start_qemu.sh

@@ -43,11 +43,19 @@ if [ ! -f "$IMAGE" ]; then
 fi
 rm -f debug.log
 
+# 10/25/2018: keep back compatibility for a while
+UEFI_BIOS="-bios OVMF.fd"
+
+if [ -f OVMF_VARS.fd -a -f OVMF_CODE.fd ]; then
+    UEFI_BIOS=" -drive file=OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on "
+    UEFI_BIOS+=" -drive file=OVMF_VARS.fd,if=pflash,format=raw,unit=1 "
+fi
+
 VMN=${VMN:=1}
 
 qemu-system-x86_64 \
     -enable-kvm \
-    -bios OVMF.fd \
+    ${UEFI_BIOS} \
     -smp sockets=1,cpus=4,cores=2 -cpu host \
     -m 1024 \
     -vga none -nographic \

user-setup.sh

@@ -6,6 +6,7 @@ SERVERCA=""
 CLIENTCA=""
 WORKSPACE="clearlinux"
 PACKAGE_REPOS=
+NEEDS_KVM_GROUP=
 
 help() {
   printf "%s\n" >&2 "Usage: $SCRIPT [options]" \
@@ -115,6 +116,10 @@ required_progs() {
 
 required_progs
 
+if ! groups | grep -qw kvm; then
+  NEEDS_KVM_GROUP=1
+fi
+
 echo "Initializing development workspace in \"$WORKSPACE\" . . ."
 
 mkdir "$WORKSPACE"
@@ -146,8 +151,10 @@ if [ "$USE_KOJI" ]; then
   fi
 fi
 
-echo "Adding user to kvm group . . ."
+if [ -n "$NEEDS_KVM_GROUP" ]; then
-sudo usermod -a -G kvm $USER
+  echo "Adding user to kvm group . . ."
+  sudo usermod -a -G kvm $USER
+fi
 
 echo "Cloning special project repositories . . ."
 make ${JOBS_ARG} clone-projects
@@ -179,7 +186,9 @@ if [ -z "$PACKAGE_REPOS" ]; then
   echo "NOTE: To clone all package repos, run \"cd $WORKSPACE; make [-j NUM] clone-packages\""
   echo "NOTE: To clone a single package repo with NAME, run \"cd $WORKSPACE; make clone_NAME\""
 fi
-echo 'NOTE: logout and log back in to finalize the setup process'
+if [ -n "$NEEDS_KVM_GROUP" ]; then
+  echo 'NOTE: logout and log back in to finalize the setup process'
+fi
 
 
 # vi: ft=sh sw=2 et sts=2