diff options
author | 2016-03-02 17:59:35 +0000 | |
---|---|---|
committer | 2016-03-02 17:59:35 +0000 | |
commit | 640a338b812b5ae2636b21cbd5956b9d0d727a49 (patch) | |
tree | a2f537fd9e45d3639a242097e4ad8658a54cb569 /build/Makefile | |
parent | f28880f75359edb99f3e4e6b2680fdb814774903 (diff) | |
parent | 6a066f1c8301774fd34bf07c82ebb9c54d053f84 (diff) |
Merge "updating the centos dvd version" into stable/brahmaputra
Diffstat (limited to 'build/Makefile')
-rw-r--r-- | build/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile index ecb6e369..f5a51ebb 100644 --- a/build/Makefile +++ b/build/Makefile @@ -17,8 +17,8 @@ SHELL = /bin/bash export UNIT_TEST = FALSE export USE_MASTER = "" export INTERACTIVE = TRUE -export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso -export ISOSRC = file:$(shell pwd)/CentOS-7-x86_64-DVD-1503-01.iso +export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-DVD-1511.iso +export ISOSRC = file:$(shell pwd)/$(shell basename $(CENTDNLD)) export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) export PRODNO = "OPNFV_BGS" export REVSTATE = "0000" @@ -61,7 +61,7 @@ include cache.mk ############################################################################# $(ISOCACHE): - test -s $(ISOCACHE) || { wget -nv $(CENTDNLD) ; } + sh -c "test -s $(ISOCACHE) || { wget -nv $(CENTDNLD) ; }" .PHONY: mount-centiso umount-centiso mount-centiso: $(ISOCACHE) @@ -178,6 +178,7 @@ iso: build-clean instack rpm $(ISOCACHE) @mkdir centos release cd centos && bsdtar -xf ../$(shell basename $(ISOSRC)) # modify the installer iso's contents + @chmod -R u+w centos @cp -f isolinux.cfg centos/isolinux/isolinux.cfg @cp $(APEXRPMCOM) centos/Packages @cp $(APEXRPMINS) centos/Packages |