Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Fix for BZ1870537: go bundled packages, license tag and upstream tarb… #61

Open
gargisau wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fix for BZ1870537: go bundled packages, license tag and upstream tarb… #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49d1b3d
Fix for BZ1870537: go bundled packages, license tag and upstream tarb…
gargisau Dec 7, 2020
8a3292f
Fix for BZ1870537: Removed go-rpm-macros from BuildRequires
gargisau Dec 14, 2020
8bee7a6
Change to remove the warning in make package
gargisau Jan 8, 2021
4a9a48c
Change to resolve the CI build errors. Adding the go.sum file to the …
gargisau Jan 19, 2021
4a96ec3
Updating version to v0.3.1
gargisau Jan 20, 2021
a303183
Change to avoid bundling of the git history of all dependencies
gargisau Jan 21, 2021
7cc2d30
Removing the Licenses for BuildRequires from the License tag. Fix for…
gargisau Feb 10, 2021
e5007f0
build and install from a RPM Spec file
gargisau Feb 25, 2021
66f10a1
Merge branch 'master' into master
gargisau Feb 25, 2021
6aa826e
Update README.md
gargisau Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
Loading