remove node-notifier from webpack due to licensing issues

This commit is contained in:
Andreas Gerstmayr 2019-12-12 12:20:57 +01:00
parent 43ef7d3d20
commit a8f667a087
5 changed files with 27 additions and 11 deletions

View File

@ -8,11 +8,13 @@ VER=1.0.4
spectool -g grafana-pcp.spec
./create_dependency_bundle.sh $(pwd)/grafana-pcp-$VER.tar.gz $(pwd)/grafana-pcp-deps-$VER.tar.xz
./check_npm_dependencies.py grafana-pcp.spec grafana-pcp-$VER.tar.gz grafana-pcp-deps-$VER.tar.xz
fedpkg new-sources grafana-pcp-$VER.tar.gz grafana-pcp-deps-$VER.tar.xz
fedpkg local
fedpkg lint
fedpkg mockbuild
fedpkg scratch-build --srpm
fedpkg new-sources grafana-pcp-$VER.tar.gz grafana-pcp-deps-$VER.tar.xz
fedpkg build
fedpkg update
```

View File

@ -1,5 +1,4 @@
#!/bin/bash
set -e
#!/bin/sh -eux
SRC="${1:?Usage: $0 source destination}"
DEST="${2:?Usage: $0 source destination}"
@ -9,10 +8,18 @@ if [ -f "$DEST" ]; then
exit 0
fi
pushd $(mktemp -d)
echo Installing dependencies...
tar xfz $SRC
cd grafana-pcp-*
yarn install
echo "Compressing..."
echo Removing files with licensing issues...
rm -rf node_modules/node-notifier
echo Compressing...
XZ_OPT=-9 tar cJf $DEST node_modules
popd

View File

@ -1,6 +1,7 @@
addFilter("W: spelling-error %description -l en_US datasources -> .*")
addFilter("W: spelling-error %description -l en_US pmseries -> .*")
addFilter("W: spelling-error %description -l en_US bpftrace -> .*")
addFilter("W: spelling-error %description -l en_US pmdabpftrace -> .*")
addFilter("W: strange-permission create_dependency_bundle.sh 755")
addFilter("W: invalid-url Source1: grafana-pcp-deps-.*")

View File

@ -1,6 +1,6 @@
Name: grafana-pcp
Version: 1.0.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Performance Co-Pilot Grafana Plugin
%global github https://github.com/performancecopilot/grafana-pcp
@ -23,11 +23,11 @@ Suggests: redis >= 5.0.0
Suggests: bpftrace >= 0.9.2
# Obsolete old webapps
Obsoletes: pcp-webjs
Obsoletes: pcp-webapp-blinkenlights
Obsoletes: pcp-webapp-grafana
Obsoletes: pcp-webapp-graphite
Obsoletes: pcp-webapp-vector
Obsoletes: pcp-webjs
Obsoletes: pcp-webapp-blinkenlights
Obsoletes: pcp-webapp-grafana
Obsoletes: pcp-webapp-graphite
Obsoletes: pcp-webapp-vector
# Bundled npm packages
Provides: bundled(nodejs-@babel/cli) = 7.5.5
@ -87,6 +87,9 @@ bpftrace scripts from pmdabpftrace(1), as well as several dashboards.
rm -rf dist
./node_modules/webpack/bin/webpack.js --config webpack.config.prod.js
# webpack/copy-webpack-plugin sometimes outputs files with mode = 666 due to reasons unknown (race condition/umask issue afaics)
chmod -Rf a+rX,u+w,g-w,o-w dist
%check
./node_modules/jest/bin/jest.js --silent
@ -101,6 +104,9 @@ cp -a dist/* %{buildroot}/%{install_dir}
%doc README.md
%changelog
* Thu Dec 12 2019 Andreas Gerstmayr <agerstmayr@redhat.com> 1.0.4-2
- remove node_modules/node-notifier directory from webpack (due to licensing issues)
* Wed Dec 11 2019 Andreas Gerstmayr <agerstmayr@redhat.com> 1.0.4-1
- flame graphs: clean flame graph stacks every 5s (reduces CPU load)
- general: implement PCP version checks

View File

@ -1,2 +1,2 @@
SHA512 (grafana-pcp-1.0.4.tar.gz) = 2ca9b71c1f1557d304fb54e0e4ffb11dcbba4e1cfa35ee8a448da4006b0d3d60b3032adfa8dba0ff884f84b86bd97a05d07828dea55f08a76e3f10f35cd4f9d9
SHA512 (grafana-pcp-deps-1.0.4.tar.xz) = c827903a2efcf6d303af774660d4052f6d6ac55161199a6f48ea76d6fe7e9d1f81e1e5d42322b5d4f15071781bb8d0629661e4b37b0ceb438979ad76b0823a03
SHA512 (grafana-pcp-deps-1.0.4.tar.xz) = 1f845ece73333ec5e0ffc20777d15291d879d6a790d314497c18426cc73d10b43b2f195cd7a6677a922f7f61ce32fee04efdc540627897fdedc4453942a4b7fb