packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iSulad: update base version and add chrpath

Browse Source 
Signed-off-by: lifeng68 <lifeng68@huawei.com>
This commit is contained in:
lifeng68 2020-11-26 09:23:14 +08:00
parent 905036b1d4
commit 4ba9203aff
12 changed files with 74 additions and 679699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

679647
0000-update-from-2.0.5-to-2.0.7.patch
View File

File diff suppressed because it is too large Load Diff

4
0001-Add-a-solution-to-the-gpgkey-problem.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH 1/7] Add a solution to the gpgkey problem
1 file changed, 21 insertions(+)
diff --git a/README.md b/README.md
index 08467dd..9b34d61 100644
index 08467ddc..9b34d615 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,27 @@ Install iSulad with yum:
@ -41,5 +41,5 @@ index 08467dd..9b34d61 100644
We provide `systemd` service to start `iSulad`:
```sh
--
2.25.1
2.20.1

32
0002-change-default-tmp-directory-from-var-tmp-to-var-lib.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: WangFengTu <wangfengtu@huawei.com>
15 files changed, 160 insertions(+), 92 deletions(-)
diff --git a/src/daemon/modules/image/oci/oci_image.c b/src/daemon/modules/image/oci/oci_image.c
index f0ba19c..f4fa1e8 100644
index f0ba19cb..f4fa1e88 100644
--- a/src/daemon/modules/image/oci/oci_image.c
+++ b/src/daemon/modules/image/oci/oci_image.c
@@ -150,26 +150,34 @@ out:
@ -79,7 +79,7 @@ index f0ba19c..f4fa1e8 100644
ret = registry_init(NULL, NULL);
if (ret != 0) {
diff --git a/src/daemon/modules/image/oci/oci_load.c b/src/daemon/modules/image/oci/oci_load.c
index 073ad55..97cff34 100644
index 073ad55b..97cff34b 100644
--- a/src/daemon/modules/image/oci/oci_load.c
+++ b/src/daemon/modules/image/oci/oci_load.c
@@ -1011,25 +1011,23 @@ static char *oci_load_path_create()
@ -126,7 +126,7 @@ index 073ad55..97cff34 100644
}
diff --git a/src/daemon/modules/image/oci/registry/registry.c b/src/daemon/modules/image/oci/registry/registry.c
index 2656b9b..a94d10b 100644
index 2656b9b2..a94d10b1 100644
--- a/src/daemon/modules/image/oci/registry/registry.c
+++ b/src/daemon/modules/image/oci/registry/registry.c
@@ -1718,7 +1718,13 @@ static int prepare_pull_desc(pull_descriptor *desc, registry_pull_options *optio
@ -164,7 +164,7 @@ index 2656b9b..a94d10b 100644
auths_set_dir(auths_dir);
certs_set_dir(certs_dir);
diff --git a/src/daemon/modules/image/oci/storage/storage.c b/src/daemon/modules/image/oci/storage/storage.c
index f15531b..0d83707 100644
index f15531be..0d837079 100644
--- a/src/daemon/modules/image/oci/storage/storage.c
+++ b/src/daemon/modules/image/oci/storage/storage.c
@@ -1715,20 +1715,6 @@ out:
@ -216,7 +216,7 @@ index f15531b..0d83707 100644
-}
\ No newline at end of file
diff --git a/src/daemon/modules/image/oci/storage/storage.h b/src/daemon/modules/image/oci/storage/storage.h
index b030a3a..f214192 100644
index b030a3a5..f2141924 100644
--- a/src/daemon/modules/image/oci/storage/storage.h
+++ b/src/daemon/modules/image/oci/storage/storage.h
@@ -179,8 +179,6 @@ int storage_rootfs_umount(const char *container_id, bool force);
@ -229,7 +229,7 @@ index b030a3a..f214192 100644
}
#endif
diff --git a/src/daemon/modules/image/oci/utils_images.c b/src/daemon/modules/image/oci/utils_images.c
index de0eb32..7eddd25 100644
index de0eb324..7eddd25c 100644
--- a/src/daemon/modules/image/oci/utils_images.c
+++ b/src/daemon/modules/image/oci/utils_images.c
@@ -27,6 +27,7 @@
@ -372,7 +372,7 @@ index de0eb32..7eddd25 100644
+ return ret;
}
diff --git a/src/daemon/modules/image/oci/utils_images.h b/src/daemon/modules/image/oci/utils_images.h
index 5dedd56..cebcc79 100644
index 5dedd569..cebcc796 100644
--- a/src/daemon/modules/image/oci/utils_images.h
+++ b/src/daemon/modules/image/oci/utils_images.h
@@ -55,8 +55,7 @@ int add_rootfs_and_history(const layer_blob *layers, size_t layers_len, const re
@ -386,7 +386,7 @@ index 5dedd56..cebcc79 100644
#ifdef __cplusplus
}
diff --git a/test/image/oci/registry/CMakeLists.txt b/test/image/oci/registry/CMakeLists.txt
index 9e34103..36e7cab 100644
index 9e34103c..36e7cab8 100644
--- a/test/image/oci/registry/CMakeLists.txt
+++ b/test/image/oci/registry/CMakeLists.txt
@@ -24,7 +24,6 @@ add_executable(${EXE}
@ -406,7 +406,7 @@ index 9e34103..36e7cab 100644
target_include_directories(${EXE} PUBLIC
diff --git a/test/image/oci/registry/registry_ut.cc b/test/image/oci/registry/registry_ut.cc
index f656a49..25ddf69 100644
index f656a49d..25ddf694 100644
--- a/test/image/oci/registry/registry_ut.cc
+++ b/test/image/oci/registry/registry_ut.cc
@@ -43,6 +43,7 @@
@ -499,7 +499,7 @@ index f656a49..25ddf69 100644
.WillRepeatedly(Invoke(invokeStorageLayerGet1));
ASSERT_EQ(registry_pull(&options), 0);
diff --git a/test/image/oci/storage/images/CMakeLists.txt b/test/image/oci/storage/images/CMakeLists.txt
index 82ad468..b00c5a0 100644
index 82ad4680..b00c5a0e 100644
--- a/test/image/oci/storage/images/CMakeLists.txt
+++ b/test/image/oci/storage/images/CMakeLists.txt
@@ -22,6 +22,7 @@ add_executable(${EXE}
@ -519,7 +519,7 @@ index 82ad468..b00c5a0 100644
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/image/oci/storage
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/image/oci/storage/image_store
diff --git a/test/image/oci/storage/images/storage_images_ut.cc b/test/image/oci/storage/images/storage_images_ut.cc
index 4115e91..234ab74 100644
index 4115e911..234ab742 100644
--- a/test/image/oci/storage/images/storage_images_ut.cc
+++ b/test/image/oci/storage/images/storage_images_ut.cc
@@ -33,6 +33,7 @@
@ -531,7 +531,7 @@ index 4115e91..234ab74 100644
using ::testing::Args;
using ::testing::ByRef;
diff --git a/test/image/oci/storage/rootfs/CMakeLists.txt b/test/image/oci/storage/rootfs/CMakeLists.txt
index 3ba56bb..8da8196 100644
index 3ba56bb9..8da8196b 100644
--- a/test/image/oci/storage/rootfs/CMakeLists.txt
+++ b/test/image/oci/storage/rootfs/CMakeLists.txt
@@ -21,6 +21,7 @@ add_executable(${EXE}
@ -553,7 +553,7 @@ index 3ba56bb..8da8196 100644
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/image/oci/storage
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/image/oci/storage/rootfs_store
diff --git a/test/image/oci/storage/rootfs/storage_rootfs_ut.cc b/test/image/oci/storage/rootfs/storage_rootfs_ut.cc
index a4864da..9cf91fa 100644
index a4864dad..9cf91fa9 100644
--- a/test/image/oci/storage/rootfs/storage_rootfs_ut.cc
+++ b/test/image/oci/storage/rootfs/storage_rootfs_ut.cc
@@ -30,6 +30,7 @@
@ -565,7 +565,7 @@ index a4864da..9cf91fa 100644
std::string META_DATA_CONTENT = "metadata test";
diff --git a/test/mocks/isulad_config_mock.cc b/test/mocks/isulad_config_mock.cc
index 9d99315..88a74a4 100644
index 9d993157..88a74a41 100644
--- a/test/mocks/isulad_config_mock.cc
+++ b/test/mocks/isulad_config_mock.cc
@@ -136,3 +136,19 @@ char *conf_get_isulad_storage_driver_backing_fs()
@ -589,7 +589,7 @@ index 9d99315..88a74a4 100644
+ return true;
+}
diff --git a/test/mocks/isulad_config_mock.h b/test/mocks/isulad_config_mock.h
index fdf27cd..03af3cc 100644
index fdf27cdb..03af3cc9 100644
--- a/test/mocks/isulad_config_mock.h
+++ b/test/mocks/isulad_config_mock.h
@@ -34,6 +34,8 @@ public:
@ -602,5 +602,5 @@ index fdf27cd..03af3cc 100644
void MockIsuladConf_SetMock(MockIsuladConf *mock);
--
2.25.1
2.20.1

6
0003-update-api.proto-to-v1.19.3-according-to-kubelet.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: gaohuatao <gaohuatao@huawei.com>
2 files changed, 38 insertions(+)
diff --git a/src/api/services/cri/api.proto b/src/api/services/cri/api.proto
index 67e5527..dc0cfeb 100644
index 67e5527e..dc0cfeb9 100644
--- a/src/api/services/cri/api.proto
+++ b/src/api/services/cri/api.proto
@@ -219,6 +219,13 @@ enum NamespaceMode {
@ -80,7 +80,7 @@ index 67e5527..dc0cfeb 100644
message ListImagesResponse {
diff --git a/src/daemon/entry/cri/cri_security_context.cc b/src/daemon/entry/cri/cri_security_context.cc
index 634e53a..1d33226 100644
index 634e53ad..1d332261 100644
--- a/src/daemon/entry/cri/cri_security_context.cc
+++ b/src/daemon/entry/cri/cri_security_context.cc
@@ -179,6 +179,13 @@ static void ModifyContainerNamespaceOptions(const runtime::v1alpha2::NamespaceOp
@ -98,5 +98,5 @@ index 634e53a..1d33226 100644
ModifyCommonNamespaceOptions(nsOpts, hostConfig);
/* modify host network option for container */
--
2.25.1
2.20.1

4
0004-adapt-CI-ISULAD_TMPDIR-testcases.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: WangFengTu <wangfengtu@huawei.com>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/CI/test_cases/image_cases/isulad_tmpdir.sh b/CI/test_cases/image_cases/isulad_tmpdir.sh
index 22a6ad4..46849ae 100644
index 22a6ad42..46849ae7 100644
--- a/CI/test_cases/image_cases/isulad_tmpdir.sh
+++ b/CI/test_cases/image_cases/isulad_tmpdir.sh
@@ -58,8 +58,8 @@ function test_isulad_tmpdir()
@ -46,5 +46,5 @@ index 22a6ad4..46849ae 100644
msg_info "${test} finished with return ${ret}..."
return ${ret}
--
2.25.1
2.20.1

6
0005-listening-127.0.0.1-port-in-cri-stream-websocket-ser.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: wujing <wujing50@huawei.com>
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/daemon/entry/cri/websocket/service/ws_server.cc b/src/daemon/entry/cri/websocket/service/ws_server.cc
index 43cecb8..735f278 100644
index 43cecb88..735f2780 100644
--- a/src/daemon/entry/cri/websocket/service/ws_server.cc
+++ b/src/daemon/entry/cri/websocket/service/ws_server.cc
@@ -106,12 +106,10 @@ void WebsocketServer::EmitLog(int level, const char *line)
@ -43,7 +43,7 @@ index 43cecb8..735f278 100644
info.extensions = nullptr;
diff --git a/src/daemon/modules/image/oci/storage/image_store/image_store.c b/src/daemon/modules/image/oci/storage/image_store/image_store.c
index 0f613dd..af8573a 100644
index 0f613dd2..af8573ad 100644
--- a/src/daemon/modules/image/oci/storage/image_store/image_store.c
+++ b/src/daemon/modules/image/oci/storage/image_store/image_store.c
@@ -59,8 +59,8 @@
@ -71,5 +71,5 @@ index 0f613dd..af8573a 100644
ERROR("Failed to append image to digest: %s", names[i]);
ret = -1;
--
2.25.1
2.20.1

6
0006-using-64-bit-unique-token-in-CRI-websockets-server-R.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: wujing <wujing50@huawei.com>
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/daemon/entry/cri/request_cache.cc b/src/daemon/entry/cri/request_cache.cc
index 5209bca..a3cb377 100644
index 5209bcaf..a3cb3771 100644
--- a/src/daemon/entry/cri/request_cache.cc
+++ b/src/daemon/entry/cri/request_cache.cc
@@ -86,11 +86,13 @@ std::string RequestCache::UniqueToken()
@ -33,7 +33,7 @@ index 5209bca..a3cb377 100644
}
lws_b64_encode_string(rawToken, (int)strlen(rawToken), buf, (int)sizeof(buf));
diff --git a/src/daemon/entry/cri/request_cache.h b/src/daemon/entry/cri/request_cache.h
index b0b7f49..024f3ba 100644
index b0b7f491..024f3ba7 100644
--- a/src/daemon/entry/cri/request_cache.h
+++ b/src/daemon/entry/cri/request_cache.h
@@ -52,7 +52,7 @@ private:
@ -46,5 +46,5 @@ index b0b7f49..024f3ba 100644
#endif // DAEMON_ENTRY_CRI_REQUEST_CACHE_H
--
2.25.1
2.20.1

4
0007-add-mock-conf_get_use_decrypted_key_flag-and-setup-a.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: WangFengTu <wangfengtu@huawei.com>
1 file changed, 10 insertions(+)
diff --git a/test/image/oci/registry/registry_ut.cc b/test/image/oci/registry/registry_ut.cc
index 25ddf69..4b26442 100644
index 25ddf694..4b264424 100644
--- a/test/image/oci/registry/registry_ut.cc
+++ b/test/image/oci/registry/registry_ut.cc
@@ -73,6 +73,8 @@ std::string get_dir()
@ -52,5 +52,5 @@ index 25ddf69..4b26442 100644
}
--
2.25.1
2.20.1

62
iSulad.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.5
%global _release 20201125.170623.git98ee627e
%global _version 2.0.7
%global _release 20201125.165149.git7d150c3c
%global is_systemd 1
Name: iSulad
@ -12,7 +12,6 @@ Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar
BuildRoot: {_tmppath}/iSulad-%{version}
ExclusiveArch: x86_64 aarch64
Patch6000: 0000-update-from-2.0.5-to-2.0.7.patch
Patch6001: 0001-Add-a-solution-to-the-gpgkey-problem.patch
Patch6002: 0002-change-default-tmp-directory-from-var-tmp-to-var-lib.patch
Patch6003: 0003-update-api.proto-to-v1.19.3-according-to-kubelet.patch
@ -83,10 +82,9 @@ install -m 0640 ./conf/isulad.pc %{buildroot}/%{_libdir}/pkgconfig/
install -d $RPM_BUILD_ROOT/%{_bindir}
chrpath -d ./src/isula
install -m 0755 ./src/isula %{buildroot}/%{_bindir}/isula
chrpath -d ./src/isulad-shim
install -m 0755 ./src/isulad-shim %{buildroot}/%{_bindir}/isulad-shim
chrpath -d ./src/isulad
install -m 0755 ./src/isulad %{buildroot}/%{_bindir}/isulad
install -m 0755 ./src/isulad %{buildroot}/%{_bindir}/isulad
install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
install -m 0644 ../src/daemon/modules/api/image_api.h %{buildroot}/%{_includedir}/isulad/image_api.h
@ -223,23 +221,41 @@ fi
%endif
%changelog
+* Wed Nov 25 2020 <lifeng68@huawei.com> - 2.0.5-20201125.170623.git98ee627e
+- Type:update from openeuler
+- ID:NA
+- SUG:NA
+- DESC: update from openeuler
* Wed Nov 25 2020 wangfengtu<wangfengtu@huawei.com> - 2.0.7-20201125.165149.git7d150c3c
- Type: bugfix
- ID:NA
- SUG:NA
- DESC: update from openeuler
+* Thu Nov 12 2020 <gaohuatao@huawei.com> - 2.0.5-20201112.192302.gitedce3879
+- Type:update from openeuler
+- ID:NA
+- SUG:NA
+- DESC: update from openeuler
* Wed Nov 25 2020 wangfengtu<wangfengtu@huawei.com> - 2.0.6-20201125.160534.git9fb5e75d
- Type: bugfix
- ID:NA
- SUG:NA
- DESC: fix rpath not work
+* Mon Sep 14 2020 <lifeng68@huawei.com> - 2.0.5-20200914.172527.gitae86920a
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: remove unused config
* Thu Nov 12 2020 gaohuatao<gaohuatao@huawei.com> - 2.0.6-20201112.193005.git8a6b73c8
- Type: update from openeuler
- ID:NA
- SUG:NA
- DESC: update from openeuler
* Wed Oct 14 2020 lifeng68<lifeng68@huawei.com> - 2.0.6-20201014.152749.gitc8a43925
- Type: upgrade to v2.0.6
- ID:NA
- SUG:NA
- DESC: upgrade to v2.0.6
* Fri Sep 18 2020 <lifeng68@huawei.com> - 2.0.5-20200918.112827.git9aea9b75
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: modify log level to warn
* Mon Sep 14 2020 <lifeng68@huawei.com> - 2.0.5-20200914.172527.gitae86920a
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: remove unused config
* Tue Sep 10 2020 <yangjiaqi11@huawei.com> - 2.0.5-20200910.144345.git71b1055b
- Type:enhancement
@ -252,3 +268,9 @@ fi
- ID:NA
- SUG:NA
- DESC: upgrade from v2.0.3 to v2.0.5
* Wed Sep 02 2020 YoungJQ <yangjiaqi11@huawei.com> - 2.0.3-20200902.114727.git6d945f26
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: modify source0 address

2
update-version.bash
View File

@ -24,7 +24,7 @@ first_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'
second_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $2'})
third_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $3'})
read -p "Which level version do you want to upgrade?[1/2/3/d/N](default:N) select:" choice
if [[ ! -n "${choice}" || ${choice} == "N" ]]; then
if [[ ! -n "${choice}" ]] || [[ ${choice} == "N" ]]; then
echo "The version number has not been modified, it is still ${old_version}"
exit 0
fi

BIN
v2.0.5.tar.gz
View File

Binary file not shown.

BIN
v2.0.7.tar.gz Normal file
View File

Binary file not shown.