--- common/repos.ks.in | 3 +++ ovirt-host-creator/Makefile | 4 ++-- ovirt-host-creator/repos.ks.in | 3 --- wui-appliance/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 common/repos.ks.in delete mode 100644 ovirt-host-creator/repos.ks.in diff --git a/common/repos.ks.in b/common/repos.ks.in new file mode 100644 index 0000000..79a8cef --- /dev/null +++ b/common/repos.ks.in @@ -0,0 +1,3 @@ +repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch +repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch +repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/$basearch diff --git a/ovirt-host-creator/Makefile b/ovirt-host-creator/Makefile index bd30f49..ae212ae 100644 --- a/ovirt-host-creator/Makefile +++ b/ovirt-host-creator/Makefile @@ -11,8 +11,8 @@ clean: distclean: clean rm -rf *.iso repos.ks rpm-build -repos.ks: repos.ks.in - cp repos.ks.in repos.ks +repos.ks: ../common/repos.ks.in + cp ../common/repos.ks.in repos.ks ovirt.iso: ovirt.ks common-install.ks common-pkgs.ks common-post.ks repos.ks ../common/rpm-compare.py GE 0 livecd-tools 017.1 1 diff --git a/ovirt-host-creator/repos.ks.in b/ovirt-host-creator/repos.ks.in deleted file mode 100644 index 79a8cef..0000000 --- a/ovirt-host-creator/repos.ks.in +++ /dev/null @@ -1,3 +0,0 @@ -repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch -repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch -repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/$basearch diff --git a/wui-appliance/Makefile b/wui-appliance/Makefile index ba57aea..ea0bb61 100644 --- a/wui-appliance/Makefile +++ b/wui-appliance/Makefile @@ -14,8 +14,8 @@ $(NAME)-sda.qcow: $(NAME)-sda.raw # FIXME add --compress option to appliance-creator qemu-img convert -c $(NAME)-sda.raw -O qcow2 $(NAME)-sda.qcow -repos.ks: repos.ks.in - cp repos.ks.in repos.ks +repos.ks: ../common/repos.ks.in + cp ../common/repos.ks.in repos.ks clean: rm -f repos.ks -- 1.5.4.1
Alan Pevec
2008-Aug-20 12:06 UTC
[Ovirt-devel] [PATCH] change remote ovirt YUM repo name to avoid collision with locally built YUM repo
--- common/repos.ks.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/repos.ks.in b/common/repos.ks.in index 79a8cef..ba5ee20 100644 --- a/common/repos.ks.in +++ b/common/repos.ks.in @@ -1,3 +1,3 @@ repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch -repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/$basearch +repo --name=ovirt-org --baseurl=http://ovirt.org/repos/ovirt/9/$basearch -- 1.5.4.1
Alan Pevec wrote:> --- > common/repos.ks.in | 3 +++ > ovirt-host-creator/Makefile | 4 ++-- > ovirt-host-creator/repos.ks.in | 3 --- > wui-appliance/Makefile | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > create mode 100644 common/repos.ks.in > delete mode 100644 ovirt-host-creator/repos.ks.in > > diff --git a/common/repos.ks.in b/common/repos.ks.in > new file mode 100644 > index 0000000..79a8cef > --- /dev/null > +++ b/common/repos.ks.in > @@ -0,0 +1,3 @@ > +repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch > +repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch > +repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/$basearch > diff --git a/ovirt-host-creator/Makefile b/ovirt-host-creator/Makefile > index bd30f49..ae212ae 100644 > --- a/ovirt-host-creator/Makefile > +++ b/ovirt-host-creator/Makefile > @@ -11,8 +11,8 @@ clean: > distclean: clean > rm -rf *.iso repos.ks rpm-build > > -repos.ks: repos.ks.in > - cp repos.ks.in repos.ks > +repos.ks: ../common/repos.ks.in > + cp ../common/repos.ks.in repos.ks > > ovirt.iso: ovirt.ks common-install.ks common-pkgs.ks common-post.ks repos.ks > ../common/rpm-compare.py GE 0 livecd-tools 017.1 1 > diff --git a/ovirt-host-creator/repos.ks.in b/ovirt-host-creator/repos.ks.in > deleted file mode 100644 > index 79a8cef..0000000 > --- a/ovirt-host-creator/repos.ks.in > +++ /dev/null > @@ -1,3 +0,0 @@ > -repo --name=f9 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch > -repo --name=f9-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch > -repo --name=ovirt --baseurl=http://ovirt.org/repos/ovirt/9/$basearch > diff --git a/wui-appliance/Makefile b/wui-appliance/Makefile > index ba57aea..ea0bb61 100644 > --- a/wui-appliance/Makefile > +++ b/wui-appliance/Makefile > @@ -14,8 +14,8 @@ $(NAME)-sda.qcow: $(NAME)-sda.raw > # FIXME add --compress option to appliance-creator > qemu-img convert -c $(NAME)-sda.raw -O qcow2 $(NAME)-sda.qcow > > -repos.ks: repos.ks.in > - cp repos.ks.in repos.ks > +repos.ks: ../common/repos.ks.in > + cp ../common/repos.ks.in repos.ks > > clean: > rm -f repos.ksACK -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=|