general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add version dependencies for rpm and deb packages

Browse Source
This commit is contained in:
Hui, Chunyang 2020-12-24 03:53:25 +00:00 committed by Zongmin.Gu
parent 9be98877de
commit 29ba19c34f
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/installer/deb/Makefile
View File

@ -40,7 +40,9 @@ config_files: main_deps
sed -e 's/^\///g' -i $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/occlum*filelist
sed -i -e '$$aetc/profile.d/occlum-pal.sh' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/occlum-pal-filelist
sed -i -e '$$aetc/profile.d/occlum-runtime.sh' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/occlum-runtime-filelist
sed -i -e 's/$$VERSION/$(VERSION_NUM)/g' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/changelog
sed -i -e 's/$$OCCLUM_VERSION/$(VERSION_NUM)/g' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/changelog
sed -i -e 's/$$OCCLUM_VERSION/$(VERSION_NUM)/g' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/control
sed -i -e 's/$$MUSL_VERSION/$(MUSL_VERSION)/g' $(DEB_BUILD_DIR)/occlum-$(VERSION_NUM)/debian/control
main_deps:
mkdir -p $(TARGET_DIR)
@ -63,6 +65,7 @@ deps_c:
cp $(PROJECT_DIR)/tools/toolchains/musl-gcc/0014-libgomp-futex-occlum.diff $(DEB_BUILD_DIR)/$(C_TOOLCHAIN_PACKAGE_NAME)/debian
cp $(PROJECT_DIR)/tools/installer/rpm/toolchains/musl-gcc/occlum-gcc.sh $(DEB_BUILD_DIR)/$(C_TOOLCHAIN_PACKAGE_NAME)/debian
echo " echo 'Please execute command \"source /etc/profile\" to validate envs immediately' " > $(DEB_BUILD_DIR)/$(C_TOOLCHAIN_PACKAGE_NAME)/debian/occlum-gcc.postinst
sed -i -e 's/$$MUSL_VERSION/$(MUSL_VERSION)/g' $(DEB_BUILD_DIR)/$(C_TOOLCHAIN_PACKAGE_NAME)/debian/changelog
golang: deps_golang
cd $(DEB_BUILD_DIR)/occlum-toolchains-golang ; \

2
tools/installer/deb/occlum/changelog
View File

@ -1,4 +1,4 @@
occlum ($VERSION-1) unstable; urgency=medium
occlum ($OCCLUM_VERSION-1) unstable; urgency=medium
* Initial release

2
tools/installer/deb/occlum/control
View File

@ -8,7 +8,7 @@ Homepage: https://github.com/occlum/occlum
Package: occlum
Architecture: amd64
Depends: ${misc:Depends}, occlum-sgx-tools, occlum-pal, occlum-runtime, occlum-toolchains-gcc
Depends: ${misc:Depends}, occlum-sgx-tools (=$OCCLUM_VERSION-1), occlum-pal (=$OCCLUM_VERSION-1), occlum-runtime (=$OCCLUM_VERSION-1), occlum-toolchains-gcc (=$MUSL_VERSION-1)
Description: Occlum is a memory-safe, multi-process library OS (LibOS) for Intel SGX.
As a LibOS, it enables legacy applications to run on SGX with little or even no modifications of source code,
thus protecting the confidentiality and integrity of user workloads transparently.

2
tools/installer/deb/toolchains/musl-gcc/changelog
View File

@ -1,4 +1,4 @@
occlum-toolchains-gcc (0.15.0-1) unstable; urgency=medium
occlum-toolchains-gcc ($MUSL_VERSION-1) unstable; urgency=medium
* Initial release

2
tools/installer/rpm/Makefile
View File

@ -29,7 +29,7 @@ all: main
main: main_deps
@mkdir -p $(TARGET_DIR)
@rpmbuild -ba --define '_version $(VERSION_NUM)' occlum.spec
@rpmbuild -ba --define '_version $(VERSION_NUM)' --define '_musl_version $(MUSL_VERSION)' occlum.spec
@mv $$HOME/rpmbuild $$HOME/rpmbuild-occlum
@cp $$HOME/rpmbuild-occlum/RPMS/x86_64/*.rpm $(TARGET_DIR)
@echo "$$(ls $$HOME/rpmbuild-occlum/RPMS/x86_64) can be found at $(TARGET_DIR)"

2
tools/installer/rpm/occlum.spec
View File

@ -35,7 +35,7 @@ BuildRequires: git
BuildRequires: fuse-devel
BuildRequires: fuse-libs
Requires: occlum-pal, occlum-runtime, occlum-toolchains-gcc, occlum-sgx-tools
Requires: occlum-pal = %{_version}, occlum-runtime = %{_version}, occlum-sgx-tools = %{_version}, occlum-toolchains-gcc = %{_musl_version}
%description
Occlum is a memory-safe, multi-process library OS (LibOS) for Intel SGX.