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

Commit 849df0f

Browse files
gnawuxgnawux
committed
update fedora package files
Signed-off-by: Xu Wang <[email protected]>
1 parent 2c5d073 commit 849df0f

File tree

6 files changed

+20
-30
lines changed

6 files changed

+20
-30
lines changed

‎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

‎package/fedora/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ RUN /usr/sbin/useradd makerpm; usermod -a -G mock makerpm; su makerpm -c 'rpmdev
99
RUN dnf 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 xen-devel
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
ENV PATH /usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
1613

1714
# Build RPM

‎package/fedora/make-rpm.sh

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

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

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

1313
cd $PROJECT
14-
git archive --format=tar.gz master > ${FEDORA_DIR}/rpm/SOURCES/hyper-${VERSION}.tar.gz
14+
git archive --format=tar.gz master > ${FEDORA_DIR}/rpm/SOURCES/hyper-container-${VERSION}.tar.gz
1515
cd $PROJECT/../runv
1616
git archive --format=tar.gz master > ${FEDORA_DIR}/rpm/SOURCES/runv-${VERSION}.tar.gz
1717
cd $PROJECT/../hyperstart
1818
git archive --format=tar.gz master > ${FEDORA_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 > ${FEDORA_DIR}/rpm/SOURCES/qboot.tar.gz
2419

2520

2621
sed -e "s#%PROJECT_ROOT%#${PROJECT}#g" ${FEDORA_DIR}/fedora-rpm.pod.in > ${FEDORA_DIR}/fedora-rpm.pod
2722

28-
${PROJECT}/hyper run -a --rm -p ${FEDORA_DIR}/fedora-rpm.pod
23+
${PROJECT}/hyperctl run -a --rm -p ${FEDORA_DIR}/fedora-rpm.pod
2924

‎package/fedora/rpm/SPECS/hyper.spec renamed to ‎package/fedora/rpm/SPECS/hyper-container.spec

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Hyper is a VM based docker runtime
2-
Name: hyper
3-
Version: 0.5
2+
Name: hyper-container
3+
Version: 0.6
44
Release: 1%{?dist}
55
License: Apache License, Version 2.0
66
Group: System Environment/Base
@@ -23,13 +23,13 @@ Hyper is a VM based docker engine, it start a container image in
2323
VM without a full guest OS
2424

2525
%prep
26-
mkdir -p %{_builddir}/src/github.com/hyperhq/hyper
26+
mkdir -p %{_builddir}/src/github.com/hyperhq/hyperd
2727
mkdir -p %{_builddir}/src/github.com/hyperhq/runv
28-
tar -C %{_builddir}/src/github.com/hyperhq/hyper -xvf %SOURCE0
28+
tar -C %{_builddir}/src/github.com/hyperhq/hyperd -xvf %SOURCE0
2929
tar -C %{_builddir}/src/github.com/hyperhq/runv -xvf %SOURCE1
3030

3131
%build
32-
cd %{_builddir}/src/github.com/hyperhq/hyper
32+
cd %{_builddir}/src/github.com/hyperhq/hyperd
3333
export GOPATH=%{_builddir}
3434
./autogen.sh
3535
./configure
@@ -39,9 +39,9 @@ make %{?_smp_mflags}
3939
mkdir -p %{buildroot}%{_bindir}
4040
mkdir -p %{buildroot}%{_sysconfdir}
4141
mkdir -p %{buildroot}/lib/systemd/system/
42-
cp %{_builddir}/src/github.com/hyperhq/hyper/{hyperctl,hyperd} %{buildroot}%{_bindir}
43-
cp -a %{_builddir}/src/github.com/hyperhq/hyper/package/dist/etc/hyper %{buildroot}%{_sysconfdir}
44-
cp -a %{_builddir}/src/github.com/hyperhq/hyper/package/dist/lib/systemd/system/hyperd.service %{buildroot}/lib/systemd/system/hyperd.service
42+
cp %{_builddir}/src/github.com/hyperhq/hyperd/{hyperctl,hyperd} %{buildroot}%{_bindir}
43+
cp -a %{_builddir}/src/github.com/hyperhq/hyperd/package/dist/etc/hyper %{buildroot}%{_sysconfdir}
44+
cp -a %{_builddir}/src/github.com/hyperhq/hyperd/package/dist/lib/systemd/system/hyperd.service %{buildroot}/lib/systemd/system/hyperd.service
4545

4646
%clean
4747
rm -rf %{buildroot}
@@ -52,6 +52,8 @@ rm -rf %{buildroot}
5252
/lib/systemd/system/hyperd.service
5353

5454
%changelog
55+
* Wed May 25 2016 Hyper Dev Team <[email protected]> - 0.6-1
56+
- update source to 0.6
5557
* Sat Jan 30 2016 Xu Wang <[email protected]> - 0.5-1
5658
- update source to 0.5
5759
- add libvirt dependency

‎package/fedora/rpm/SPECS/hyperstart.spec

Lines changed: 3 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: 0.5
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,8 @@ rm -rf %{buildroot}
4738
%{_sharedstatedir}/*
4839

4940
%changelog
41+
* Wed May 25 2016 Hyper Dev Team <[email protected]> - 0.6-1
42+
- update source to 0.6
5043
* Sat Jan 30 2016 Xu Wang <[email protected]> - 0.5-1
5144
- update source to 0.5
5245
* Fri Jan 29 2016 Xu Wang <[email protected]> - 0.4-2

‎package/fedora/rpm/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
rpmbuild -ba hyper.spec
3+
rpmbuild -ba hyper-container.spec
44
rpmbuild -ba hyperstart.spec
55
ls -lh ../RPMS/x86_64
66
sync

0 commit comments

Comments
 (0)