diff --git a/tools/installer/deb/Makefile b/tools/installer/deb/Makefile index 7fcab2c1..1fcc3961 100644 --- a/tools/installer/deb/Makefile +++ b/tools/installer/deb/Makefile @@ -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 ; \ diff --git a/tools/installer/deb/occlum/changelog b/tools/installer/deb/occlum/changelog index 2afaabdd..7f2c03bb 100644 --- a/tools/installer/deb/occlum/changelog +++ b/tools/installer/deb/occlum/changelog @@ -1,4 +1,4 @@ -occlum ($VERSION-1) unstable; urgency=medium +occlum ($OCCLUM_VERSION-1) unstable; urgency=medium * Initial release diff --git a/tools/installer/deb/occlum/control b/tools/installer/deb/occlum/control index ac69938c..8dc14532 100644 --- a/tools/installer/deb/occlum/control +++ b/tools/installer/deb/occlum/control @@ -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. diff --git a/tools/installer/deb/toolchains/musl-gcc/changelog b/tools/installer/deb/toolchains/musl-gcc/changelog index 3d3b4482..b0f9b6ac 100644 --- a/tools/installer/deb/toolchains/musl-gcc/changelog +++ b/tools/installer/deb/toolchains/musl-gcc/changelog @@ -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 diff --git a/tools/installer/rpm/Makefile b/tools/installer/rpm/Makefile index 1e73baef..b63ed7a8 100644 --- a/tools/installer/rpm/Makefile +++ b/tools/installer/rpm/Makefile @@ -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)" diff --git a/tools/installer/rpm/occlum.spec b/tools/installer/rpm/occlum.spec index 2077b02c..46d6fb09 100644 --- a/tools/installer/rpm/occlum.spec +++ b/tools/installer/rpm/occlum.spec @@ -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.