updating the centos dvd version 19/10919/1
authorDan Radez <dradez@redhat.com>
Fri, 26 Feb 2016 14:47:36 +0000 (09:47 -0500)
committerTim Rozet <trozet@redhat.com>
Tue, 1 Mar 2016 14:59:49 +0000 (14:59 +0000)
Change-Id: I2ab43f43858745b5ac5ed695301ad09290b2c320
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit 7f1312c63dff70df8a2c29bfe4a16b6e159e4c44)

build/Makefile

index ecb6e36..f5a51eb 100644 (file)
@@ -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