Browse Source

Allow to pass RPM repos to build-sandbox

We need to have an abitily to pass some custom rpm repos into
rpm build-sandbox

Closes-bug: #1619309
Change-Id: Ie328e5b18c3a81f67b5d19ef0d3992594e7f58c6
Sergey Kulanov 3 years ago
parent
commit
3102e7fc29
2 changed files with 17 additions and 0 deletions
  1. 4
    0
      config.mk
  2. 13
    0
      sandbox.mk

+ 4
- 0
config.mk View File

@@ -167,6 +167,10 @@ MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PROD
167 167
 # Example: EXTRA_RPM_REPOS="lolo,http://my.cool.repo/rpm,priority bar,ftp://repo.foo,priority"
168 168
 EXTRA_RPM_REPOS?=
169 169
 
170
+# define RPM repo which contains fuel rpm-build-dep packages, in format
171
+# EXTRA_RPM_BUILDDEP_REPO=http://my.cool.repo/rpm
172
+EXTRA_RPM_BUILDDEP_REPO?=
173
+
170 174
 comma:=,
171 175
 
172 176
 # Path to yaml configuration file to build ISO ks.cfg

+ 13
- 0
sandbox.mk View File

@@ -42,6 +42,16 @@ gpgcheck=0
42 42
 priority=3
43 43
 endef
44 44
 
45
+ifdef EXTRA_RPM_BUILDDEP_REPO
46
+define yum_extra_build_repo
47
+[extra_build]
48
+name=Extra Build
49
+baseurl=$(EXTRA_RPM_BUILDDEP_REPO)
50
+gpgcheck=0
51
+priority=2
52
+endef
53
+endif
54
+
45 55
 define sandbox_yum_conf
46 56
 [main]
47 57
 cachedir=/tmp/cache
@@ -121,6 +131,7 @@ $(yum_upstream_repo)
121 131
 $(yum_epel_repo)
122 132
 $(yum_local_repo)
123 133
 $(yum_local_mos_repo)
134
+$(yum_extra_build_repo)
124 135
 EOF
125 136
 echo $(SANDBOX_PACKAGES) | xargs -n1 | xargs -I_package sudo sh -c 'rm -vf $(SANDBOX)/etc/yum.repos.d/Cent*; chroot $(SANDBOX) yum -y --nogpgcheck install _package'
126 137
 # clean all repos except the MOS + upsream + our epel
@@ -247,9 +258,11 @@ show-centos-sandbox-repos: export yum_upstream_repo_content:=$(yum_upstream_repo
247 258
 show-centos-sandbox-repos: export yum_epel_repo_content:=$(yum_epel_repo)
248 259
 show-centos-sandbox-repos: export yum_local_repo_content:=$(yum_local_repo)
249 260
 show-centos-sandbox-repos: export yum_local_mos_repo_content:=$(yum_local_mos_repo)
261
+show-centos-sandbox-repos: export yum_extra_build_repo_content:=$(yum_extra_build_repo)
250 262
 show-centos-sandbox-repos:
251 263
 	/bin/echo -e "$${sandbox_yum_conf_content}\n"
252 264
 	/bin/echo -e "$${yum_upstream_repo_content}\n"
253 265
 	/bin/echo -e "$${yum_epel_repo_content}\n"
254 266
 	/bin/echo -e "$${yum_local_repo_content}\n"
255 267
 	/bin/echo -e "$${yum_local_mos_repo_content}\n"
268
+	/bin/echo -e "$${yum_extra_build_repo_content}\n"

Loading…
Cancel
Save