Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: drop yad download code ......................................................................
packaging: drop yad download code yad is now provided by EPEL repository and we don't need to manually download and install it. Change-Id: I1666d59a4011671f76a7f142a36bb70412beb4af Signed-off-by: Sandro Bonazzola <[email protected]> (cherry picked from commit 26f0141c46e955503d95323e4f8258f5d46a772f) --- M centos/Makefile M centos/kickstart/ovirt-live-ovirt-custom.ks.in D centos/oVirtLiveFiles/rpms/repodata/283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc-filelists.sqlite.bz2 D centos/oVirtLiveFiles/rpms/repodata/5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527-filelists.xml.gz D centos/oVirtLiveFiles/rpms/repodata/61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef-other.sqlite.bz2 D centos/oVirtLiveFiles/rpms/repodata/80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce-other.xml.gz D centos/oVirtLiveFiles/rpms/repodata/89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c-primary.xml.gz D centos/oVirtLiveFiles/rpms/repodata/dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8-primary.sqlite.bz2 D centos/oVirtLiveFiles/rpms/repodata/repomd.xml D centos/oVirtLiveFiles/rpms/yad-0.14.2-1.fc14.x86_64.rpm 10 files changed, 0 insertions(+), 72 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/47/34647/1 diff --git a/centos/Makefile b/centos/Makefile index ed0d9e3..4635176 100644 --- a/centos/Makefile +++ b/centos/Makefile @@ -19,7 +19,6 @@ if [ $$(id -u) != 0 ]; then echo "You must be root"; exit 1; fi download: \ - downloads/yad-0.27.0-1.el6.x86_64.rpm \ downloads/TinyCore-current.iso \ $(NULL) @@ -29,25 +28,12 @@ curl "$(URL)" > "downloads/$(OUT).tmp" mv "downloads/$(OUT).tmp" "downloads/$(OUT)" -downloads/yad-0.27.0-1.el6.x86_64.rpm: - $(MAKE) _download URL="http://kojipkgs.fedoraproject.org/packages/yad/0.27.0/1.el6/x86_64/yad-0.27.0-1.el6.x86_64.rpm"; OUT="yad-0.27.0-1.el6.x86_64.rpm" - downloads/TinyCore-current.iso: $(MAKE) _download URL="http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso"; OUT="TinyCore-current.iso" - -repo: \ - downloads/yad-0.27.0-1.el6.x86_64.rpm \ - $(NULL) - rm -fr repo - mkdir -p repo.tmp - ln -s ../downloads/yad-0.27.0-1.el6.x86_64.rpm repo.tmp/yad-0.27.0-1.el6.x86_64.rpm - createrepo repo.tmp - mv repo.tmp repo 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 rpm -ql livecd-tools > /dev/null 2>&1 || yum install -y livecd-tools - rpm -ql createrepo > /dev/null 2>&1 || yum install -y createrepo .SUFFIXES: @@ -58,7 +44,6 @@ "$<" > "$@" livecd: \ - repo \ downloads/TinyCore-current.iso \ kickstart/ovirt-live-ovirt-custom.ks \ $(NULL) diff --git a/centos/kickstart/ovirt-live-ovirt-custom.ks.in b/centos/kickstart/ovirt-live-ovirt-custom.ks.in index 3a0c7f0..5242209 100644 --- a/centos/kickstart/ovirt-live-ovirt-custom.ks.in +++ b/centos/kickstart/ovirt-live-ovirt-custom.ks.in @@ -17,7 +17,6 @@ repo --name=patternfly --baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-6-$basearch/ repo --name=gluster --baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/ repo --name=glusternoarch --baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch -repo --name=local --baseurl=file://@PATH@/oVirtLiveFiles/rpms/ ######################################################################## # Include kickstart files @@ -62,7 +61,6 @@ mkdir -p /home/liveuser/oVirtLiveFiles cp -r /root/oVirtLiveFiles /home/liveuser -yum localinstall -y /home/liveuser/oVirtLiveFiles/rpms/*.rpm echo '10.0.0.1 livecd.localdomain localdomain' >> /etc/hosts #workaround for bz 878119 diff --git a/centos/oVirtLiveFiles/rpms/repodata/283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc-filelists.sqlite.bz2 b/centos/oVirtLiveFiles/rpms/repodata/283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc-filelists.sqlite.bz2 deleted file mode 100644 index 4b25592..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc-filelists.sqlite.bz2 +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527-filelists.xml.gz b/centos/oVirtLiveFiles/rpms/repodata/5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527-filelists.xml.gz deleted file mode 100644 index d3d5042..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527-filelists.xml.gz +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef-other.sqlite.bz2 b/centos/oVirtLiveFiles/rpms/repodata/61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef-other.sqlite.bz2 deleted file mode 100644 index 2f89508..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef-other.sqlite.bz2 +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce-other.xml.gz b/centos/oVirtLiveFiles/rpms/repodata/80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce-other.xml.gz deleted file mode 100644 index 64be7d9..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce-other.xml.gz +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c-primary.xml.gz b/centos/oVirtLiveFiles/rpms/repodata/89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c-primary.xml.gz deleted file mode 100644 index a9707e2..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c-primary.xml.gz +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8-primary.sqlite.bz2 b/centos/oVirtLiveFiles/rpms/repodata/dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8-primary.sqlite.bz2 deleted file mode 100644 index 60c3f91..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8-primary.sqlite.bz2 +++ /dev/null Binary files differ diff --git a/centos/oVirtLiveFiles/rpms/repodata/repomd.xml b/centos/oVirtLiveFiles/rpms/repodata/repomd.xml deleted file mode 100644 index 36b26c3..0000000 --- a/centos/oVirtLiveFiles/rpms/repodata/repomd.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<repomd xmlns="http://linux.duke.edu/metadata/repo"; xmlns:rpm="http://linux.duke.edu/metadata/rpm";> - <revision>1369041438</revision> -<data type="filelists"> - <checksum type="sha256">5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527</checksum> - <open-checksum type="sha256">45bc91a410cdc65cd5d47ecb0f71a4b3d372794d39001cd5eb2543c2a7588cc7</open-checksum> - <location href="repodata/5f443c702d353ece1e70fb6fdcd957f8b51ca48d377285bd7e5deaf4fcb8e527-filelists.xml.gz"/> - <timestamp>1369041438</timestamp> - <size>443</size> - <open-size>1202</open-size> -</data> -<data type="primary"> - <checksum type="sha256">89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c</checksum> - <open-checksum type="sha256">9f04b6dba41afa047248e016f9380623eb10fa15f764e403f465dc073653894d</open-checksum> - <location href="repodata/89b0b69ff746917b3c41818919953e694b15aff5a5c8bb963d275ffd3c49c03c-primary.xml.gz"/> - <timestamp>1369041438</timestamp> - <size>970</size> - <open-size>2699</open-size> -</data> -<data type="primary_db"> - <checksum type="sha256">dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8</checksum> - <open-checksum type="sha256">682063e2dab3d789829664c145f709853ec9a6926383eb4e00079489ab7a8691</open-checksum> - <location href="repodata/dea2d8919301bd2ac8b65441596d06f69c551f380b5c99ba42fac792896438c8-primary.sqlite.bz2"/> - <timestamp>1369041438.43</timestamp> - <database_version>10</database_version> - <size>2586</size> - <open-size>20480</open-size> -</data> -<data type="other_db"> - <checksum type="sha256">61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef</checksum> - <open-checksum type="sha256">259e0037f55d808cf8118a7e28645632315330780820555ba8caaef2d23bd824</open-checksum> - <location href="repodata/61e4ecd65729eea3ea701911223debda48c620c0a31958e89ca1c3fd7b6910ef-other.sqlite.bz2"/> - <timestamp>1369041438.36</timestamp> - <database_version>10</database_version> - <size>1259</size> - <open-size>8192</open-size> -</data> -<data type="other"> - <checksum type="sha256">80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce</checksum> - <open-checksum type="sha256">8fb0b46cbad7079a531fc1f43bc4e836fb15a0bba61b149cb7163214d8fe8538</open-checksum> - <location href="repodata/80a0c9d20118ed501861cc4dfd635020d432e212ade5611d14f7f461e2e911ce-other.xml.gz"/> - <timestamp>1369041438</timestamp> - <size>567</size> - <open-size>1776</open-size> -</data> -<data type="filelists_db"> - <checksum type="sha256">283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc</checksum> - <open-checksum type="sha256">de054938d949b361946db8daf79f80f2aec1ce1ee179c1f69484683e8d34d2b7</open-checksum> - <location href="repodata/283c3ad68f6590ab7be9b55d6cbcec4f8801c7fc9d6a3a029aef282a15cca8bc-filelists.sqlite.bz2"/> - <timestamp>1369041438.38</timestamp> - <database_version>10</database_version> - <size>1166</size> - <open-size>7168</open-size> -</data> -</repomd> diff --git a/centos/oVirtLiveFiles/rpms/yad-0.14.2-1.fc14.x86_64.rpm b/centos/oVirtLiveFiles/rpms/yad-0.14.2-1.fc14.x86_64.rpm deleted file mode 100644 index 957eb2c..0000000 --- a/centos/oVirtLiveFiles/rpms/yad-0.14.2-1.fc14.x86_64.rpm +++ /dev/null Binary files differ -- To view, visit http://gerrit.ovirt.org/34647 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1666d59a4011671f76a7f142a36bb70412beb4af Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: ovirt-live-3.5 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
