diff --git a/Makefile b/Makefile index 221adeb..05a771a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ OS = $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH = $(shell uname -m) +VERSION = $(shell cat RMD_VERSION) RMD_VERSION = $(shell cat RMD_VERSION | sed -e 's/^v//') OUTPUT_DIR=build/$(OS)/$(ARCH) RMD_DIR = rmd-$(RMD_VERSION) @@ -35,16 +36,6 @@ install: build cp $(OUTPUT_DIR)/rmd $(DESTDIR)/usr/bin/rmd cp $(OUTPUT_DIR)/gen_conf $(DESTDIR)/usr/bin/gen_conf bash -c "./scripts/install.sh --skip-pam-userdb" -package: - mkdir -p RMD_DIR - rsync -avr --exclude=$(RMD_DIR),.git,build * $(RMD_DIR) - tar -zcvf $(RMD_DIR).tar.gz $(RMD_DIR)/ - rm -rf $(RMD_DIR)/ - rpmdev-setuptree - cp packaging/rmd.spec $(HOME)/rpmbuild/SPECS - mv $(RMD_DIR).tar.gz $(HOME)/rpmbuild/SOURCES - bash -c "./packaging/download_extra_packages.sh $(PWD)/packages/ $(HOME)/rpmbuild/SOURCES" - rpmbuild -ba $(HOME)/rpmbuild/SPECS/rmd.spec docker: @docker build -t rmd . clean: diff --git a/go.mod b/go.mod index 05d9a78..001e4c9 100644 --- a/go.mod +++ b/go.mod @@ -30,6 +30,7 @@ require ( github.com/smartystreets/goconvey v1.6.4 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.0 + github.com/streadway/amqp v1.0.0 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v0.0.0-20170721134547-ae643c872d2c // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect @@ -40,4 +41,5 @@ require ( golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/gavv/httpexpect.v1 v1.0.0-20170328075429-d852bb8255b6 + gopkg.in/yaml.v2 v2.3.0 ) diff --git a/go.sum b/go.sum index d0bbc9f..6cf7bd8 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,7 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -36,6 +37,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= @@ -44,10 +46,12 @@ github.com/emicklei/go-restful v2.4.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955 h1:gmtGRvSexPU4B1T/yYo0sLOKzER1YT+b4kPxPpm0Ty4= github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955/go.mod h1:vmp8DIyckQMXOPl0AQVHt+7n5h7Gb7hS6CUydiV8QeA= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= @@ -83,6 +87,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0= github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -90,6 +95,7 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -117,11 +123,31 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/jarcoal/httpmock v1.0.4 h1:jp+dy/+nonJE4g4xbVtl9QdrUNbn6/3hDT5R4nDIZnA= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.10.6 h1:SP6zavvTG3YjOosWePXFDlExpKIWMTO4SE/Y8MZB2vI= +github.com/klauspost/compress v1.10.6/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= @@ -137,6 +163,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd h1:Y4ZRx+RIPFlPL4gnD/I7bdqSNXHlNop1Q6NjQuHds00= +github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -151,12 +180,23 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v0.0.0-20161031194548-4e24498b31db h1:eZgFHVkk9uOTaOQLC6tgjkzdp7Ays8eEVecBcfHZlJQ= +github.com/moul/http2curl v0.0.0-20161031194548-4e24498b31db/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/moul/http2curl v0.0.0-20161031194548-4e24498b31db/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -166,6 +206,10 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prashantv/gostub v0.0.0-20170112001514-5c68b99bb088 h1:FXf19oenTNOzIKDjChfZIKH54YONyAYSWE8Eb6tIsew= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prashantv/gostub v0.0.0-20170112001514-5c68b99bb088/go.mod h1:dP1v6T1QzyGJJKFocwAU0lSZKpfjstjH8TlhkEU0on0= @@ -182,11 +226,15 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v0.0.0-20170409071739-feef008d51ad h1:tSFsPEWlyDYLf376k3+aunLH2qE7TMd/8arj5jZtqg8= github.com/sergi/go-diff v0.0.0-20170409071739-feef008d51ad/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= +github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -202,6 +250,12 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= +github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -209,6 +263,24 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v0.0.0-20170721134547-ae643c872d2c h1:gnpZsV7hlWPSDzPwsPvTgude0NJ+Jf8675qaOyLPfI0= +github.com/valyala/fasthttp v0.0.0-20170721134547-ae643c872d2c/go.mod h1:+g/po7GqyG5E+1CNgquiIxJnsXEi5vwFn5weFujbO78= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yalp/jsonpath v0.0.0-20150812003900-31a79c7593bb h1:06WAhQa+mYv7BiOk13B/ywyTlkoE/S7uu6TBKU6FHnE= +github.com/yalp/jsonpath v0.0.0-20150812003900-31a79c7593bb/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v0.0.0-20170721134547-ae643c872d2c/go.mod h1:+g/po7GqyG5E+1CNgquiIxJnsXEi5vwFn5weFujbO78= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -263,6 +335,7 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -315,6 +388,10 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc h1:NCy3Ohtk6Iny5V/reW2Ktypo4zIpWBdRJ1uFMjBxdg8= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -348,6 +425,11 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gavv/httpexpect.v1 v1.0.0-20170328075429-d852bb8255b6 h1:o2WMV1zTb387Rl+jelFKhaijKWk+MOMdHjHg61QzZlE= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -355,6 +437,7 @@ gopkg.in/gavv/httpexpect.v1 v1.0.0-20170328075429-d852bb8255b6/go.mod h1:WtiW9ZA gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/packaging/README.md b/packaging/README.md new file mode 100644 index 0000000..6f918a9 --- /dev/null +++ b/packaging/README.md @@ -0,0 +1,19 @@ +How do I build and install from a RPM Spec file? + +===================================================================================== + +Basic steps to build source and binary packages in your home directory: + +1.Create the rpmbuild directory structure: +$ rpmdev-setuptree + +2.Next, download the RMD tar file and copy into ~/rpmbuild/SOURCES directory: + +$ wget https://github.com/intel/rmd/archive/v0.3.1.tar.gz +$ cp ./v0.3.1.tar.gz ~/rpmbuild/SOURCES + +3.To build, do: +$ rpmbuild -ba path/to/rmd.spec + +4.To install, do: +yum install ~/rpmbuild/RPMS/x86_64/rmd-0.3.1-1.fc32.x86_64.rpm diff --git a/packaging/download_extra_packages.sh b/packaging/download_extra_packages.sh deleted file mode 100755 index 65ff262..0000000 --- a/packaging/download_extra_packages.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -PACKAGE_NAME=rmd-extra.pkg.tar.gz - -if [[ -z $1 || -z $2 ]] -then - echo "Usage: $0 " - exit 1 -fi - -DOWNLOAD_PATH=$1 -OUTPUT_PATH=$2 - -echo "Downloading all dependencies to: $DOWNLOAD_PATH" - -# create output directory if does not exists -mkdir -p $DOWNLOAD_PATH - -# set GOPATH to download directory -export GOPATH=$DOWNLOAD_PATH -# force to enable Go modules (just in case) -export GO111MODULE=on - - -# check if current directory or parent directory contains go.mod -INPUT="" - -if [ -f go.mod ] -then - INPUT="./go.mod" -elif [ -f ../go.mod] -then - INPUT="../go.mod" -else - echo "No go.mod found in current neither parent directory" - exit 1 -fi - -echo "Reading packages from: $INPUT" - -for line in `grep "^\s\+" $INPUT | sed -e "s/\s\+\(\S\+\) \(\S\+\).*/\1@\2/"` -do - echo "... fetching $line" - go get $line -done - -# All packages downloaded - create tarbal - -START_POINT=`pwd` -# enter parent folder of download path -cd $(dirname $DOWNLOAD_PATH) -# create a .tar.gz file -tar czf $OUTPUT_PATH/$PACKAGE_NAME $(basename $DOWNLOAD_PATH) - -echo Done -# show the tarball details (ex. human readable size) -ls -lh $OUTPUT_PATH/$PACKAGE_NAME - -# go back to the directory where has been launched -cd $START_POINT - -# remove downloaded packages (first change dir modes as go get set them to RO) -chmod -R u+rw $DOWNLOAD_PATH -rm -r $DOWNLOAD_PATH - diff --git a/packaging/rmd.spec b/packaging/rmd.spec index b42cbb0..580269b 100644 --- a/packaging/rmd.spec +++ b/packaging/rmd.spec @@ -1,57 +1,89 @@ +%global goipath github.com/intel/rmd + Name: rmd -Version: 0.3 +Version: 0.3.1 Release: 1%{?dist} Summary: Resource Management Daemon-RMD -License: ASL 2.0 +License: ASL 2.0 and BSD and MIT and MPLv2.0 URL: https://github.com/intel/rmd -Source0: https://github.com/arunprabhu123/rmd/blob/master/rmd-0.3.tar.gz - -#Extra packages can be generated by running script in the RMD source -#./packaging/download_extra_packages.sh -Source1: rmd-extra.pkg.tar.gz +Source0: https://github.com/intel/rmd/archive/v0.3.1.tar.gz BuildRequires: go BuildRequires: make -BuildRequires: intel-cmt-cat-devel BuildRequires: pam-devel BuildRequires: systemd BuildRequires: systemd-rpm-macros -BuildRequires: go-rpm-macros BuildRequires: git-core -BuildRequires: golang-github-knetic-govaluate-devel -BuildRequires: golang-github-bgentry-speakeasy-devel -BuildRequires: golang-github-casbin-devel -BuildRequires: golang-github-fatih-structs-devel -BuildRequires: golang-github-globalsign-mgo-devel -BuildRequires: golang-github-gobwas-glob-devel -BuildRequires: golang-github-glog-devel -BuildRequires: golang-github-gopherjs-devel -BuildRequires: golang-github-hashicorp-hcl-devel -BuildRequires: golang-github-jtolds-gls-devel -BuildRequires: golang-github-klauspost-compress-devel -BuildRequires: golang-github-klauspost-cpuid-devel -BuildRequires: golang-github-kr-pretty-devel -BuildRequires: golang-github-magiconair-properties-devel -BuildRequires: golang-github-mitchellh-mapstructure-devel -BuildRequires: golang-github-msteinert-pam-devel -BuildRequires: golang-github-onsi-ginkgo-devel -BuildRequires: golang-github-onsi-gomega-devel -BuildRequires: golang-github-sirupsen-logrus-devel -BuildRequires: golang-github-spf13-afero-devel -BuildRequires: golang-github-spf13-cast-devel -BuildRequires: golang-github-spf13-jwalterweatherman-devel -BuildRequires: golang-github-spf13-pflag-devel -BuildRequires: golang-github-spf13-viper-devel -BuildRequires: golang-github-streadway-amqp-devel -BuildRequires: golang-github-stretchr-testify-devel -BuildRequires: golang-github-valyala-bytebufferpool-devel -BuildRequires: golang-github-xeipuuv-gojsonschema-devel -BuildRequires: golang-github-yudai-gojsondiff-devel -BuildRequires: golang-github-yudai-golcs-devel -BuildRequires: golang-etcd-bbolt-devel -BuildRequires: golang-x-sync-devel -BuildRequires: golang-x-sys-devel -BuildRequires: golang-gopkg-yaml-2-devel +#intel-cmt-cat-devel :BSD +Requires: intel-cmt-cat-devel >= 2.0.0-3 +#github.com/Knetic/govaluate : MIT +Provides: bundled(golang(github.com/Knetic/govaluate)) = 3.0.1 +#github.com/bgentry/speakeasy : MIT +Provides: bundled(golang(github.com/bgentry/speakeasy)) = 0.1.0 +#github.com/casbin/casbin : ASL 2.0 +Provides: bundled(golang(github.com/casbin/casbin)) = 1.9.1 +#github.com/fatih/structs : MIT +Provides: bundled(golang(github.com/fatih/structs)) = 1.1.0 +#github.com/globalsign/mgo : BSD +Provides: bundled(golang(github.com/globalsign/mgo)) = 0.0.0 +#github.com/gobwas/glob : MIT +Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 +#github.com/gopherjs/gopherjs : BSD +Provides: bundled(golang(github.com/gopherjs/gopherjs)) = 0.0.0 +#github.com/hashicorp/hcl : MPLv2.0 +Provides: bundled(golang(github.com/hashicorp/hcl)) = 1.0.0 +#github.com/jtolds/gls : MIT +Provides: bundled(golang(github.com/jtolds/gls)) = 4.20.0 +#github.com/klauspost/compress : BSD +Provides: bundled(golang(github.com/klauspost/compress)) = 1.10.6 +#github.com/klauspost/cpuid : MIT +Provides: bundled(golang(github.com/klauspost/cpuid)) = 1.10.6 +#github.com/kr/pretty : MIT +Provides: bundled(golang(github.com/kr/pretty)) = 0.1.0 +#github.com/magiconair/properties : BSD +Provides: bundled(golang(github.com/magiconair/properties)) = 1.8.1 +#github.com/mitchellh/mapstructure : MIT +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.1.2 +#github.com/onsi/ginkgo : MIT +Provides: bundled(golang(github.com/onsi/ginkgo)) = 1.14.2 +#github.com/onsi/gomega : MIT +Provides: bundled(golang(github.com/onsi/gomega)) = 1.10.1 +#github.com/sirupsen/logrus : MIT +Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.6.0 +#github.com/spf13/afero : ASL 2.0 +Provides: bundled(golang(github.com/spf13/afero)) = 1.1.2 +#github.com/spf13/cast : MIT +Provides: bundled(golang(github.com/spf13/cast)) = 1.3.0 +#github.com/spf13/jwalterweatherman : MIT +Provides: bundled(golang(github.com/spf13/jwalterweatherman)) = 1.0.0 +#github.com/spf13/pflag : BSD +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 +#github.com/spf13/viper : MIT +Provides: bundled(golang(github.com/spf13/viper)) = 1.7.0 +#github.com/streadway/amqp : BSD +Provides: bundled(golang(github.com/streadway/amqp)) = 1.0.0 +#github.com/stretchr/testify : MIT +Provides: bundled(golang(github.com/stretchr/testify)) = 1.3.0 +#github.com/valyala/bytebufferpool : MIT +Provides: bundled(golang(github.com/valyala/bytebufferpool)) = 1.0.0 +#github.com/xeipuuv/gojsonschema : ASL 2.0 +Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 1.2.0 +#github.com/yudai/gojsondiff : MIT +Provides: bundled(golang(github.com/yudai/gojsondiff)) = 1.0.0 +#github.com/yudai/golcs : MIT +Provides: bundled(golang(github.com/yudai/golcs)) = 0.0.0 +#golang.org/x/sys/cpu : BSD +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.0.0 +#gopkg.in/yaml.v2 : ASL 2.0 and MIT +Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.3.0 +#github.com/golang/glog : ASL 2.0 +Provides: bundled(golang(github.com/golang/glog)) = 0.0.0 +#github.com/etcd-io/bbolt : MIT +Provides: bundled(golang(github.com/etcd-io/bbolt)) = 1.3.3 +#gopkg.in/yaml.v2 : ASL 2.0 and MIT +Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.3.0 +#github.com/streadway/amqp : BSD +Provides: bundled(golang(github.com/streadway/amqp)) = 1.0.0 # this package does not support big endian arch so far, # and has been verified only on Intel platforms. @@ -64,18 +96,13 @@ hardware resource management tasks on x86 platforms. %prep %setup -q -mkdir _pkg -tar -C _pkg -x -v -f %{SOURCE1} -find _pkg -type d -exec chmod 755 {} \; -export GOPATH=$PWD/_pkg/packages:/usr/lib/golang %build -GOPATH_BACKUP=$GOPATH -unset GOPATH -go env -w GOPATH=$PWD/_pkg/packages -make %{?_smp_mflags} -unset GOPATH -go env -w GOPATH=$GOPATH_BACKUP +export GOPATH=${PWD} +export PATH=${GOPATH}:${PATH} +rsync -az --exclude=gopath/ ./ %{_builddir}/%{name}-%{version} +cd %{_builddir}/%{name}-%{version} +make %{?_smp_mflags} VERSION=${RMD_VERSION} %install @@ -86,73 +113,73 @@ if [[ "${GOARCH}" == "amd64" ]]; then GOARCH="x86_64" fi -install -p -m 755 %{_builddir}/%{name}-%{version}/build/$GOOS/$GOARCH/rmd %{buildroot}/%{_bindir}/ -install -p -m 755 %{_builddir}/%{name}-%{version}/build/$GOOS/$GOARCH/gen_conf %{buildroot}/%{_bindir}/ +install -p -m 755 %{_builddir}/%{name}-%{version}/build/$GOOS/$GOARCH/rmd %{buildroot}%{_bindir}/ +install -p -m 755 %{_builddir}/%{name}-%{version}/build/$GOOS/$GOARCH/gen_conf %{buildroot}%{_bindir}/ -install -d %{buildroot}/%{_mandir}/man8 -install -m 0644 %{_builddir}/%{name}-%{version}/rmd.8 %{buildroot}/%{_mandir}/man8 -ln -sf %{_mandir}/man8/rmd.8 %{buildroot}/%{_mandir}/man8/gen_conf.8 +install -d %{buildroot}%{_mandir}/man8 +install -m 0644 %{_builddir}/%{name}-%{version}/rmd.8 %{buildroot}%{_mandir}/man8 +ln -sf %{_mandir}/man8/rmd.8 %{buildroot}%{_mandir}/man8/gen_conf.8 -mkdir -p %{buildroot}/%{_datadir}/%{name}/scripts -install -m 755 %{_builddir}/%{name}-%{version}/scripts/setup_rmd_users.sh %{buildroot}/%{_datadir}/%{name}/scripts +mkdir -p %{buildroot}%{_datadir}/%{name}/scripts +install -m 755 %{_builddir}/%{name}-%{version}/scripts/setup_rmd_users.sh %{buildroot}%{_datadir}/%{name}/scripts -mkdir -p %{buildroot}/%{_unitdir} -install -m 644 %{_builddir}/%{name}-%{version}/scripts/%{name}.service %{buildroot}/%{_unitdir} +mkdir -p %{buildroot}%{_unitdir} +install -m 644 %{_builddir}/%{name}-%{version}/scripts/%{name}.service %{buildroot}%{_unitdir} -mkdir -p %{buildroot}/%{_sysconfdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cpu_map.toml %{buildroot}/%{_sysconfdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/policy.toml %{buildroot}/%{_sysconfdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/policy.yaml %{buildroot}/%{_sysconfdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/rmd.toml %{buildroot}/%{_sysconfdir}/rmd +mkdir -p %{buildroot}%{_sysconfdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cpu_map.toml %{buildroot}%{_sysconfdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/policy.toml %{buildroot}%{_sysconfdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/policy.yaml %{buildroot}%{_sysconfdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/rmd.toml %{buildroot}%{_sysconfdir}/rmd -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/acl/roles/admin -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/roles/admin/cert.pem %{buildroot}/%{_sysconfdir}/rmd/acl/roles/admin +mkdir -p %{buildroot}%{_sysconfdir}/rmd/acl/roles/admin +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/roles/admin/cert.pem %{buildroot}%{_sysconfdir}/rmd/acl/roles/admin -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/acl/roles/user -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/roles/user/user-cert.pem %{buildroot}/%{_sysconfdir}/rmd/acl/roles/user +mkdir -p %{buildroot}%{_sysconfdir}/rmd/acl/roles/user +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/roles/user/user-cert.pem %{buildroot}%{_sysconfdir}/rmd/acl/roles/user -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/acl/url -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/url/model.conf %{buildroot}/%{_sysconfdir}/rmd/acl/url -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/url/policy.csv %{buildroot}/%{_sysconfdir}/rmd/acl/url +mkdir -p %{buildroot}%{_sysconfdir}/rmd/acl/url +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/url/model.conf %{buildroot}%{_sysconfdir}/rmd/acl/url +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/acl/url/policy.csv %{buildroot}%{_sysconfdir}/rmd/acl/url -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/cert/client -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/ca.pem %{buildroot}/%{_sysconfdir}/rmd/cert/client -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/cert.pem %{buildroot}/%{_sysconfdir}/rmd/cert/client -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/key.pem %{buildroot}/%{_sysconfdir}/rmd/cert/client -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/user-cert.pem %{buildroot}/%{_sysconfdir}/rmd/cert/client -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/user-key.pem %{buildroot}/%{_sysconfdir}/rmd/cert/client +mkdir -p %{buildroot}%{_sysconfdir}/rmd/cert/client +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/ca.pem %{buildroot}%{_sysconfdir}/rmd/cert/client +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/cert.pem %{buildroot}%{_sysconfdir}/rmd/cert/client +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/key.pem %{buildroot}%{_sysconfdir}/rmd/cert/client +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/user-cert.pem %{buildroot}%{_sysconfdir}/rmd/cert/client +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/client/user-key.pem %{buildroot}%{_sysconfdir}/rmd/cert/client -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/cert/server -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/ca.pem %{buildroot}/%{_sysconfdir}/rmd/cert/server -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/rmd-cert.pem %{buildroot}/%{_sysconfdir}/rmd/cert/server -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/rmd-key.pem %{buildroot}/%{_sysconfdir}/rmd/cert/server +mkdir -p %{buildroot}%{_sysconfdir}/rmd/cert/server +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/ca.pem %{buildroot}%{_sysconfdir}/rmd/cert/server +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/rmd-cert.pem %{buildroot}%{_sysconfdir}/rmd/cert/server +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/cert/server/rmd-key.pem %{buildroot}%{_sysconfdir}/rmd/cert/server -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/pam -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/pam/rmd %{buildroot}/%{_sysconfdir}/rmd/pam +mkdir -p %{buildroot}%{_sysconfdir}/rmd/pam +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/pam/rmd %{buildroot}%{_sysconfdir}/rmd/pam -mkdir -p %{buildroot}/%{_sysconfdir}/rmd/pam/test -install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/pam/test/rmd %{buildroot}/%{_sysconfdir}/rmd/pam/test +mkdir -p %{buildroot}%{_sysconfdir}/rmd/pam/test +install -m 0644 %{_builddir}/%{name}-%{version}/etc/rmd/pam/test/rmd %{buildroot}%{_sysconfdir}/rmd/pam/test -mkdir -p %{buildroot}/%{_docdir}/%{name} -install -m 0644 %{_builddir}/%{name}-%{version}/docs/UserGuide.md %{buildroot}/%{_docdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/docs/Prerequisite.md %{buildroot}/%{_docdir}/rmd -install -m 0644 %{_builddir}/%{name}-%{version}/docs/ConfigurationGuide.md %{buildroot}/%{_docdir}/rmd +mkdir -p %{buildroot}%{_docdir}/%{name} +install -m 0644 %{_builddir}/%{name}-%{version}/docs/UserGuide.md %{buildroot}%{_docdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/docs/Prerequisite.md %{buildroot}%{_docdir}/rmd +install -m 0644 %{_builddir}/%{name}-%{version}/docs/ConfigurationGuide.md %{buildroot}%{_docdir}/rmd %files %{_bindir}/%{name} %{_bindir}/gen_conf %{_mandir}/man8/rmd.8.* %{_mandir}/man8/gen_conf.8.* +%{_datadir}/%{name}/ %config(noreplace) %{_sysconfdir}/rmd/cert/* %config(noreplace) %{_sysconfdir}/rmd/acl/* %config(noreplace) %{_sysconfdir}/rmd/*.toml %config(noreplace) %{_sysconfdir}/rmd/*.yaml %config(noreplace) %{_sysconfdir}/rmd/pam/test/rmd %config(noreplace) %{_sysconfdir}/rmd/pam/rmd -%{_datadir}/%{name}/ -%doc README.md -%doc %{_docdir}/%{name} +%doc README.md CHANGELOG.md ./docs/UserGuide.md ./docs/Prerequisite.md ./docs/ConfigurationGuide.md %license LICENSE + %{_unitdir}/%{name}.service @@ -192,6 +219,9 @@ rm -rf /var/run/rmd/ rm -rf /etc/pam.d/rmd %changelog +* Thu Jan 21 2021 Gargi Sau - 0.3.1-1 +- RMD package version 0.3.1 + * Mon Jun 22 2020 ArunPrabhu Vijayan - 0.3-1 - New release 0.3