mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 11:06:15 +00:00
Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ffb3603dc | |||
| b895daa84f | |||
| 48fbe7cd3e | |||
| 39aed7cee7 | |||
| 23c281b1c8 | |||
| d402ae1449 | |||
| 72cc059f89 | |||
| 0d56579421 | |||
| 02d46e6db4 | |||
| 4adb7a1524 | |||
| be21e942aa | |||
| 4e9b844267 | |||
| facb8827f7 | |||
| 77c5172cf9 | |||
| ae4ea46b1c | |||
| 8e18acca7a | |||
| ed15af71c8 | |||
| 3c20fc2ad8 | |||
| d7f6ddcce1 | |||
| 22a927e26b | |||
| 4a29a2d5c1 | |||
| 81ef638151 | |||
| 50b8b07d34 | |||
| 47b634bc75 | |||
| 292ea0bde9 | |||
| b0f7bbfb90 | |||
| 20d0fece07 | |||
| 0f546b20f5 | |||
| 16a09f7fa6 | |||
| 5a438328f2 | |||
| 9ffb55be69 | |||
| af3c84505d | |||
| a865a99283 | |||
| 9e8f0a6ff0 | |||
| 76301d4b78 | |||
| 08bef91443 | |||
| 93202eb3b5 | |||
| 14977f527c | |||
| fa93c354e1 | |||
| 6a54f15cb6 |
+6
-11
@@ -49,13 +49,6 @@ spdxcheck: $(SPECFILE)
|
||||
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
|
||||
#help for common vulnerabilities and exposures in your package.
|
||||
cvecheck:
|
||||
# https://github.com/ikeydoherty/cve-check-tool
|
||||
# Installation: https://github.com/ikeydoherty/cve-check-tool/wiki
|
||||
cve-check-tool -M $(TOPLVL)/projects/common/mapping $(SPECFILE)
|
||||
|
||||
#help clean: Cleans up the src.rpm file. but not the rpm files or log files.
|
||||
clean:
|
||||
rm -f $(SRPMFILE)
|
||||
@@ -181,7 +174,9 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
|
||||
--mock-config $(MOCK_CONFIG_VAL) \
|
||||
--mock-opts "$(MOCK_OPTS)" \
|
||||
$${SETVERSION:+ --version $${SETVERSION}} \
|
||||
${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
|
||||
$${NON_INTERACTIVE:+ --non_interactive} \
|
||||
$${SKIP_GIT:+ --skip-git} \
|
||||
$${CLEANUP:+ -C} \
|
||||
$(firstword $(NEWURL) $(URL));
|
||||
$(MAKE) link-new-rpms PKG_REPO_DIR="."
|
||||
@$(MAKE) spdxcheck
|
||||
@@ -206,12 +201,12 @@ for-review.txt:
|
||||
|
||||
#help autospecnogit: Runs autospec, but does not create a commit
|
||||
autospecnogit:
|
||||
$(MAKE) SKIP_GIT=--skip-git autospec
|
||||
$(MAKE) autospec SKIP_GIT=1
|
||||
|
||||
#help autospecnostate: Runs autospec, but cleans up mock chroots
|
||||
#help and disables interactive mode.
|
||||
autospecnostate:
|
||||
$(MAKE) CLEANUP=-C NON_INTERACTIVE=--non_interactive autospec
|
||||
$(MAKE) autospec CLEANUP=1 NON_INTERACTIVE=1
|
||||
|
||||
scanlicense:
|
||||
python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --config $(AUTOSPEC_CONF) --license-only $(firstword $(NEWURL) $(URL)) --name $(PKG_NAME)
|
||||
@@ -220,7 +215,7 @@ scanlicense:
|
||||
bump:
|
||||
git pull --rebase
|
||||
$(MAKE) bumpnogit
|
||||
git add *.spec release
|
||||
git add $(SPECFILE) release
|
||||
git commit -a -m "version bump from $(shell rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)) to `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)`"
|
||||
|
||||
#help bumpnogit: Increments the release file by one and does not commit changes.
|
||||
|
||||
+2
-8
@@ -34,7 +34,7 @@ $(proj_PKGS):
|
||||
git clone $(PRJ_BASE_URL)/$$proj projects/$$proj; \
|
||||
cd projects/$$proj; \
|
||||
if [ "$$proj" = "autospec" ] ; then \
|
||||
git remote set-url --push origin https://github.com/clearlinux/autospec.git; \
|
||||
git remote set-url --push origin git@github.com:clearlinux/autospec.git; \
|
||||
else \
|
||||
$(call gitoliteurl,projects/$$proj); \
|
||||
fi; \
|
||||
@@ -56,12 +56,6 @@ $(clone_PKGS): $(PACKAGES_FILE) packages/common/Makefile.common
|
||||
$(call subjectprefix,$$pkg); \
|
||||
)
|
||||
|
||||
#help cvecheck: Checks for common vulnerabilities and exposures in your code.
|
||||
cvecheck:
|
||||
# https://github.com/ikeydoherty/cve-check-tool
|
||||
# Installation: https://github.com/ikeydoherty/cve-check-tool/wiki
|
||||
cve-check-tool -n -M $(TOPLVL)/projects/common/mapping $(PACKAGES_FILE)
|
||||
|
||||
#help pull: Performs a git pull --rebase for each package repo, avoiding the creation
|
||||
#help of merge commits, while displaying any changes since your last pull. It is
|
||||
#help silent if there are no changes.
|
||||
@@ -83,7 +77,7 @@ ${PULL_PKGS}:
|
||||
git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit $$O..$$N; echo; \
|
||||
fi ; \
|
||||
if [ "$$p" = "projects/autospec" ] ; then \
|
||||
git remote set-url --push origin https://github.com/clearlinux/autospec.git; \
|
||||
git remote set-url --push origin git@github.com:clearlinux/autospec.git; \
|
||||
else \
|
||||
$(call gitoliteurl,$$p); \
|
||||
fi ; \
|
||||
|
||||
@@ -237,6 +237,7 @@ MTLL
|
||||
MakeIndex
|
||||
MirOS
|
||||
Motosoto
|
||||
MulanPSL-1.0
|
||||
Multics
|
||||
Mup
|
||||
NASA-1.3
|
||||
@@ -264,6 +265,7 @@ ODC-By-1.0
|
||||
ODbL-1.0
|
||||
OFL-1.0
|
||||
OFL-1.1
|
||||
OGL-Canada-2.0
|
||||
OGL-UK-1.0
|
||||
OGL-UK-2.0
|
||||
OGL-UK-3.0
|
||||
@@ -323,6 +325,8 @@ SMLNJ
|
||||
SMPPL
|
||||
SNIA
|
||||
SPL-1.0
|
||||
SSH-OpenSSH
|
||||
SSH-short
|
||||
SSPL-1.0
|
||||
SWL
|
||||
Saxpath
|
||||
@@ -343,6 +347,7 @@ TORQUE-1.1
|
||||
TOSL
|
||||
TU-Berlin-1.0
|
||||
TU-Berlin-2.0
|
||||
UCL-1.0
|
||||
UPL-1.0
|
||||
Unicode-DFS-2015
|
||||
Unicode-DFS-2016
|
||||
@@ -382,6 +387,7 @@ diffmark
|
||||
dvipdfm
|
||||
eCos-2.0
|
||||
eGenix
|
||||
etalab-2.0
|
||||
gSOAP-1.3b
|
||||
gnuplot
|
||||
iMatix
|
||||
|
||||
@@ -51,4 +51,5 @@ rack = rubygem-rack
|
||||
compute = nova
|
||||
international_components_for_unicode = icu4c
|
||||
node.js = nodejs
|
||||
jupyter-core = jupyter_core
|
||||
jupyter-core = jupyter_core
|
||||
flatten-json = flatten_json
|
||||
Reference in New Issue
Block a user