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

!49 iSulad: sync patch from upstream

Browse Source 
From: @lifeng2221dd1
Reviewed-by: @duguhaotian
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2020-09-14 19:22:03 +08:00 committed by Gitee
commit 9aea9b7546
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-config-remove-unused-config.patch Normal file
View File

@ -0,0 +1,38 @@
From e350ca3902249f78b374eed05c6a150040797c82 Mon Sep 17 00:00:00 2001
From: lifeng68 <lifeng68@huawei.com>
Date: Fri, 11 Sep 2020 14:23:53 +0800
Subject: [PATCH] config: remove unused config
Signed-off-by: lifeng68 <lifeng68@huawei.com>
---
src/contrib/config/config.json | 1 -
src/contrib/config/systemcontainer_config.json | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/contrib/config/config.json b/src/contrib/config/config.json
index e87420d..b14c4a9 100644
--- a/src/contrib/config/config.json
+++ b/src/contrib/config/config.json
@@ -49,7 +49,6 @@
"path": "rootfs",
"readonly": false
},
- "hostname": "ubuntu",
"mounts": [
{
"destination": "/proc",
diff --git a/src/contrib/config/systemcontainer_config.json b/src/contrib/config/systemcontainer_config.json
index b9e6e8c..c7e2ebd 100644
--- a/src/contrib/config/systemcontainer_config.json
+++ b/src/contrib/config/systemcontainer_config.json
@@ -49,7 +49,6 @@
"path": "rootfs",
"readonly": false
},
- "hostname": "ubuntu",
"mounts": [
{
"destination": "/proc",
--
2.25.1

10
iSulad.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.5
%global _release 20200910.144345.git71b1055b
%global _release 20200914.172527.gitae86920a
%global is_systemd 1
Name: iSulad
@ -12,6 +12,8 @@ Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar
BuildRoot: {_tmppath}/iSulad-%{version}
ExclusiveArch: x86_64 aarch64
Patch6000: 0001-config-remove-unused-config.patch
%ifarch x86_64 aarch64
Provides: libhttpclient.so()(64bit)
Provides: libisula.so()(64bit)
@ -218,6 +220,12 @@ fi
%endif
%changelog
+* 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
- ID:NA