From ec39dc4f1f2a6829384d743cfa64b3b70379e957 Mon Sep 17 00:00:00 2001 From: Geronimo Orozco Date: Thu, 6 Apr 2017 16:35:29 -0500 Subject: [PATCH 1/3] build: Simplify script to update version We need to simplify the script to set version of package to download in just one section. Signed-off-by: Geronimo Orozco --- 2.1/build/build-rpms.sh | 25 +++++++++---------- ...qemu-lite.spec => qemu-lite.spec-template} | 4 +-- ...qemu-lite.spec => qemu-lite.spec-template} | 4 +-- ...qemu-lite.spec => qemu-lite.spec-template} | 4 +-- 4 files changed, 18 insertions(+), 19 deletions(-) rename 2.1/build/centos/SOURCES/{qemu-lite.spec => qemu-lite.spec-template} (97%) rename 2.1/build/fedora/SOURCES/{qemu-lite.spec => qemu-lite.spec-template} (97%) rename 2.1/build/rpmbuild/SOURCES/{qemu-lite.spec => qemu-lite.spec-template} (97%) diff --git a/2.1/build/build-rpms.sh b/2.1/build/build-rpms.sh index 738d487..a62f663 100755 --- a/2.1/build/build-rpms.sh +++ b/2.1/build/build-rpms.sh @@ -1,5 +1,6 @@ #!/bin/bash # $1 Release version +qemu_lite_version=da5004e3ffc6a79df82d1b9d8f8533c4045f193c if [ -z "$1" ]; then echo "No cc-oci-runtime version specified" @@ -9,32 +10,30 @@ if [ -z "$1" ]; then exit 1 fi -# Download cc-oci-runtime.tar.gz -curl -OkL https://github.com/01org/cc-oci-runtime/archive/$1.tar.gz - -# Download qemu-lite.tar.gz -curl -OkL https://github.com/01org/qemu-lite/archive/da5004e3ffc6a79df82d1b9d8f8533c4045f193c.tar.gz +# version can't have '-' character +version=$(echo $1 | tr '-' '.') # Setup cc-oci-runtime rpmdev-setuptree cd ~/rpmbuild/SOURCES -version=$(echo $1) -mv ~/$1.tar.gz ~/rpmbuild/SOURCES/cc-oci-runtime-$version.tar.gz +# Download cc-oci-runtime.tar.gz +curl -kL https://github.com/01org/cc-oci-runtime/archive/$1.tar.gz -o cc-oci-runtime-$version.tar.gz -# Move qemu-lite tar -mv ~/da5004e3ffc6a79df82d1b9d8f8533c4045f193c.tar.gz ~/rpmbuild/SOURCES +# Download qemu-lite.tar.gz +curl -OkL https://github.com/01org/qemu-lite/archive/$qemu_lite_version.tar.gz # Update cc-oci-runtime.spec template sed "s/VERSION/$version/g; s/PACKAGE/$1/g" ~/rpmbuild/SOURCES/cc-oci-runtime.spec-template > ~/rpmbuild/SOURCES/cc-oci-runtime.spec +# Update qemu-lite.spec template +sed "s/QEMU_LITE_VERSION/$qemu_lite_version/g" ~/rpmbuild/SOURCES/qemu-lite.spec-template > ~/rpmbuild/SOURCES/qemu-lite.spec + # Build qemu-lite -cd ~/rpmbuild/SOURCES && \ - rpmbuild -ba qemu-lite.spec +rpmbuild -ba qemu-lite.spec # Build cc-oci-runtime -cd ~/rpmbuild/SOURCES && \ - rpmbuild -ba cc-oci-runtime.spec +rpmbuild -ba cc-oci-runtime.spec # Copy RPMs cp ~/rpmbuild/RPMS/x86_64/* ~/build/ diff --git a/2.1/build/centos/SOURCES/qemu-lite.spec b/2.1/build/centos/SOURCES/qemu-lite.spec-template similarity index 97% rename from 2.1/build/centos/SOURCES/qemu-lite.spec rename to 2.1/build/centos/SOURCES/qemu-lite.spec-template index 13d0180..7b1a1c1 100644 --- a/2.1/build/centos/SOURCES/qemu-lite.spec +++ b/2.1/build/centos/SOURCES/qemu-lite.spec-template @@ -2,7 +2,7 @@ Name: qemu-lite Version: 2.7.1 Release: 0 -Source0: https://github.com/01org/qemu-lite/archive/da5004e3ffc6a79df82d1b9d8f8533c4045f193c.tar.gz +Source0: https://github.com/01org/qemu-lite/archive/QEMU_LITE_VERSION.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Summary : OpenBIOS development utilities Group : Development/Tools @@ -45,7 +45,7 @@ data components for the qemu-lite package. %prep -%setup -q -n qemu-lite-da5004e3ffc6a79df82d1b9d8f8533c4045f193c +%setup -q -n qemu-lite-QEMU_LITE_VERSION %patch1 -p1 %build diff --git a/2.1/build/fedora/SOURCES/qemu-lite.spec b/2.1/build/fedora/SOURCES/qemu-lite.spec-template similarity index 97% rename from 2.1/build/fedora/SOURCES/qemu-lite.spec rename to 2.1/build/fedora/SOURCES/qemu-lite.spec-template index 13d0180..7b1a1c1 100644 --- a/2.1/build/fedora/SOURCES/qemu-lite.spec +++ b/2.1/build/fedora/SOURCES/qemu-lite.spec-template @@ -2,7 +2,7 @@ Name: qemu-lite Version: 2.7.1 Release: 0 -Source0: https://github.com/01org/qemu-lite/archive/da5004e3ffc6a79df82d1b9d8f8533c4045f193c.tar.gz +Source0: https://github.com/01org/qemu-lite/archive/QEMU_LITE_VERSION.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Summary : OpenBIOS development utilities Group : Development/Tools @@ -45,7 +45,7 @@ data components for the qemu-lite package. %prep -%setup -q -n qemu-lite-da5004e3ffc6a79df82d1b9d8f8533c4045f193c +%setup -q -n qemu-lite-QEMU_LITE_VERSION %patch1 -p1 %build diff --git a/2.1/build/rpmbuild/SOURCES/qemu-lite.spec b/2.1/build/rpmbuild/SOURCES/qemu-lite.spec-template similarity index 97% rename from 2.1/build/rpmbuild/SOURCES/qemu-lite.spec rename to 2.1/build/rpmbuild/SOURCES/qemu-lite.spec-template index 13d0180..7b1a1c1 100644 --- a/2.1/build/rpmbuild/SOURCES/qemu-lite.spec +++ b/2.1/build/rpmbuild/SOURCES/qemu-lite.spec-template @@ -2,7 +2,7 @@ Name: qemu-lite Version: 2.7.1 Release: 0 -Source0: https://github.com/01org/qemu-lite/archive/da5004e3ffc6a79df82d1b9d8f8533c4045f193c.tar.gz +Source0: https://github.com/01org/qemu-lite/archive/QEMU_LITE_VERSION.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Summary : OpenBIOS development utilities Group : Development/Tools @@ -45,7 +45,7 @@ data components for the qemu-lite package. %prep -%setup -q -n qemu-lite-da5004e3ffc6a79df82d1b9d8f8533c4045f193c +%setup -q -n qemu-lite-QEMU_LITE_VERSION %patch1 -p1 %build From d774abd595c669ddc5277e8fbfab0f5264af0535 Mon Sep 17 00:00:00 2001 From: Geronimo Orozco Date: Fri, 7 Apr 2017 15:36:13 -0500 Subject: [PATCH 2/3] spec: Remove genfile.sh from install from spec genfile.sh is not installed anymore with latest release Signed-off-by: Geronimo Orozco --- 2.1/build/centos/SOURCES/cc-oci-runtime.spec-template | 1 - 2.1/build/fedora/SOURCES/cc-oci-runtime.spec-template | 1 - 2.1/build/rpmbuild/SOURCES/cc-oci-runtime.spec-template | 1 - 3 files changed, 3 deletions(-) diff --git a/2.1/build/centos/SOURCES/cc-oci-runtime.spec-template b/2.1/build/centos/SOURCES/cc-oci-runtime.spec-template index a25c1bd..609a341 100644 --- a/2.1/build/centos/SOURCES/cc-oci-runtime.spec-template +++ b/2.1/build/centos/SOURCES/cc-oci-runtime.spec-template @@ -83,7 +83,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -/usr/share/defaults/cc-oci-runtime/genfile.sh %files bin %defattr(-,root,root,-) diff --git a/2.1/build/fedora/SOURCES/cc-oci-runtime.spec-template b/2.1/build/fedora/SOURCES/cc-oci-runtime.spec-template index a25c1bd..609a341 100644 --- a/2.1/build/fedora/SOURCES/cc-oci-runtime.spec-template +++ b/2.1/build/fedora/SOURCES/cc-oci-runtime.spec-template @@ -83,7 +83,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -/usr/share/defaults/cc-oci-runtime/genfile.sh %files bin %defattr(-,root,root,-) diff --git a/2.1/build/rpmbuild/SOURCES/cc-oci-runtime.spec-template b/2.1/build/rpmbuild/SOURCES/cc-oci-runtime.spec-template index a25c1bd..609a341 100644 --- a/2.1/build/rpmbuild/SOURCES/cc-oci-runtime.spec-template +++ b/2.1/build/rpmbuild/SOURCES/cc-oci-runtime.spec-template @@ -83,7 +83,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -/usr/share/defaults/cc-oci-runtime/genfile.sh %files bin %defattr(-,root,root,-) From f2abc7edc70acf7702d647de8a3524dcca6635e3 Mon Sep 17 00:00:00 2001 From: Geronimo Orozco Date: Fri, 7 Apr 2017 11:19:07 -0500 Subject: [PATCH 3/3] qemu-lite: Update qemu-lite and cc-oci-runtime version Update qemu-lite and cc-oci-runtime versions to build rpms Signed-off-by: Geronimo Orozco --- 2.1/build/build-rpms.sh | 2 +- 2.1/build/centos/README.md | 2 +- 2.1/build/fedora/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/build/build-rpms.sh b/2.1/build/build-rpms.sh index a62f663..ce08efc 100755 --- a/2.1/build/build-rpms.sh +++ b/2.1/build/build-rpms.sh @@ -1,6 +1,6 @@ #!/bin/bash # $1 Release version -qemu_lite_version=da5004e3ffc6a79df82d1b9d8f8533c4045f193c +qemu_lite_version=741f430a960b5b67745670e8270db91aeb083c5f if [ -z "$1" ]; then echo "No cc-oci-runtime version specified" diff --git a/2.1/build/centos/README.md b/2.1/build/centos/README.md index 118fcbd..8e360a3 100644 --- a/2.1/build/centos/README.md +++ b/2.1/build/centos/README.md @@ -14,7 +14,7 @@ Make sure you have write access on that directory. ``` # export BUILD_DIR=/tmp/build -# export VERSION=2.1.1 +# export VERSION=2.1.2 # docker run -ti --rm -v $BUILD_DIR:/home/cc/build -v $PWD/../build-rpms.sh:/usr/bin/build-rpms.sh centos-clear-containers /usr/bin/build-rpms.sh $VERSION ``` diff --git a/2.1/build/fedora/README.md b/2.1/build/fedora/README.md index 4c4534e..50ac4c8 100644 --- a/2.1/build/fedora/README.md +++ b/2.1/build/fedora/README.md @@ -13,7 +13,7 @@ Make sure you have write access on that directory. ``` # export BUILD_DIR=/tmp/build -# export VERSION=2.1.1 +# export VERSION=2.1.2 # docker run -ti --rm -v $BUILD_DIR:/home/cc/build -v $PWD/../build-rpms.sh:/usr/bin/build-rpms.sh fedora-clear-containers /usr/bin/build-rpms.sh $VERSION ```