Update to latest buildroot packages

Signed-off-by: Jon Ludlam <[email protected]>
andyhhp · Sep 19, 2014 · ffb4bba · ffb4bba
1 parent eea1da2
commit ffb4bba
Show file tree

Hide file tree

Showing 39 changed files with 1,679 additions and 751 deletions.
diff --git a/ffs.spec.in b/ffs.spec.in
@@ -1,23 +1,28 @@
 %define planex_version 0.0.0
 %define planex_release 1
 
-Name:           ffs
 Version:        %{planex_version}
 Release:        %{planex_release}
-Summary:        The "flat file system" SR
+
+Name:           ffs
+Summary:        Simple flat file storage manager for the xapi toolstack
 License:        LGPL
-Group:          Development/Other
-URL:            https://github.com/djs55/ffs
+URL:            https://github.com/xapi-project/ffs
 Source0:        git://github.com/xapi-project/ffs#trunk-ring3
 Source1:        ffs-init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires:  ocaml ocaml-obuild ocaml-findlib ocaml-camlp4-devel
-BuildRequires:  ocaml-xcp-idl-devel ocaml-rpc-devel
-BuildRequires:  ocaml-re-devel ocaml-cohttp-devel ocaml-cmdliner-devel
-BuildRequires:  ocaml-oclock-devel ocaml-libvhd-devel xen-devel
-BuildRequires:  ocaml-tapctl-devel message-switch-devel forkexecd-devel
-Requires:       ocaml-libvhd-devel 
-Requires:       blktap 
+BuildRequires:  ocaml
+BuildRequires:  ocaml-findlib
+BuildRequires:  ocaml-obuild
+BuildRequires:  ocaml-rpc-devel
+BuildRequires:  ocaml-xcp-idl-devel
+BuildRequires:  ocaml-cmdliner-devel
+BuildRequires:  ocaml-cohttp-devel
+BuildRequires:  ocaml-re-devel
+BuildRequires:  ocaml-libvhd-devel
+BuildRequires:  ocaml-tapctl-devel
+Requires:       nfs-utils
+Requires:       redhat-lsb-core
+Requires:       blktap
 
 %description
 Simple flat file storage manager for the xapi toolstack.
@@ -30,17 +35,13 @@ cp %{SOURCE1} ffs-init
 make
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_sbindir}
 install dist/build/ffs/ffs %{buildroot}/%{_sbindir}/ffs
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 0755 ffs-init %{buildroot}%{_sysconfdir}/init.d/ffs
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
 %doc README.md LICENSE MAINTAINERS
 %{_sbindir}/ffs
 %{_sysconfdir}/init.d/ffs
@@ -55,10 +56,10 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
-* Wed Nov 20 2013 David Scott <dave.scott@eu.citrix.com>
-- Update to 0.9.24 (in development)
+* Thu Jan 16 2014 Euan Harris <euan.harris@citrix.com> - 0.9.24-1
+- Update to 0.9.24, with VDI.clone fix
 
-* Thu Oct 31 2013 David Scott <[email protected]>
+* Thu Oct 31 2013 David Scott <[email protected]> - 0.9.23-1
 - Update to 0.9.23, with VDI.copy fix
 
 * Wed Oct 30 2013 David Scott <[email protected]>

diff --git a/forkexecd.spec.in b/forkexecd.spec.in
@@ -1,18 +1,24 @@
 %define planex_version 0.0.0
 %define planex_release 1
 
-Name:           forkexecd
 Version:        %{planex_version}
 Release:        %{planex_release}
+
+Name:           forkexecd
 Summary:        A subprocess management service
 License:        LGPL
-Group:          Development/Other
-URL:            https://github.com/xapi-project/forkexecd/archive/forkexecd-0.9.0.tar.gz
+URL:            https://github.com/xapi-project/forkexecd
 Source0:        git://github.com/xapi-project/forkexecd
 Source1:        forkexecd-init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires:  ocaml ocaml-findlib ocaml-camlp4-devel
-BuildRequires:  ocaml-rpc-devel ocaml-fd-send-recv-devel ocaml-re-devel ocaml-xcp-idl-devel ocaml-uuidm-devel ocaml-stdext-devel
+BuildRequires:  ocaml
+BuildRequires:  ocaml-findlib
+BuildRequires:  ocaml-fd-send-recv-devel
+BuildRequires:  ocaml-re-devel
+BuildRequires:  ocaml-rpc-devel
+BuildRequires:  ocaml-stdext-devel
+BuildRequires:  ocaml-uuidm-devel
+BuildRequires:  ocaml-xcp-idl-devel
+Requires:  redhat-lsb-core
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -22,28 +28,25 @@ A service which starts and manages subprocesses, avoiding the need to manually
 fork() and exec() in a multithreaded program.
 
 %prep
-%setup -q 
+%setup -q
+cp %{SOURCE1} forkexecd-init
 
 %build
-ocaml setup.ml -configure --destdir %{buildroot}/%{_libdir}/ocaml
+ocaml setup.ml -configure
 ocaml setup.ml -build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_libdir}/ocaml
 export OCAMLFIND_DESTDIR=%{buildroot}/%{_libdir}/ocaml
 ocaml setup.ml -install
 mkdir -p %{buildroot}/%{_sbindir}
 install fe_main.native %{buildroot}/%{_sbindir}/forkexecd
 install fe_cli.native %{buildroot}/%{_sbindir}/forkexecd-cli
 mkdir -p %{buildroot}/%{_sysconfdir}/init.d
-install -m 0755 %{_sourcedir}/forkexecd-init %{buildroot}%{_sysconfdir}/init.d/forkexecd
+install -m 0755 forkexecd-init %{buildroot}%{_sysconfdir}/init.d/forkexecd
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
 %{_sbindir}/forkexecd
 %{_sbindir}/forkexecd-cli
 %{_sysconfdir}/init.d/forkexecd
@@ -59,20 +62,28 @@ fi
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Other
 Requires:       %{name} = %{version}-%{release}
-Requires:       ocaml ocaml-findlib
+Requires:       ocaml-fd-send-recv-devel%{?_isa}
+Requires:       ocaml-rpc-devel%{?_isa}
+Requires:       ocaml-stdext-devel%{?_isa}
+Requires:       ocaml-uuidm-devel%{?_isa}
+Requires:       ocaml-xcp-idl-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %files devel
-%defattr(-,root,root)
 %doc LICENSE README.md ChangeLog MAINTAINERS
 %{_libdir}/ocaml/forkexec/*
 
 %changelog
+* Fri Jun 6 2014 Jon Ludlam <[email protected]> - 0.9.2-1
+- Update to 0.9.2
+
+* Wed Sep 25 2013 David Scott <[email protected]> - 0.9.1-1
+- Update to 0.9.1
+
 * Fri May 31 2013 David Scott <[email protected]>
 - Initial package
 
diff --git a/message-switch.spec.in b/message-switch.spec.in
@@ -1,64 +1,52 @@
 %define planex_version 0.0.0
 %define planex_release 1
 
-Name:           message-switch
 Version:        %{planex_version}
 Release:        %{planex_release}
+
+Name:           message-switch
 Summary:        A store and forward message switch
 License:        FreeBSD
-Group:          Development/Other
-URL:            https://github.com/xapi-project/message-switch/archive/message-switch-%{version}.tar.gz
+URL:            https://github.com/xapi-project/message-switch
 Source0:        git://github.com/xapi-project/message-switch
 Source1:        message-switch-init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires:  ocaml ocaml-findlib ocaml-camlp4-devel
+BuildRequires:  ocaml
+BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-findlib
+BuildRequires: ocaml-cohttp-devel
+BuildRequires: ocaml-rpc-devel
+BuildRequires: ocaml-cmdliner-devel
+BuildRequires: ocaml-re-devel
+BuildRequires: ocaml-rpc-devel
+BuildRequires: ocaml-oclock-devel
+Requires:      redhat-lsb-core
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
-BuildRequires: ocaml-cohttp-devel ocaml-rpc-devel ocaml-xenstore-devel
-BuildRequires: ocaml-ounit-devel ocaml-uri-devel
-BuildRequires: ocaml-re-devel ocaml-rpc-devel ocaml-cmdliner-devel
-BuildRequires: ocaml-ssl-devel ocaml-oclock-devel
-BuildRequires: openssl openssl-devel
-#  "ocamlfind"
-#  "cohttp" {= "0.9.7"}
-#  "rpc"
-#  "xenstore"
-#  "ounit"
-#  "syslog"
-#  "uri"
-#  "re"
-#  "rpc"
-#  "cmdliner"
-#  "ssl"
-#  "oclock"
 
 %description
 A store and forward message switch for OCaml.
 
 %prep
-%setup -q -n message-switch-%{version}
+%setup -q
+cp %{SOURCE1} message-switch-init
 
 %build
-ocaml setup.ml -configure --destdir %{buildroot}/%{_libdir}/ocaml
+ocaml setup.ml -configure
 ocaml setup.ml -build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_libdir}/ocaml
 export OCAMLFIND_DESTDIR=%{buildroot}/%{_libdir}/ocaml
 ocaml setup.ml -install
 mkdir -p %{buildroot}/%{_sbindir}
 install switch_main.native %{buildroot}/%{_sbindir}/message-switch
 install main.native %{buildroot}/%{_sbindir}/message-cli
 mkdir -p %{buildroot}/%{_sysconfdir}/init.d
-install -m 0755 %{_sourcedir}/message-switch-init %{buildroot}%{_sysconfdir}/init.d/message-switch
+install -m 0755 message-switch-init %{buildroot}%{_sysconfdir}/init.d/message-switch
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
 %{_sbindir}/message-switch
 %{_sbindir}/message-cli
 %{_sysconfdir}/init.d/message-switch
@@ -74,20 +62,30 @@ fi
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Other
-#Requires:       %{name} = %{version}-%{release}
-Requires:       ocaml ocaml-findlib
+Requires:       %{name} = %{version}-%{release}
+Requires:       ocaml-cohttp-devel%{?_isa}
+Requires:       ocaml-oclock-devel%{?_isa}
+Requires:       ocaml-re-devel%{?_isa}
+Requires:       ocaml-rpc-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %files devel
-%defattr(-,root,root)
 %doc LICENSE README.md ChangeLog
 %{_libdir}/ocaml/message_switch/*
 
 %changelog
+* Thu Jun 19 2014 David Scott <[email protected]> - 0.10.3-1
+- Update to 0.10.3
+
+* Fri Jun 6 2014 Jon Ludlam <[email protected]> - 0.10.2-1
+- Update to 0.10.2
+
+* Fri Oct 18 2013 David Scott <[email protected]> - 0.10.1-1
+- Update to 0.10.1 which is more tolerant of startup orderings
+
 * Thu May 30 2013 David Scott <[email protected]>
 - Initial package
 
diff --git a/mock/default.cfg b/mock/default.cfg
@@ -0,0 +1,63 @@
+config_opts['target_arch'] = 'x86_64'
+
+config_opts['root'] = 'dom0'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which xz'
+config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/output', '/output' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/xen-mock', '/var/xen-mock'))
+
+config_opts['yum.conf'] = """
+[epel]
+name = epel
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+enabled = 1
+baseurl = http://www.uk.xensource.com/linux/distfiles/epel6_x86_64_20131114
+gpgcheck = 1
+
+[xen-local]
+gpgcheck = 0
+enabled = 1
+name = xen-local
+baseurl = file://@PLANEX_BUILD_ROOT@/RPMS
+
+[xen-mock]
+gpgcheck = 0
+enabled = 1
+name = xen-mock
+baseurl = file:///var/xen-mock
+
+[xen-addons]
+gpgcheck = 0
+enabled = 1
+name = xen-addons
+baseurl = http://www.uk.xensource.com/linux/distfiles/chroot-dom0-addons_x86_64_20140220
+
+[base]
+name = base
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled = 1
+baseurl = http://www.uk.xensource.com/linux/distros/CentOS/6.5/os/x86_64/ http://www.uk.xensource.com/linux/distros/CentOS/6.5/os/x86_64-DVD2/
+gpgcheck = 1
+
+[updates]
+name = updates
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled = 1
+baseurl = http://www.uk.xensource.com/linux/distros/CentOS/6.5/updates-x86_64-20140411
+gpgcheck = 1
+
+[main]
+retries = 20
+diskspacecheck = 0
+reposdir = /dev/null
+syslog_device = 
+assumeyes = 1
+cachedir = /obj/yum_cache
+obsoletes = 1
+debuglevel = 1
+gpgcheck = 1
+logfile = /obj/yum.log
+syslog_ident = mock
+
+"""