Skip to content

Commit a7461ba

Browse files
committed
Do not get source from gh in rpm builder
1 parent 2e3c910 commit a7461ba

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

devel/Vagrantfile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@ ENV['LC_ALL'] = 'C'
44

55
Vagrant.configure(2) do |config|
66

7-
# enable package local caching to speed up "vagrant up"
8-
# if Vagrant.has_plugin?("vagrant-sshfs")
9-
config.cache.synced_folder_opts = {
10-
type: :sshfs
11-
}
12-
# end
13-
14-
if Vagrant.has_plugin?("vagrant-cachier")
15-
config.cache.scope = :box
16-
end
17-
187
# don't mind about insecure ssh key
198
config.ssh.insert_key = false
209

@@ -25,11 +14,10 @@ Vagrant.configure(2) do |config|
2514
lv.default_prefix = 'paf_pkg'
2615
end
2716

28-
config.vm.synced_folder '.', '/vagrant', type: 'rsync', disable: true
17+
config.vm.synced_folder '..', '/vagrant', type: 'rsync'
2918

3019
config.vm.define 'deb' do |debvm|
3120
debvm.vm.box = 'debian/stretch64'
32-
debvm.vm.synced_folder '..', '/vagrant', type: 'rsync'
3321
debvm.vm.provision 'DEB builder', type: 'shell', path:'deb-builder.bash'
3422
debvm.vm.post_up_message = <<-HEREDOC
3523
If no error appeared, you can get the package using the following command:

devel/rpm-builder.bash

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ set -o errexit
44
set -o nounset
55
set -o pipefail
66

7-
yum --nogpgcheck --quiet -y -e 0 install git rpmdevtools perl-Module-Build resource-agents
7+
yum --nogpgcheck --quiet -y -e 0 install git rpmdevtools perl-Module-Build resource-agents rpmlint
88

99
rpmdev-setuptree
10-
git clone --quiet https://github.com/ClusterLabs/PAF.git /root/PAF
11-
echo silent > /etc/rpmdevtools/curlrc
12-
spectool -R -g /root/PAF/resource-agents-paf.spec
13-
rpmbuild --quiet -ba /root/PAF/resource-agents-paf.spec
10+
11+
rpmlint /vagrant/resource-agents-paf.spec
12+
cd /vagrant
13+
TAG=$(awk '/^%global _tag/{print $NF}' /vagrant/resource-agents-paf.spec)
14+
git archive --prefix="PAF-${TAG}/" --format=tar.gz v${TAG} > /root/rpmbuild/SOURCES/v${TAG}.tar.gz
15+
rpmbuild --quiet -ba /vagrant/resource-agents-paf.spec
16+
rpmlint /root/rpmbuild/RPMS/noarch/resource-agents-paf-*.noarch.rpm

0 commit comments

Comments
 (0)