Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit c6889d0

Browse files
gnawuxgnawux
committed
Merge pull request #333 from gnawux/release_06
make 0.6.0 release
2 parents 0b67332 + 849df0f commit c6889d0

15 files changed

Lines changed: 53 additions & 74 deletions

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ package/centos/rpm/SOURCES/*
5959
package/centos/rpm/RPMS/*
6060
package/centos/rpm/SRPMS/*
6161
package/centos/centos-rpm.pod
62-
package/centos/rpm/SPECS/hyper.spec
63-
package/centos/rpm/SPECS/hyperstart.spec
6462
package/fedora/rpm/BUILD/*
6563
package/fedora/rpm/BUILDROOT/*
6664
package/fedora/rpm/SOURCES/*

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([hyper], [0.5.0], [dev@hyper.sh])
5+
AC_INIT([hyper], [0.6.0], [dev@hyper.sh])
66
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
77
AM_EXTRA_RECURSIVE_TARGETS([pkg])
88

‎package/centos/.dockerignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
centos-rpm.pod.in
2+
make-rpm.sh
3+
rpm

‎package/centos/Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@ FROM centos
22
MAINTAINER Hyper Developers <dev@hyper.sh>
33

44
# RPM Build Environment
5-
RUN yum install -y @development-tools centos-packager rpmdevtools
5+
RUN yum install -y @development-tools centos-packager rpmdevtools || echo "WARNING: work around the yum failure"
66
RUN /usr/sbin/useradd makerpm; usermod -a -G mock makerpm; su makerpm -c 'rpmdev-setuptree'
77

88
# Hyper dependency
9-
RUN yum install -y automake autoconf gcc make glibc-devel glibc-devel.i686 device-mapper-devel pcre-devel libsepol-devel libselinux-devel systemd-devel sqlite-devel libvirt-devel
9+
RUN yum install -y automake autoconf gcc make glibc-devel glibc-devel.i686 device-mapper-devel pcre-devel libsepol-devel libselinux-devel systemd-devel sqlite-devel libvirt-devel|| echo "WARNING: work around the yum failure"
1010
RUN curl -sL https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | tar -C /usr/local -zxf -
1111

12-
# CBFSTool
13-
RUN cd /dev/shm; curl -sSL https://www.coreboot.org/releases/coreboot-4.2.tar.xz | tar --xz -xvf - ; cd coreboot-4.2/util/cbfstool ; make; cp cbfstool /usr/local/bin/
14-
1512
# Qemu Denpendency
16-
RUN yum install -y gcc-c++ zlib-devel libcap-devel libattr-devel librbd1-devel libtool
13+
RUN yum install -y gcc-c++ zlib-devel libcap-devel libattr-devel librbd1-devel libtool || echo "WARNING: work around the yum failure"
1714

1815
ENV PATH /usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
1916

‎package/centos/make-rpm.sh‎

100644100755
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PROJECT=$(readlink -f $(dirname $0)/../..)
44
CENTOS_DIR=${PROJECT}/package/centos
5-
VERSION=0.5
5+
VERSION=0.6
66

77
if [ $# -gt 0 ] ; then
88
VERSION=$1
@@ -11,22 +11,14 @@ fi
1111
#SOURCES
1212

1313
cd $PROJECT
14-
git archive --format=tar.gz master > ${CENTOS_DIR}/rpm/SOURCES/hyper-${VERSION}.tar.gz
14+
git archive --format=tar.gz master > ${CENTOS_DIR}/rpm/SOURCES/hyperd-${VERSION}.tar.gz
1515
cd $PROJECT/../runv
1616
git archive --format=tar.gz master > ${CENTOS_DIR}/rpm/SOURCES/runv-${VERSION}.tar.gz
1717
cd $PROJECT/../hyperstart
1818
git archive --format=tar.gz master > ${CENTOS_DIR}/rpm/SOURCES/hyperstart-${VERSION}.tar.gz
19-
cd ..
20-
[ -d qboot ] && rm -rf qboot
21-
git clone https://github.com/bonzini/qboot.git
22-
cd qboot
23-
git archive --format=tar.gz master > ${CENTOS_DIR}/rpm/SOURCES/qboot.tar.gz
2419
curl -sSL http://wiki.qemu-project.org/download/qemu-2.4.1.tar.bz2 > ${CENTOS_DIR}/rpm/SOURCES/qemu-2.4.1.tar.bz2
2520

26-
2721
sed -e "s#%PROJECT_ROOT%#${PROJECT}#g" ${CENTOS_DIR}/centos-rpm.pod.in > ${CENTOS_DIR}/centos-rpm.pod
28-
sed -e "s#%VERSION%#${VERSION}#g" ${CENTOS_DIR}/rpm/SPECS/hyper.spec.in > ${CENTOS_DIR}/rpm/SPECS/hyper.spec
29-
sed -e "s#%VERSION%#${VERSION}#g" ${CENTOS_DIR}/rpm/SPECS/hyperstart.spec.in > ${CENTOS_DIR}/rpm/SPECS/hyperstart.spec
3022

31-
${PROJECT}/hyper run -a --rm -p ${CENTOS_DIR}/centos-rpm.pod
23+
${PROJECT}/hyperctl run -a --rm -p ${CENTOS_DIR}/centos-rpm.pod
3224

package/centos/rpm/SPECS/hyper.spec.in renamed to package/centos/rpm/SPECS/hyper-container.spec

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Summary: Hyper is a VM based docker runtime
2-
Name: hyper
3-
Version: %VERSION%
1+
Summary: Hyper Container is a VM based docker runtime
2+
Name: hyper-container
3+
Version: 0.6
44
Release: 1%{?dist}
55
License: Apache License, Version 2.0
66
Group: System Environment/Base
77
# The source for this package was pulled from upstream's git repo. Use the
88
# following commands to generate the tarball:
9-
# git archive --format=tar.gz master > hyper-%{version}.tar.gz
10-
Source0: %{name}-%{version}.tar.gz
9+
# git archive --format=tar.gz master > hyperd-%{version}.tar.gz
10+
Source0: hyperd-%{version}.tar.gz
1111
# and the https://github.com/hyperhq/runv.git
1212
# git archive --format=tar.gz master > runv-%{version}.tar.gz
1313
Source1: runv-%{version}.tar.gz
@@ -24,13 +24,13 @@ Hyper is a VM based docker engine, it start a container image in
2424
VM without a full guest OS
2525

2626
%prep
27-
mkdir -p %{_builddir}/src/github.com/hyperhq/hyper
27+
mkdir -p %{_builddir}/src/github.com/hyperhq/hyperd
2828
mkdir -p %{_builddir}/src/github.com/hyperhq/runv
29-
tar -C %{_builddir}/src/github.com/hyperhq/hyper -xvf %SOURCE0
29+
tar -C %{_builddir}/src/github.com/hyperhq/hyperd -xvf %SOURCE0
3030
tar -C %{_builddir}/src/github.com/hyperhq/runv -xvf %SOURCE1
3131

3232
%build
33-
cd %{_builddir}/src/github.com/hyperhq/hyper
33+
cd %{_builddir}/src/github.com/hyperhq/hyperd
3434
export GOPATH=%{_builddir}
3535
./autogen.sh
3636
./configure
@@ -40,9 +40,9 @@ make %{?_smp_mflags}
4040
mkdir -p %{buildroot}%{_bindir}
4141
mkdir -p %{buildroot}%{_sysconfdir}
4242
mkdir -p %{buildroot}/lib/systemd/system/
43-
cp %{_builddir}/src/github.com/hyperhq/hyper/{hyperctl,hyperd} %{buildroot}%{_bindir}
44-
cp -a %{_builddir}/src/github.com/hyperhq/hyper/package/dist/etc/hyper %{buildroot}%{_sysconfdir}
45-
cp -a %{_builddir}/src/github.com/hyperhq/hyper/package/dist/lib/systemd/system/hyperd.service %{buildroot}/lib/systemd/system/hyperd.service
43+
cp %{_builddir}/src/github.com/hyperhq/hyperd/{hyperctl,hyperd} %{buildroot}%{_bindir}
44+
cp -a %{_builddir}/src/github.com/hyperhq/hyperd/package/dist/etc/hyper %{buildroot}%{_sysconfdir}
45+
cp -a %{_builddir}/src/github.com/hyperhq/hyperd/package/dist/lib/systemd/system/hyperd.service %{buildroot}/lib/systemd/system/hyperd.service
4646

4747
%clean
4848
rm -rf %{buildroot}
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
5353
/lib/systemd/system/hyperd.service
5454

5555
%changelog
56+
* Thu Apr 28 2016 Hyper Dev Team <dev@hyper.sh> - 0.6-1
57+
- update source to 0.6
58+
- rename package
5659
* Sat Jan 30 2016 Xu Wang <xu@hyper.sh> - 0.5-1
5760
- update source to 0.5
5861
- introduce libvirt dependency

package/centos/rpm/SPECS/hyperstart.spec.in renamed to package/centos/rpm/SPECS/hyperstart.spec

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
Summary: Hyperstart is the initrd for hyper VM
22
Name: hyperstart
3-
Version: %VERSION%
3+
Version: 0.6
44
Release: 1%{?dist}
55
License: Apache License, Version 2.0
66
Group: System Environment/Base
77
# The source for this package was pulled from upstream's git repo. Use the
88
# following commands to generate the tarball:
99
# git archive --format=tar.gz master > hyperstart-%{version}.tar.gz
1010
Source0: %{name}-%{version}.tar.gz
11-
# git archive --format=tar.gz master > qboot.tar.gz
12-
Source1: qboot.tar.gz
1311
URL: https://hyper.sh/
1412
ExclusiveArch: x86_64
1513

@@ -21,24 +19,17 @@ image.
2119
%prep
2220
mkdir -p %{_builddir}/src/github.com/hyperhq/hyperstart
2321
tar -C %{_builddir}/src/github.com/hyperhq/hyperstart -xvf %SOURCE0
24-
mkdir -p %{_builddir}/src/qboot
25-
tar -C %{_builddir}/src/qboot -xvf %SOURCE1
2622

2723
%build
2824
cd %{_builddir}/src/github.com/hyperhq/hyperstart
2925
./autogen.sh
3026
./configure
3127
make %{?_smp_mflags}
32-
make cbfs
33-
cd %{_builddir}/src/qboot
34-
make
3528

3629
%install
3730
mkdir -p %{buildroot}%{_sharedstatedir}/hyper
3831
cp %{_builddir}/src/github.com/hyperhq/hyperstart/build/kernel %{buildroot}%{_sharedstatedir}/hyper/
3932
cp %{_builddir}/src/github.com/hyperhq/hyperstart/build/hyper-initrd.img %{buildroot}%{_sharedstatedir}/hyper/
40-
cp %{_builddir}/src/github.com/hyperhq/hyperstart/build/cbfs.rom %{buildroot}%{_sharedstatedir}/hyper/cbfs-qboot.rom
41-
cp %{_builddir}/src/qboot/bios.bin %{buildroot}%{_sharedstatedir}/hyper/bios-qboot.bin
4233

4334
%clean
4435
rm -rf %{buildroot}
@@ -47,6 +38,12 @@ rm -rf %{buildroot}
4738
%{_sharedstatedir}/*
4839

4940
%changelog
41+
* Thu Apr 28 2016 Hyper Dev Team <dev@hyper.sh> - 0.6-1
42+
- update source to 0.6
43+
- kernel update to 4.4.7 with modules provided
44+
- volume population support
45+
- tty processing improvement
46+
- many other fix and improvement
5047
* Sat Jan 30 2016 Xu Wang <xu@hyper.sh> - 0.5-1
5148
- update source to 0.5
5249
* Fri Jan 29 2016 Xu Wang <xu@hyper.sh> - 0.4-2

‎package/centos/rpm/SPECS/qemu-hyper.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ make
3939
%{_datadir}/qemu/linuxboot.bin
4040

4141
%changelog
42-
* Fri Jan 29 2016 Xu Wang <xu@hyper.sh> - 2.4.1-2
42+
* Fri Jan 29 2016 Hyper Dev Team <dev@hyper.sh> - 2.4.1-2
4343
- Include virtio firmware
4444
- Include librbd dependency
4545
* Wed Dec 2 2015 Xu Wang <xu@hyper.sh> - 2.4.1-1

‎package/centos/rpm/build.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/bin/bash
22

3-
rpmbuild -ba hyper.spec
3+
rpmbuild -ba hyper-container.spec
44
rpmbuild -ba hyperstart.spec
55
rpmbuild -ba qemu-hyper.spec
66
ls -lh ../RPMS/x86_64
7-
sleep 60
87
sync

‎package/fedora/.dockerignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
fedora-rpm.pod.in
2+
make-rpm.sh
3+
rpm

0 commit comments

Comments
 (0)