From fd448f30e3b8a98c17bed062daaa09d231f209ea Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Jan 14 2014 01:45:14 +0000 Subject: re-establish the symlinks; we still need the i386 configs for legacy reasons --- diff --git a/mock/f19-i386.cfg b/mock/f19-i386.cfg deleted file mode 100644 index de4eabc..0000000 --- a/mock/f19-i386.cfg +++ /dev/null @@ -1,33 +0,0 @@ -config_opts['root'] = 'f19-i686' -config_opts['basedir'] = 'MOCKROOT' -config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -exclude=*.x86_64 - -# repos -[base] -name=BaseOS -enabled=1 -baseurl=http://repohost/tmp/mirror/f19-i686/ - -[f19] -name=f19 -enabled=1 -baseurl=http://repohost/tmp/repo/f19/ -""" diff --git a/mock/f19-i386.cfg b/mock/f19-i386.cfg new file mode 120000 index 0000000..8c114fa --- /dev/null +++ b/mock/f19-i386.cfg @@ -0,0 +1 @@ +f19-i686.cfg \ No newline at end of file diff --git a/mock/f19-noarch.cfg b/mock/f19-noarch.cfg deleted file mode 100644 index 35a9e7c..0000000 --- a/mock/f19-noarch.cfg +++ /dev/null @@ -1,34 +0,0 @@ -config_opts['root'] = 'f19-x86_64' -config_opts['basedir'] = 'MOCKROOT' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -exclude=*.i?86 - -# repos -[base] -name=BaseOS -enabled=1 -baseurl=http://repohost/tmp/mirror/f19-x86_64/ - -[f19] -name=f19 -enabled=1 -baseurl=http://repohost/tmp/repo/f19/ -""" - diff --git a/mock/f19-noarch.cfg b/mock/f19-noarch.cfg new file mode 120000 index 0000000..6510c20 --- /dev/null +++ b/mock/f19-noarch.cfg @@ -0,0 +1 @@ +f19-x86_64.cfg \ No newline at end of file diff --git a/mock/r7b1-i386.cfg b/mock/r7b1-i386.cfg deleted file mode 100644 index 1943557..0000000 --- a/mock/r7b1-i386.cfg +++ /dev/null @@ -1,45 +0,0 @@ -config_opts['root'] = 'rhel-7b1-i386' -config_opts['basedir'] = 'MOCKROOT' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst -config_opts['%centos_ver'] = '7' -config_opts['macros']['%centos_ver'] = "7" -config_opts['macros']['%rhel'] = "7" -config_opts['macros']['%el7'] = "1" -config_opts['macros']['%redhat'] = "7" -config_opts['macros']['%vendor'] = "CentOS" -config_opts['macros']['%packager'] = "CentOS BuildSystem " -config_opts['macros']['%_vendor'] = "redhat" -config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" - - - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -exclude=*.x86_64 - -# repos -[base] -name=BaseOS -enabled=1 -baseurl=http://repohost/tmp/mirror/r7b1/ - -[r7b1] -name=r7b1 -enabled=1 -baseurl=http://repohost/tmp/repo/r7b1/ -""" diff --git a/mock/r7b1-i386.cfg b/mock/r7b1-i386.cfg new file mode 120000 index 0000000..c8337a7 --- /dev/null +++ b/mock/r7b1-i386.cfg @@ -0,0 +1 @@ +r7b1-i686.cfg \ No newline at end of file diff --git a/mock/r7b1-noarch.cfg b/mock/r7b1-noarch.cfg deleted file mode 100644 index 46f8d93..0000000 --- a/mock/r7b1-noarch.cfg +++ /dev/null @@ -1,45 +0,0 @@ -config_opts['root'] = 'rhel-7b1-x86_64' -config_opts['basedir'] = 'MOCKROOT' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst - -config_opts['%centos_ver'] = "7" -config_opts['macros']['%centos_ver'] = "7" -config_opts['macros']['%rhel'] = "7" -config_opts['macros']['%el7'] = "1" -config_opts['macros']['%redhat'] = "7" -config_opts['macros']['%vendor'] = "CentOS" -config_opts['macros']['%packager'] = "CentOS BuildSystem " -config_opts['macros']['%_vendor'] = "redhat" -config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "x86_64-redhat-linux-gnu" - - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -exclude=*.i?86 - -# repos -[base] -name=BaseOS -enabled=1 -baseurl=http://repohost/tmp/mirror/r7b1/ - -[r7b1] -name=r7b1 -enabled=1 -baseurl=http://repohost/tmp/repo/r7b1/ -""" diff --git a/mock/r7b1-noarch.cfg b/mock/r7b1-noarch.cfg new file mode 120000 index 0000000..555c839 --- /dev/null +++ b/mock/r7b1-noarch.cfg @@ -0,0 +1 @@ +r7b1-x86_64.cfg \ No newline at end of file