Sandro Bonazzola has uploaded a new change for review. Change subject: build: Makefile maintenance ......................................................................
build: Makefile maintenance - updated el7 Makefile adding new livecd-tools - synced el6 Makefile with the el7 one Change-Id: Ia107b88d5a5067eac3fab6d97adc5a8bc4743cd2 Signed-off-by: Sandro Bonazzola <[email protected]> --- M centos-6/Makefile M centos-7/Makefile 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/05/39505/1 diff --git a/centos-6/Makefile b/centos-6/Makefile index 15049f8..062d621 100644 --- a/centos-6/Makefile +++ b/centos-6/Makefile @@ -29,7 +29,7 @@ mv "downloads/$(OUT).tmp" "downloads/$(OUT)" downloads/TinyCore-current.iso: - $(MAKE) _download URL="http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso" OUT="TinyCore-current.iso" + $(MAKE) _download URL="http://distro.ibiblio.org/tinycorelinux/6.x/x86/release/TinyCore-current.iso" OUT="TinyCore-current.iso" packages: rpm -ql epel-release > /dev/null 2>&1 || yum install -y http://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm @@ -50,4 +50,4 @@ mkdir -p oVirtLiveFiles/iso cp downloads/TinyCore-current.iso oVirtLiveFiles/iso/ setenforce 0 - livecd-creator -d -v --config=kickstart/ovirt-live-ovirt-custom.ks --fslabel=ovirt-live-el6-master 2>&1 | tee iso.log + livecd-creator -d -v --config=kickstart/ovirt-live-ovirt-custom.ks --fslabel=ovirt-live-el6-master.$(shell date -u +%y%m%d%H%M) 2>&1 | tee iso.log diff --git a/centos-7/Makefile b/centos-7/Makefile index d2913c4..aff9b80 100644 --- a/centos-7/Makefile +++ b/centos-7/Makefile @@ -34,8 +34,8 @@ packages: rpm -ql livecd-tools > /dev/null 2>&1 || \ yum install -y \ - http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/livecd-tools-20.1-2.el7.x86_64.rpm \ - http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/python-imgcreate-20.1-2.el7.x86_64.rpm \ + http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/livecd-tools-20.1-3.el7.x86_64.rpm \ + http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/python-imgcreate-20.1-3.el7.x86_64.rpm \ http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/hfsplus-tools-540.1.linux3-4.el7.x86_64.rpm -- To view, visit https://gerrit.ovirt.org/39505 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia107b88d5a5067eac3fab6d97adc5a8bc4743cd2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
