Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
4378a06fe1
!53 Adjust to logging command changes in Anaconda (#1891621)
From: @dog-life 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
2023-12-27 10:07:25 +00:00
shechenglong
0c689d32de Adjust to logging command changes in Anaconda (#1891621)
Signed-off-by: shechenglong <shechenglong@xfusion.com>
2023-12-27 17:06:27 +08:00
openeuler-ci-bot
59005352f1 !10 Remove old failing pre scriptlet
Merge pull request !10 from wk333/openEuler-20.03-LTS-SP3
2021-12-14 09:14:19 +00:00
wk333
7d37ec1565 Remove old failing pre scriptlet 2021-12-14 16:53:14 +08:00
openeuler-ci-bot
40059ff255 !9 [sync] PR-6: Upgrade to 0.3.83
From: @openeuler-sync-bot
Reviewed-by: @miao_kaibo
Signed-off-by: @miao_kaibo
2021-12-01 10:03:57 +00:00
sunguoshuai
0ecaca02e0 Upgrade to 0.3.83
(cherry picked from commit c5a008645cb6c177a6c2b0e2d400e580459b6c37)
2021-12-01 17:22:48 +08:00
openeuler-ci-bot
28b80f7ac7 !2 Package init
Merge pull request !2 from hdxxjhuahuo/master
2020-02-21 14:41:21 +08:00
xuxijian
dad7953b10 Package init 2020-02-20 21:44:17 -05:00
xuxijian
ec1088a10a modify spec 2020-02-18 04:17:14 -05:00
xuxijian
6c14fbea8b Package init 2020-02-18 03:58:24 -05:00
6 changed files with 113 additions and 75 deletions

View File

@ -0,0 +1,26 @@
From 4baedc326ae1e42ba2fb97772e970a696ca9caad Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Tue, 27 Oct 2020 17:37:50 +0100
Subject: [PATCH] Adjust to logging command changes in Anaconda (#1891621)
The logic for the logging command changed in Anaconda and we need to
adjust accordingly. As we don't really need to handle the logging
command, we can do this by just dropping it from the list.
Resolves: rhbz#1891621
---
initial_setup/__init__.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/initial_setup/__init__.py b/initial_setup/__init__.py
index a418cbe..80b3a93 100644
--- a/initial_setup/__init__.py
+++ b/initial_setup/__init__.py
@@ -34,7 +34,6 @@ class InitialSetupError(Exception):
"lang",
"rootpw",
"timezone",
- "logging",
"selinux",
"firewall"]

View File

@ -1,36 +0,0 @@
# initial-setup
#### Description
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -1,39 +0,0 @@
# initial-setup
#### 介绍
{**以下是码云平台说明,您可以替换此简介**
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN。专为开发者提供稳定、高效、安全的云端软件开发协作平台
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
#### 软件架构
软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
#### 参与贡献
1. Fork 本仓库
2. 新建 Feat_xxx 分支
3. 提交代码
4. 新建 Pull Request
#### 码云特技
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -0,0 +1,11 @@
diff -uNrp a/initial_setup/product.py b/initial_setup/product.py
--- a/initial_setup/product.py 2018-07-27 20:51:58.000000000 +0800
+++ b/initial_setup/product.py 2019-08-12 22:19:17.280000000 +0800
@@ -7,7 +7,7 @@ import os
import glob
RELEASE_STRING_FILE = "/etc/os-release"
-LICENSE_FILE_GLOB = "/usr/share/redhat-release*/EULA*"
+LICENSE_FILE_GLOB = "/usr/share/openeuler-release*/EULA*"
log = logging.getLogger("initial-setup")

76
initial-setup.spec Normal file
View File

@ -0,0 +1,76 @@
Name: initial-setup
Version: 0.3.83
Release: 3
Summary: Initialize system configuration for a newly installed computer
License: GPLv2+
URL: https://github.com/rhinstaller/initial-setup
Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.83-1.tar.gz
Patch9001: initial-setup-add-support-openeuler.patch
Patch9002: Adjust-to-logging-command-changes-in-Anaconda.patch
%define debug_package %{nil}
BuildRequires: gettext python3-devel python3-setuptools python3-nose systemd-units
BuildRequires: gtk3-devel glade-devel anaconda >= 29.13 intltool
Requires: python3 anaconda-tui >= 29.13 systemd >= 235 libreport-python3 util-linux
Requires: gtk3 anaconda-gui >= 29.13 firstboot(windowmanager) xorg-x11-xinit
Requires: xorg-x11-server-Xorg
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Conflicts: firstboot < 19.2
Provides: %{name}-gui = %{version}-%{release}
Obsoletes: %{name}-gui < %{version}-%{release}
%description
The initial-setup application run during the first start of a newly installed computer and
makes it possible to configure the computer according to the needs of the user.
%prep
%autosetup -n initial-setup-r0.3.83-1 -p1
rm -rf *.egg-info
%build
%make_build
%check
make test
%install
%make_install
%clean
rm -rf %{buildroot}
%post
%systemd_post %{name}.service
%preun
%systemd_preun %{name}.service
%postun
%systemd_postun %{name}.service
%files
%doc README.rst COPYING
%{python3_sitelib}/{initial_setup*,initial_setup/gui/*}
%{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled}
%{_libexecdir}/%{name}/{initial-setup-graphical,initial-setup-text}
%{_unitdir}/{initial-setup,initial-setup-reconfiguration}.service
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/conf.d
%config %{_sysconfdir}/%{name}/conf.d/*
%changelog
* Wed Dec 27 2023 shechenglong <shechenglong@xfusion.com> - 0.3.83-3
- Adjust to logging command changes in Anaconda (#1891621)
* Tue Dec 14 2021 wangkai<wangkai385@huawei.com> - 0.3.83-2
- Remove old failing pre scriptlet
* Wed Dec 01 2021 sunguoshuai<sunguoshuai@huawei.com> - 0.3.83-1
- Upgrade to 0.3.83
* Tue Feb 18 2020 xuxijian<xuxijian@huawei.com> - 0.36.62-5
- Package init

BIN
r0.3.83-1.tar.gz Normal file

Binary file not shown.