From beb3492edd25d0415c456f4455be85067be44f6b Mon Sep 17 00:00:00 2001 From: yafen Date: Tue, 29 Dec 2020 22:23:33 +0800 Subject: [PATCH] release new images, fix: fail to activate swap on boot, build image with Xfce/UKUI/DDE --- README.en.md | 104 +++++++++++++----- README.md | 104 +++++++++++++----- .../changelog-20.03-LTS-SP1-DDE.en.md | 15 +++ .../changelog/changelog-20.03-LTS-SP1-DDE.md | 15 +++ .../changelog-20.03-LTS-SP1-UKUI.en.md | 15 +++ .../changelog/changelog-20.03-LTS-SP1-UKUI.md | 15 +++ .../changelog-20.03-LTS-SP1-release.en.md | 15 +++ .../changelog-20.03-LTS-SP1-release.md | 15 +++ .../changelog/changelog-20.03-LTS-SP1.en.md | 15 +++ .../changelog/changelog-20.03-LTS-SP1.md | 15 +++ ...ngelog.en.md => changelog-20.03-LTS.en.md} | 31 +++++- .../{changelog.md => changelog-20.03-LTS.md} | 25 ++++- ...sktop.en.md => changelog-20.09-Xfce.en.md} | 21 +++- ....09-desktop.md => changelog-20.09-Xfce.md} | 21 +++- documents/changelog/changelog-20.09.en.md | 27 ++++- documents/changelog/changelog-20.09.md | 23 ++++ ...17\347\232\204\346\236\204\345\273\272.md" | 2 +- scripts/build-image-common.sh | 35 +++--- scripts/build-image-docker.sh | 13 ++- scripts/build-image.sh | 30 ++--- scripts/config-common/rpmlist | 1 + scripts/config-common/rpmlist-dde | 17 +++ scripts/config-common/rpmlist-ukui | 18 +++ .../config-common/{fulllist => rpmlist-xfce} | 1 + scripts/config-common/standardlist | 46 -------- scripts/config/chroot.sh | 19 +++- scripts/config/rpmlist | 1 + scripts/config/rpmlist-dde | 20 ++++ scripts/config/{standardlist => rpmlist-ukui} | 32 +----- scripts/config/{fulllist => rpmlist-xfce} | 1 + 30 files changed, 519 insertions(+), 193 deletions(-) create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-DDE.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-UKUI.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-release.en.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1-release.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1.en.md create mode 100644 documents/changelog/changelog-20.03-LTS-SP1.md rename documents/changelog/{changelog.en.md => changelog-20.03-LTS.en.md} (80%) rename documents/changelog/{changelog.md => changelog-20.03-LTS.md} (83%) rename documents/changelog/{changelog-20.09-desktop.en.md => changelog-20.09-Xfce.en.md} (64%) rename documents/changelog/{changelog-20.09-desktop.md => changelog-20.09-Xfce.md} (63%) create mode 100644 scripts/config-common/rpmlist-dde create mode 100644 scripts/config-common/rpmlist-ukui rename scripts/config-common/{fulllist => rpmlist-xfce} (99%) delete mode 100644 scripts/config-common/standardlist create mode 100644 scripts/config/rpmlist-dde rename scripts/config/{standardlist => rpmlist-ukui} (35%) rename scripts/config/{fulllist => rpmlist-xfce} (99%) diff --git a/README.en.md b/README.en.md index 5540387..daf10d8 100644 --- a/README.en.md +++ b/README.en.md @@ -31,10 +31,14 @@ You can get introduction of openEuler RaspberryPi SIG from [sig-RaspberryPi](htt - [Cross-compile the kernel](documents/交叉编译内核.md) - [Install openEuler on a SD card](documents/刷写镜像.md) - [How to use Raspberry Pi](documents/树莓派使用.md) - - [openEuler 20.03 LTS alpha version ChangeLog](documents/changelog/changelog.en.md) + - [openEuler 20.03 LTS alpha version ChangeLog](documents/changelog/changelog-20.03-LTS.en.md) - [openEuler 20.09 alpha version ChangeLog](documents/changelog/changelog-20.09.en.md) - - [openEuler 20.09 alpha version (with Xfce desktop environment) ChangeLog](documents/changelog/changelog-20.09-desktop.en.md) + - [openEuler 20.09 alpha version (with Xfce desktop environment) ChangeLog](documents/changelog/changelog-20.09-Xfce.en.md) - [openEuler 20.09 ChangeLog](documents/changelog/changelog-20.09-release.en.md) + - [openEuler 20.03 LTS SP1 alpha version ChangeLog](documents/changelog/changelog-20.03-LTS-SP1.en.md) + - [openEuler 20.03 LTS SP1 alpha version (with UKUI desktop environment) ChangeLog](documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md) + - [openEuler 20.03 LTS SP1 alpha version (with DDE desktop environment) ChangeLog](documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md) + - [openEuler 20.03 LTS SP1 ChangeLog](documents/changelog/changelog-20.03-LTS-SP1-release.en.md) ## How to download latest image @@ -50,29 +54,29 @@ Basic information of the image is as follows:

Repository of rootfs

-openEuler 20.03 LTS alpha2 +openEuler 20.03 LTS alpha3 -Link -

2020/11/17

-

224 MiB

-

4.19.90-2010.2.0

-openEuler 20.03 LTS repository +Link +

2020/12/29

+

217 MiB

+

4.19.90-2012.5.0

+openEuler 20.03 LTS repository built daily -openEuler 20.09 alpha2 +openEuler 20.09 alpha3 Link -

2020/11/17

-

239 MiB

-

4.19.140-2011.1.0.0003

+

2020/12/29

+

242 MiB

+

4.19.140-2012.2.0.0006

openEuler 20.09 repository built daily -openEuler 20.09 alpha2 (with desktop environment) +openEuler 20.09 alpha3 (with Xfce desktop environment) -Link -

2020/11/17

-

875 MiB

+Link +

2020/12/29

+

876 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 repository @@ -84,6 +88,42 @@ Basic information of the image is as follows:

259 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 repository + + +openEuler 20.03 LTS SP1 alpha1 + +Link +

2020/12/29

+

238 MiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 repository built daily + + +openEuler 20.03 LTS SP1 alpha1 (with UKUI desktop environment) + +Link +

2020/12/29

+

1.0 GiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 repository built daily + + +openEuler 20.03 LTS SP1 alpha1 (with DDE desktop environment) + +Link +

2020/12/29

+

1.0 GiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 repository built daily + + +openEuler 20.03 LTS SP1 +

root (openeuler)

+Link +

2020/12/28

+

266 MiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 repository Other information: @@ -111,10 +151,11 @@ Refer to [Script for building openEuler image for Raspberry Pi](documents/openEu #### Quickly Build without kernel compilation(Recommended) >![](documents/public_sys-resources/icon-notice.gif) **NOTICE:** ->Only openEuler 20.09 is supported currently. ->When building an image with Xfce desktop environment, you need to pay attention to two issues: ->1. Need to add an additional repository, which is the information of `[Xfce]` in the description of the parameter `-r/--repo`. Note that this repository is a temporary source for test, and it is used to supplement the related software packages of Xfce missing from the repositories of openEuler. ->2. Need to set the parameter `-s/--spec` to `standard` or `full`. Please refer to the description of this parameter for details. +>Two openEuler versions are currently supported, i.e., 20.09 and 20.03 LTS SP1. +>When building an image with Xfce/UKUI/DDE desktop environment, you need to pay attention to three issues: +>1. For building an image with Xfce desktop environment, note that only openEuler 20.09 is currently supported. You need to add an additional repository, i.e., the information of `[Xfce]` in the description of the parameter `-r/--repo`. Note that this repository is temporary for test, and it is used to supplement the related software packages of Xfce omitted by the repositories of openEuler 20.09. +>2. For building an image with DDE desktop environment, note that only openEuler 20.03 LTS SP1 is currently supported. +>3. Need to set the parameter `-s/--spec`. Please refer to the description of this parameter for details. Build images with packages of raspberrypi-kernel, raspberrypi-firmware, and raspberrypi-bluetooth. @@ -195,8 +236,10 @@ The meaning of each parameter: Specify the image version: - `headless`, image without desktop environments. - - `standard`, image with Xfce desktop environment and fundamental softwares without CJK fonts and IME. - - `full`, image with Xfce desktop environment and related softwares including CJK fonts and IME. + - `xfce`, image with Xfce desktop environment and related softwares including CJK fonts and IME. + - `ukui`, image with UKUI desktop environment and fundamental softwares without CJK fonts and IME. + - `dde`, image with DDE desktop environment and fundamental softwares without CJK fonts and IME. + - The file path of rpmlist, the file contains a list of the software to be installed in the image, refer to [rpmlist](./scripts/config/rpmlist) for details. The default is `headless`. @@ -209,11 +252,12 @@ The meaning of each parameter: Here, we provide two approaches to build an image, which both include compiling kernel and downloading firmware files of Raspberry Pi. These approaches will take considerably longer. >![](documents/public_sys-resources/icon-notice.gif) **NOTICE:** ->Both openEuler 20.03 LTS and openEuler 20.09 are supported currently. ->When building an image with Xfce desktop environment, you need to pay attention to three issues: ->1. Only openEuler 20.09 is supported currently. Need to select the branch `openEuler-20.09` of the kernel source repository, i.e., setting the parameter `-b/--branch` to `openEuler-20.09`. ->2. Need to add an additional repository, which is the information of `[Xfce]` in the description of the parameter `-r/--repo`. Note that this repository is a temporary source for test, and it is used to supplement the related software packages of Xfce missing from the repositories of openEuler. ->3. Need to set the parameter `-s/--spec` to `standard` or `full`. Please refer to the description of this parameter for details. +>Three openEuler versions are currently supported, i.e., 20.03 LTS, 20.09 and 20.03 LTS SP1. +>When building an image with Xfce/UKUI/DDE desktop environment, you need to pay attention to four issues: +>1. For building an image with Xfce desktop environment, note that only openEuler 20.09 is currently supported. You need to select the branch `openEuler-20.09` of the kernel source repository, i.e., set the parameter `-b/--branch` to `openEuler-20.09`. You also need to add an additional repository, i.e., the information of `[Xfce]` in the description of the parameter `-r/--repo`. Note that this repository is temporary for test, and it is used to supplement the related software packages of Xfce omitted by the repositories of openEuler 20.09. +>2. For building an image with UKUI desktop environment, note that only openEuler 20.09 and 20.03 LTS SP1 are currently supported. You need to select the branch `openEuler-20.09` or `openEuler-20.03-LTS` of the kernel source repository, i.e., set the parameter `-b/--branch` to `openEuler-20.09` or `openEuler-20.03-LTS`. +>3. For building an image with DDE desktop environment, note that only openEuler 20.03 LTS SP1 is currently supported. You need to select the branch `openEuler-20.03-LTS` of the kernel source repository, i.e., set the parameter `-b/--branch` to `openEuler-20.03-LTS`. +>4. Need to set the parameter `-s/--spec`. Please refer to the description of this parameter for details. ##### Build on host @@ -303,8 +347,10 @@ The meaning of each parameter: Specify the image version: - `headless`, image without desktop environments. - - `standard`, image with Xfce desktop environment and fundamental softwares without CJK fonts and IME. - - `full`, image with Xfce desktop environment and related softwares including CJK fonts and IME. + - `xfce`, image with Xfce desktop environment and related softwares including CJK fonts and IME. + - `ukui`, image with UKUI desktop environment and fundamental softwares without CJK fonts and IME. + - `dde`, image with DDE desktop environment and fundamental softwares without CJK fonts and IME. + - The file path of rpmlist, the file contains a list of the software to be installed in the image, refer to [rpmlist](./scripts/config-common/rpmlist) for details. The default is `headless`. diff --git a/README.md b/README.md index 5be59b0..ea045f1 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,14 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community - [交叉编译内核](documents/交叉编译内核.md) - [刷写镜像](documents/刷写镜像.md) - [树莓派使用](documents/树莓派使用.md) - - [openEuler 20.03 LTS 内测版更新日志](documents/changelog/changelog.md) + - [openEuler 20.03 LTS 内测版更新日志](documents/changelog/changelog-20.03-LTS.md) - [openEuler 20.09 内测版更新日志](documents/changelog/changelog-20.09.md) - - [openEuler 20.09 内测版（含 Xfce 桌面环境）更新日志](documents/changelog/changelog-20.09-desktop.md) + - [openEuler 20.09 内测版（含 Xfce 桌面环境）更新日志](documents/changelog/changelog-20.09-Xfce.md) - [openEuler 20.09 更新日志](documents/changelog/changelog-20.09-release.md) + - [openEuler 20.03 LTS SP1 更新日志](documents/changelog/changelog-20.03-LTS-SP1.md) + - [openEuler 20.03 LTS SP1 内测版（含 UKUI 桌面环境）更新日志](documents/changelog/changelog-20.03-LTS-SP1-UKUI.md) + - [openEuler 20.03 LTS SP1 内测版（含 DDE 桌面环境）更新日志](documents/changelog/changelog-20.03-LTS-SP1-DDE.md) + - [openEuler 20.03 LTS SP1 更新日志](documents/changelog/changelog-20.03-LTS-SP1-release.md) ## 最新镜像 @@ -49,29 +53,29 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community

构建文件系统的源仓库

-openEuler 20.03 LTS 内测版 +openEuler 20.03 LTS 内测版 -链接 -

2020/11/17

-

224 MiB

-

4.19.90-2010.2.0

-openEuler 20.03 LTS 源仓库 +链接 +

2020/12/29

+

217 MiB

+

4.19.90-2012.5.0

+openEuler 20.03 LTS 每日构建的源仓库 -openEuler 20.09 内测版 +openEuler 20.09 内测版 链接 -

2020/11/17

-

239 MiB

-

4.19.140-2011.1.0.0003

+

2020/12/29

+

242 MiB

+

4.19.140-2012.2.0.0006

openEuler 20.09 每日构建源仓库 -openEuler 20.09 内测版（包含 Xfce 桌面环境） +openEuler 20.09 内测版（包含 Xfce 桌面环境） -链接 -

2020/11/17

-

875 MiB

+链接 +

2020/12/29

+

876 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 源仓库 @@ -83,6 +87,42 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community

259 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 源仓库 + + +openEuler 20.03 LTS SP1 内测版 + +链接 +

2020/12/29

+

238 MiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 每日构建源仓库 + + +openEuler 20.03 LTS SP1 内测版（包含 UKUI 桌面环境） + +链接 +

2020/12/29

+

1.0 GiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 每日构建源仓库 + + +openEuler 20.03 LTS SP1 内测版（包含 DDE 桌面环境） + +链接 +

2020/12/29

+

1.0 GiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 每日构建源仓库 + + +openEuler 20.03 LTS SP1 +

root（openeuler）

+链接 +

2020/12/28

+

266 MiB

+

4.19.90-2012.3.0.0011

+openEuler 20.03 LTS SP1 源仓库 其他信息： @@ -113,10 +153,11 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community #### 快速构建（无需编译内核，推荐） >![](documents/public_sys-resources/icon-notice.gif) **须知：** ->当前只支持 openEuler 20.09 版本。 ->如果构建包含 Xfce 桌面环境的镜像，需要注意两点： ->1. 需要添加额外的开发源，也就是下面 `-r/--repo` 参数介绍中 `[Xfce]` 对应的信息。注意，该开发源是临时的测试源，其目的为补充 openEuler 的开发源中缺失的 Xfce 相关软件包。 ->2. 根据需要设置 `-s/--spec` 为 `standard` 或 `full`，其具体意义见该参数的介绍部分。 +>当前支持两个 openEuler 版本，即 20.09、20.03 LTS SP1 版本。 +>如果构建包含 Xfce/UKUI/DDE 桌面环境的镜像，需要注意三点： +>1. 构建包含 Xfce 桌面环境的镜像，当前只支持 openEuler 20.09 版本。且需要添加额外的开发源，也就是下面 `-r/--repo` 参数介绍中 `[Xfce]` 对应的信息。注意，该开发源是临时的测试源，其目的为补充 openEuler 20.09 的开发源中缺失的 Xfce 相关软件包。 +>2. 构建包含 DDE 桌面环境的镜像，当前只支持 openEuler 20.03 LTS SP1 版本。 +>3. 根据需要设置 -s/--spec，其具体意义见该参数的介绍部分。 使用已有的树莓派内核、固件、蓝牙等 RPM 包构建镜像。 @@ -196,8 +237,10 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community 构建的镜像版本： - `headless`，无图形界面版的镜像。 - - `standard`，带 Xfce 桌面及必要的配套软件（不包括中文字体以及输入法）。 - - `full`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 + - `xfce`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 + - `ukui`，带 UKUI 桌面及必要的配套软件（不包括中文字体以及输入法）。 + - `dde`，带 DDE 桌面及必要的配套软件（不包括中文字体以及输入法）。 + - rpmlist 文件路径，其中包含镜像中要安装的软件列表，内容参考 [rpmlist](./scripts/config/rpmlist)。 默认使用 `headless` 选项。 @@ -212,11 +255,12 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community 这里，提供两种构建方式。 >![](documents/public_sys-resources/icon-notice.gif) **须知：** ->当前支持 openEuler 20.03 LTS 或 openEuler 20.09 版本。 ->如果构建包含 Xfce 桌面环境的镜像，需要注意三点： ->1. 只支持 openEuler 20.09 版本。需要选择内核源码的 `openEuler-20.09` 分支，即参数 `-b/--branch` 设置为 `openEuler-20.09`。 ->2. 需要添加额外的开发源，也就是下面 `-r/--repo` 参数介绍中 `[Xfce]` 对应的信息。注意，该开发源是临时的测试源，其目的为补充 openEuler 的开发源中缺失的 Xfce 相关软件包。 ->3. 根据需要设置 `-s/--spec` 为 `standard` 或 `full`，其具体意义见该参数的介绍部分。 +>当前支持三个 openEuler 版本，即 20.03 LTS、20.09、20.03 LTS SP1 版本。 +>如果构建包含 Xfce/UKUI/DDE 桌面环境的镜像，需要注意四点： +>1. 构建包含 Xfce 桌面环境的镜像，当前只支持 openEuler 20.09 版本，需要选择内核源码的 `openEuler-20.09` 分支，即将参数 `-b/--branch` 设置为 `openEuler-20.09`。同时需要添加额外的开发源，也就是下面 `-r/--repo` 参数介绍中 `[Xfce]` 对应的信息。注意，该开发源是临时的测试源，其目的为补充 openEuler 20.09 的开发源中缺失的 Xfce 相关软件包。 +>2. 构建包含 UKUI 桌面环境的镜像，当前只支持 openEuler 20.09/20.03 LTS SP1 版本，需要选择内核源码的 `openEuler-20.09` 或 `openEuler-20.03-LTS` 分支，即将参数 `-b/--branch` 设置为 `openEuler-20.09` 或 `openEuler-20.03-LTS`。 +>3. 构建包含 DDE 桌面环境的镜像，当前只支持 openEuler 20.03 LTS SP1 版本，需要选择内核源码的 `openEuler-20.03-LTS` 分支，即将参数 `-b/--branch` 设置为 `openEuler-20.03-LTS`。 +>4. 根据需要设置 -s/--spec，其具体意义见该参数的介绍部分。 ##### 主机上构建 @@ -305,8 +349,10 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community 构建的镜像版本： - `headless`，无图形界面版的镜像。 - - `standard`，带 Xfce 桌面及必要的配套软件（不包括中文字体以及输入法）。 - - `full`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 + - `xfce`，带 Xfce 桌面以及中文字体、输入法等全部配套软件。 + - `ukui`，带 UKUI 桌面及必要的配套软件（不包括中文字体以及输入法）。 + - `dde`，带 DDE 桌面及必要的配套软件（不包括中文字体以及输入法）。 + - rpmlist 文件路径，该文件包含镜像中要安装的软件列表，内容参考 [rpmlist](./scripts/config-common/rpmlist)。 默认使用 `headless` 选项。 diff --git a/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md b/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md new file mode 100644 index 0000000..3c28f4d --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version (with DDE desktop environment) + +English | [简体中文](./changelog-20.03-LTS-SP1-DDE.md) + +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 1.0 GiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.3.0.0011 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.03 LTS SP1 repository built daily](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- Repository inside the image: [openEuler 20.03 LTS SP1 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1-DDE.md b/documents/changelog/changelog-20.03-LTS-SP1-DDE.md new file mode 100644 index 0000000..2f7a2ca --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-DDE.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version (with DDE desktop environment) + +[English](./changelog-20.03-LTS-SP1-DDE.en.md) | 简体中文 + +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：1.0 GiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.3.0.0011 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.03 LTS SP1 每日构建的源仓库](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- 镜像内置源仓库：[openEuler 20.03 LTS SP1 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md new file mode 100644 index 0000000..5e9cb89 --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version (with UKUI desktop environment) + +English | [简体中文](./changelog-20.03-LTS-SP1-UKUI.md) + +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 1.0 GiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.3.0.0011 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.03 LTS SP1 repository built daily](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- Repository inside the image: [openEuler 20.03 LTS SP1 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md new file mode 100644 index 0000000..78d63ea --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version (with UKUI desktop environment) + +[English](./changelog-20.03-LTS-SP1-UKUI.en.md) | 简体中文 + +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：1.0 GiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.3.0.0011 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.03 LTS SP1 每日构建的源仓库](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- 镜像内置源仓库：[openEuler 20.03 LTS SP1 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1-release.en.md b/documents/changelog/changelog-20.03-LTS-SP1-release.en.md new file mode 100644 index 0000000..27d4927 --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-release.en.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Version + +English | [简体中文](./changelog-20.03-LTS-SP1-release.md) + +### 2020-12-28 + +#### Basic information + +- Release date: 2020/12/28 +- Size: 266 MiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.3.0.0011 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.03 LTS SP1 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) +- Repository inside the image: [openEuler 20.03 LTS SP1 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1-release.md b/documents/changelog/changelog-20.03-LTS-SP1-release.md new file mode 100644 index 0000000..30baafc --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1-release.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Version + +[English](./changelog-20.03-LTS-SP1-release.en.md) | 简体中文 + +### 2020-12-28 + +#### 基本信息 + +- 发布时间：2020/12/28 +- 大小：266 MiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.3.0.0011 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.03 LTS SP1 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) +- 镜像内置源仓库：[openEuler 20.03 LTS SP1 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1.en.md b/documents/changelog/changelog-20.03-LTS-SP1.en.md new file mode 100644 index 0000000..8215bee --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1.en.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version + +English | [简体中文](./changelog-20.03-LTS-SP1.md) + +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 238 MiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.3.0.0011 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.03 LTS SP1 repository built daily](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- Repository inside the image: [openEuler 20.03 LTS SP1 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog-20.03-LTS-SP1.md b/documents/changelog/changelog-20.03-LTS-SP1.md new file mode 100644 index 0000000..4b1c969 --- /dev/null +++ b/documents/changelog/changelog-20.03-LTS-SP1.md @@ -0,0 +1,15 @@ +## Feature Release Log of openEuler 20.03 LTS SP1 Alpha Version + +[English](./changelog-20.03-LTS-SP1.en.md) | 简体中文 + +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：238 MiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.3.0.0011 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.03 LTS SP1 每日构建的源仓库](http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP1/standard_aarch64/aarch64/) +- 镜像内置源仓库：[openEuler 20.03 LTS SP1 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS-SP1/generic.repo) \ No newline at end of file diff --git a/documents/changelog/changelog.en.md b/documents/changelog/changelog-20.03-LTS.en.md similarity index 80% rename from documents/changelog/changelog.en.md rename to documents/changelog/changelog-20.03-LTS.en.md index 356e37f..d9cbb1e 100644 --- a/documents/changelog/changelog.en.md +++ b/documents/changelog/changelog-20.03-LTS.en.md @@ -1,6 +1,29 @@ ## Feature Release Log of openEuler 20.03 LTS Alpha Version -English | [简体中文](./changelog.md) +English | [简体中文](./changelog-20.03-LTS.md) + +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 217 MiB +- OS version: openEuler 20.03 LTS +- Kernel version: 4.19.90-2012.5.0 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.03 LTS repository built daily](http://119.3.219.20:82/openEuler:/20.03:/LTS/standard_aarch64/aarch64/) +- Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo) + +#### Updates + +##### Kernel + +Update to the latest stable version of openEuler: 4.19.90-2012.5.0. + +##### Feature update + +- Install and start haveged service on boot. +- Fixed: fail to activate swap on boot. ### 2020-11-17 @@ -18,7 +41,7 @@ English | [简体中文](./changelog.md) ##### Kernel -Update to the latest stable version of openeuler: 4.19.90-2010.2.0. +Update to the latest stable version of openEuler: 4.19.90-2010.2.0. ### 2020-10-27 @@ -36,7 +59,7 @@ Update to the latest stable version of openeuler: 4.19.90-2010.2.0. ##### Kernel -Update to the latest stable version of openeuler: 4.19.90-2009.3.0. +Update to the latest stable version of openEuler: 4.19.90-2009.3.0. ### 2020-08-10 @@ -54,7 +77,7 @@ Update to the latest stable version of openeuler: 4.19.90-2009.3.0. ##### Kernel -Update to the latest stable version of openeuler: 4.19.90-2005.2.0. +Update to the latest stable version of openEuler: 4.19.90-2005.2.0. ### 2020-05-11 diff --git a/documents/changelog/changelog.md b/documents/changelog/changelog-20.03-LTS.md similarity index 83% rename from documents/changelog/changelog.md rename to documents/changelog/changelog-20.03-LTS.md index f1f0991..3902b84 100644 --- a/documents/changelog/changelog.md +++ b/documents/changelog/changelog-20.03-LTS.md @@ -1,6 +1,29 @@ ## Feature Release Log of openEuler 20.03 LTS Alpha Version -[English](./changelog.en.md) | 简体中文 +[English](./changelog-20.03-LTS.en.md) | 简体中文 + +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：217 MiB +- 操作系统版本：openEuler 20.03 LTS +- 内核版本：4.19.90-2012.5.0 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.03 LTS 每日构建的源仓库](http://119.3.219.20:82/openEuler:/20.03:/LTS/standard_aarch64/aarch64/) +- 镜像内置源仓库：[openEuler 20.03 LTS 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo) + +#### 更新说明 + +##### 内核 + +更新到 openEuler 最新稳定版本 4.19.90-2012.5.0。 + +##### 功能改动 + +- 安装并开机启动 haveged 服务。 +- 修复：树莓派开机激活交换分区失败。 ### 2020-11-17 diff --git a/documents/changelog/changelog-20.09-desktop.en.md b/documents/changelog/changelog-20.09-Xfce.en.md similarity index 64% rename from documents/changelog/changelog-20.09-desktop.en.md rename to documents/changelog/changelog-20.09-Xfce.en.md index 6c02b10..a99d057 100644 --- a/documents/changelog/changelog-20.09-desktop.en.md +++ b/documents/changelog/changelog-20.09-Xfce.en.md @@ -1,6 +1,25 @@ ## Feature Release Log of openEuler 20.09 Alpha Version (with Xfce desktop environment) -English | [简体中文](./changelog-20.09-desktop.md) +English | [简体中文](./changelog-20.09-Xfce.md) + +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 876 MiB +- OS version: openEuler 20.09 +- Kernel version: 4.19.138-2008.1.0.0001 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.09 repository](https://repo.openeuler.org/openEuler-20.09/) +- Repository inside the image: [openEuler 20.09 repository](https://repo.openeuler.org/openEuler-20.09/) + +#### Updates + +##### Feature update + +- Install and start haveged service on boot. +- Fixed: fail to activate swap on boot. ### 2020-11-17 diff --git a/documents/changelog/changelog-20.09-desktop.md b/documents/changelog/changelog-20.09-Xfce.md similarity index 63% rename from documents/changelog/changelog-20.09-desktop.md rename to documents/changelog/changelog-20.09-Xfce.md index 221662c..1e195cf 100644 --- a/documents/changelog/changelog-20.09-desktop.md +++ b/documents/changelog/changelog-20.09-Xfce.md @@ -1,6 +1,25 @@ ## Feature Release Log of openEuler 20.09 Alpha Version (with Xfce desktop environment) -[English](./changelog-20.09-desktop.en.md) | 简体中文 +[English](./changelog-20.09-Xfce.en.md) | 简体中文 + +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：876 MiB +- 操作系统版本：openEuler 20.09 +- 内核版本：4.19.138-2008.1.0.0001 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.09 源仓库](https://repo.openeuler.org/openEuler-20.09/) +- 镜像内置源仓库：[openEuler 20.09 源仓库](https://repo.openeuler.org/openEuler-20.09/) + +#### 更新说明 + +##### 功能改动 + +- 安装并开机启动 haveged 服务。 +- 修复：树莓派开机激活交换分区失败。 ### 2020-11-17 diff --git a/documents/changelog/changelog-20.09.en.md b/documents/changelog/changelog-20.09.en.md index b958364..ac8afd0 100644 --- a/documents/changelog/changelog-20.09.en.md +++ b/documents/changelog/changelog-20.09.en.md @@ -2,6 +2,29 @@ English | [简体中文](./changelog-20.09.md) +### 2020-12-29 + +#### Basic information + +- Release date: 2020/12/29 +- Size: 242 MiB +- OS version: openEuler 20.09 +- Kernel version: 4.19.140-2012.2.0.0006 +- Firmware source: [firmware](https://github.com/raspberrypi/firmware), [bluez-firmware](https://github.com/RPi-Distro/bluez-firmware), [firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- Repository of rootfs: [openEuler 20.09 repository built daily](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo) +- Repository inside the image: [openEuler 20.09 repository](http://repo.openeuler.org/openEuler-20.09/) + +#### Updates + +##### Kernel + +Update to the latest stable version of openEuler: 4.19.140-2012.2.0. + +##### Feature update + +- Install and start haveged service on boot. +- Fixed: fail to activate swap on boot. + ### 2020-11-17 #### Basic information @@ -18,7 +41,7 @@ English | [简体中文](./changelog-20.09.md) ##### Kernel -Update to the latest stable version of openeuler: 4.19.140-2011.1.0. +Update to the latest stable version of openEuler: 4.19.140-2011.1.0. ##### Firmware @@ -48,7 +71,7 @@ Update to [the latest version](https://github.com/RPi-Distro/pi-bluetooth/archiv ##### Kernel -Update to the latest stable version of openeuler: 4.19.140-2009.4.0. +Update to the latest stable version of openEuler: 4.19.140-2009.4.0. ### 2020-09-04 diff --git a/documents/changelog/changelog-20.09.md b/documents/changelog/changelog-20.09.md index 84725b6..0275e97 100644 --- a/documents/changelog/changelog-20.09.md +++ b/documents/changelog/changelog-20.09.md @@ -2,6 +2,29 @@ [English](./changelog-20.09.en.md) | 简体中文 +### 2020-12-29 + +#### 基本信息 + +- 发布时间：2020/12/29 +- 大小：242 MiB +- 操作系统版本：openEuler 20.09 +- 内核版本：4.19.140-2012.2.0.0006 +- 固件来源：[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree) +- 构建文件系统的源仓库：[openEuler 20.09 每日构建的源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo) +- 镜像内置源仓库：[openEuler 20.09 源仓库](http://repo.openeuler.org/openEuler-20.09/) + +#### 更新说明 + +##### 内核 + +更新到 openEuler 最新稳定版本 4.19.140-2012.2.0。 + +##### 功能改动 + +- 安装并开机启动 haveged 服务。 +- 修复：树莓派开机激活交换分区失败。 + ### 2020-11-17 #### 基本信息 diff --git "a/documents/openEuler\351\225\234\345\203\217\347\232\204\346\236\204\345\273\272.md" "b/documents/openEuler\351\225\234\345\203\217\347\232\204\346\236\204\345\273\272.md" index 4fcade8..80d82a0 100644 --- "a/documents/openEuler\351\225\234\345\203\217\347\232\204\346\236\204\345\273\272.md" +++ "b/documents/openEuler\351\225\234\345\203\217\347\232\204\346\236\204\345\273\272.md" @@ -410,7 +410,7 @@ add map loop0p3 ... 2. 格式化交换分区 - `mkswap /dev/mapper/loop0p2` + `mkswap /dev/mapper/loop0p2 --pagesize 4096` 3. 格式化根目录分区 diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh index 9e1ed89..f75bcd5 100644 --- a/scripts/build-image-common.sh +++ b/scripts/build-image-common.sh @@ -11,7 +11,7 @@ Options: -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to master. -c, --config KERNEL_DEFCONFIG The name/path of defconfig file when compiling kernel, which defaults to openeuler-raspi_defconfig. -r, --repo REPO_INFO Required! The URL/path of target repo file or list of repo's baseurls which should be a space separated list. - -s, --spec SPEC The image's specification: headless, standard, full. The default is headless. + -s, --spec SPEC The image's specification: headless, xfce, ukui, dde or the file path of rpmlist. The default is headless. --cores N The number of cpu cores to be used during making. -h, --help Show command help. " @@ -149,9 +149,13 @@ prepare(){ exit 2 fi if [ "x$spec_param" == "xheadless" ] || [ "x$spec_param" == "x" ]; then - img_spec="headless" - elif [ "x$spec_param" == "xstandard" ] || [ "x$spec_param" == "xfull" ]; then - img_spec=$spec_param + : + elif [ "x$spec_param" == "xxfce" ] || [ "x$spec_param" == "xukui" ] || [ "x$spec_param" == "xdde" ]; then + CONFIG_RPM_LIST=${euler_dir}/rpmlist-${spec_param} + elif [ -f ${spec_param} ]; then + cp ${spec_param} ${tmp_dir}/ + spec_file_name=${spec_param##*/} + CONFIG_RPM_LIST=${tmp_dir}/${spec_file_name} else echo `date` - ERROR, please check your params in option -s or --spec. exit 2 @@ -430,12 +434,8 @@ update_kernel(){ ERROR "no ${kernel_branch} found." exit 1 else - set +e - git pull origin ${kernel_branch} # git_rst=`xxx` - if [ $? -ne 0 ]; then - git reset --hard remotes/origin/${kernel_branch} - fi - set -e + git fetch origin + git reset --hard remotes/origin/${kernel_branch} make_kernel ${kernel_dir} fi LOG "update kernel end." @@ -458,13 +458,7 @@ make_rootfs(){ fi cp ${repo_file} ${rootfs_dir}/etc/yum.repos.d/tmp.repo set +e - if [ $img_spec == "headless" ]; then - INSTALL_PACKAGES $CONFIG_RPM_LIST - elif [ $img_spec == "standard" ]; then - INSTALL_PACKAGES $CONFIG_STANDARD_LIST - elif [ $img_spec == "full" ]; then - INSTALL_PACKAGES $CONFIG_FULL_LIST - fi + INSTALL_PACKAGES $CONFIG_RPM_LIST cat ${rootfs_dir}/etc/systemd/timesyncd.conf | grep "^NTP*" if [ $? -ne 0 ]; then sed -i 's/#NTP=/NTP=0.cn.pool.ntp.org/g' ${rootfs_dir}/etc/systemd/timesyncd.conf @@ -495,7 +489,7 @@ make_rootfs(){ mount --bind /dev ${rootfs_dir}/dev mount -t proc /proc ${rootfs_dir}/proc mount -t sysfs /sys ${rootfs_dir}/sys - chroot ${rootfs_dir} /bin/bash -c "echo 'Y' | /chroot.sh" + chroot ${rootfs_dir} /bin/bash -c "echo 'Y' | /chroot.sh ${spec_param}" UMOUNT_ALL rm ${rootfs_dir}/etc/yum.repos.d/tmp.repo rm ${rootfs_dir}/chroot.sh @@ -526,7 +520,7 @@ make_img(){ rootp=/dev/mapper/${loopX}p3 LOG "bootp: " ${bootp} "rootp: " ${rootp} mkfs.vfat -n boot ${bootp} - mkswap ${swapp} + mkswap ${swapp} --pagesize 4096 mkfs.ext4 ${rootp} mkdir -p ${root_mnt} ${boot_mnt} mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt} @@ -627,9 +621,6 @@ boot_mnt=${workdir}/boot euler_dir=${cur_dir}/config-common CONFIG_RPM_LIST=${euler_dir}/rpmlist -CONFIG_STANDARD_LIST=${euler_dir}/standardlist -CONFIG_FULL_LIST=${euler_dir}/fulllist -img_spec="" trap 'UMOUNT_ALL' EXIT UMOUNT_ALL diff --git a/scripts/build-image-docker.sh b/scripts/build-image-docker.sh index 6787a73..c470fbf 100644 --- a/scripts/build-image-docker.sh +++ b/scripts/build-image-docker.sh @@ -13,7 +13,7 @@ Options: -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to master. -c, --config KERNEL_DEFCONFIG The name/path of defconfig file when compiling kernel, which defaults to openeuler-raspi_defconfig. -r, --repo REPO_INFO Required! The URL/path of target repo file or list of repo's baseurls which should be a space separated list. - -s, --spec SPEC The image's specification: headless, standard, full. The default is headless. + -s, --spec SPEC The image's specification: headless, xfce, ukui, dde or the file path of rpmlist. The default is headless. --cores N The number of cpu cores to be used during making. -h, --help Show command help. " @@ -87,8 +87,15 @@ parseargs() shift elif [ "x$1" == "x-s" -o "x$1" == "x--spec" ]; then spec_param=`echo $2` - if [ "x$spec_param" != "xheadless" ] && [ "x$spec_param" != "x" ] \ - && [ "x$spec_param" != "xstandard" ] && [ "x$spec_param" != "xfull" ]; then + if [ "x$spec_param" == "xheadless" ] || [ "x$spec_param" == "x" ] \ + || [ "x$spec_param" == "xxfce" ] || [ "x$spec_param" == "xukui" ] \ + || [ "x$spec_param" == "xdde" ]; then + : + elif [ -f $spec_param ]; then + cp $spec_param ${cur_dir}/params/ + spec_file_name=${spec_param##*/} + $spec_param=/work/params/${spec_file_name} + else echo `date` - ERROR, please check your params in option -s or --spec. exit 2 fi diff --git a/scripts/build-image.sh b/scripts/build-image.sh index 54d4479..8c03560 100644 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -10,7 +10,7 @@ Options: -d, --dir DIR The directory for storing the image and other temporary files, which defaults to be the directory in which the script resides. If the DIR does not exist, it will be created automatically. -r, --repo REPO_INFO Required! The URL/path of target repo file or list of repo's baseurls which should be a space separated list. -n, --name IMAGE_NAME The raspberrypi image name to be built. - -s, --spec SPEC The image's specification: headless, standard, full. The default is headless. + -s, --spec SPEC The image's specification: headless, xfce, ukui, dde or the file path of rpmlist. The default is headless. -h, --help Show command help. " @@ -122,9 +122,13 @@ prepare(){ rm -rf ${tmp_dir}/* fi if [ "x$spec_param" == "xheadless" ] || [ "x$spec_param" == "x" ]; then - img_spec="headless" - elif [ "x$spec_param" == "xstandard" ] || [ "x$spec_param" == "xfull" ]; then - img_spec=$spec_param + : + elif [ "x$spec_param" == "xxfce" ] || [ "x$spec_param" == "xukui" ] || [ "x$spec_param" == "xdde" ]; then + CONFIG_RPM_LIST=${euler_dir}/rpmlist-${spec_param} + elif [ -f ${spec_param} ]; then + cp ${spec_param} ${tmp_dir}/ + spec_file_name=${spec_param##*/} + CONFIG_RPM_LIST=${tmp_dir}/${spec_file_name} else echo `date` - ERROR, please check your params in option -s or --spec. exit 2 @@ -242,13 +246,7 @@ make_rootfs(){ cp ${repo_file} ${rootfs_dir}/etc/yum.repos.d/tmp.repo dnf --installroot=${rootfs_dir}/ makecache set +e - if [ $img_spec == "headless" ]; then - INSTALL_PACKAGES $CONFIG_RPM_LIST - elif [ $img_spec == "standard" ]; then - INSTALL_PACKAGES $CONFIG_STANDARD_LIST - elif [ $img_spec == "full" ]; then - INSTALL_PACKAGES $CONFIG_FULL_LIST - fi + INSTALL_PACKAGES $CONFIG_RPM_LIST cat ${rootfs_dir}/etc/systemd/timesyncd.conf | grep "^NTP*" if [ $? -ne 0 ]; then sed -i 's/#NTP=/NTP=0.cn.pool.ntp.org/g' ${rootfs_dir}/etc/systemd/timesyncd.conf @@ -271,7 +269,7 @@ make_rootfs(){ mount --bind /dev ${rootfs_dir}/dev mount -t proc /proc ${rootfs_dir}/proc mount -t sysfs /sys ${rootfs_dir}/sys - chroot ${rootfs_dir} /bin/bash -c "echo 'Y' | /chroot.sh" + chroot ${rootfs_dir} /bin/bash -c "echo 'Y' | /chroot.sh ${spec_param}" UMOUNT_ALL rm ${rootfs_dir}/etc/yum.repos.d/tmp.repo rm ${rootfs_dir}/chroot.sh @@ -283,7 +281,7 @@ make_img(){ device="" LOSETUP_D_IMG size=`du -sh --block-size=1MiB ${rootfs_dir} | cut -f 1 | xargs` - size=$(($size+1100)) + size=$(($size+1150)) losetup -D dd if=/dev/zero of=${img_file} bs=1MiB count=$size && sync parted ${img_file} mklabel msdos mkpart primary fat32 8192s 593919s @@ -302,7 +300,7 @@ make_img(){ rootp=/dev/mapper/${loopX}p3 LOG "bootp: " ${bootp} "rootp: " ${rootp} mkfs.vfat -n boot ${bootp} - mkswap ${swapp} + mkswap ${swapp} --pagesize 4096 mkfs.ext4 ${rootp} mkdir -p ${root_mnt} ${boot_mnt} mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt} @@ -389,10 +387,6 @@ boot_mnt=${workdir}/boot euler_dir=${cur_dir}/config CONFIG_RPM_LIST=${euler_dir}/rpmlist -CONFIG_STANDARD_LIST=${euler_dir}/standardlist -CONFIG_FULL_LIST=${euler_dir}/fulllist -img_spec="" - builddate=$(date +%Y%m%d) trap 'UMOUNT_ALL' EXIT diff --git a/scripts/config-common/rpmlist b/scripts/config-common/rpmlist index 8d11480..e7285ba 100644 --- a/scripts/config-common/rpmlist +++ b/scripts/config-common/rpmlist @@ -1,5 +1,6 @@ dnf alsa-utils +haveged wpa_supplicant vim net-tools diff --git a/scripts/config-common/rpmlist-dde b/scripts/config-common/rpmlist-dde new file mode 100644 index 0000000..81a48cd --- /dev/null +++ b/scripts/config-common/rpmlist-dde @@ -0,0 +1,17 @@ +dnf +alsa-utils +haveged +wpa_supplicant +vim +net-tools +iproute +iputils +NetworkManager +openssh-server +passwd +hostname +bluez +pulseaudio-module-bluetooth +sudo +dde +openEuler-repos diff --git a/scripts/config-common/rpmlist-ukui b/scripts/config-common/rpmlist-ukui new file mode 100644 index 0000000..de9a8b6 --- /dev/null +++ b/scripts/config-common/rpmlist-ukui @@ -0,0 +1,18 @@ +dnf +alsa-utils +haveged +wpa_supplicant +vim +net-tools +iproute +iputils +NetworkManager +openssh-server +passwd +hostname +bluez +pulseaudio-module-bluetooth +sudo +ukui +firefox +openEuler-repos diff --git a/scripts/config-common/fulllist b/scripts/config-common/rpmlist-xfce similarity index 99% rename from scripts/config-common/fulllist rename to scripts/config-common/rpmlist-xfce index 934c2c4..02b79dc 100644 --- a/scripts/config-common/fulllist +++ b/scripts/config-common/rpmlist-xfce @@ -1,5 +1,6 @@ dnf alsa-utils +haveged wpa_supplicant vim net-tools diff --git a/scripts/config-common/standardlist b/scripts/config-common/standardlist deleted file mode 100644 index de5848f..0000000 --- a/scripts/config-common/standardlist +++ /dev/null @@ -1,46 +0,0 @@ -dnf -alsa-utils -wpa_supplicant -vim -net-tools -iproute -iputils -NetworkManager -openssh-server -passwd -hostname -bluez -pulseaudio-module-bluetooth -sudo -xorg-x11-drv-fbdev -lightdm -lightdm-gtk -xfce4-session -xfwm4 -xfce4-panel -Thunar -thunar-archive-plugin -thunar-media-tags-plugin -thunar-vcs-plugin -thunar-volman -ristretto -xarchiver -firefox -mousepad -parole -xfce4-appfinder -xfce4-notifyd -xfce4-power-manager -xfce4-screenshooter -xfce4-settings -xfce4-taskmanager -xfce4-terminal -xfce4-volumed-pulse -xfce-polkit -xfce-theme-manager -xfdesktop -blueman -network-manager-applet -gparted -librsvg2 -openEuler-repos diff --git a/scripts/config/chroot.sh b/scripts/config/chroot.sh index 89bcbd1..88d2d43 100755 --- a/scripts/config/chroot.sh +++ b/scripts/config/chroot.sh @@ -2,6 +2,7 @@ systemctl enable sshd systemctl enable systemd-timesyncd systemctl enable hciuart +systemctl enable haveged echo openEuler > /etc/hostname echo "openeuler" | passwd --stdin root useradd -m -G "wheel" -s "/bin/bash" pi @@ -15,9 +16,15 @@ fi if [ -f /etc/rc.d/rc.local ]; then chmod +x /etc/rc.d/rc.local fi -if [ -f /etc/lightdm/lightdm.conf ]; then - sed -i 's/#user-session=default/user-session=xfce/g' /etc/lightdm/lightdm.conf -fi -if [ -d /etc/X11/xorg.conf.d ]; then - echo -e "Section \"Device\"\n\tIdentifier \"fb gfx\"\n\tDriver \"fbdev\"\n\tOption \"fb\" \"/dev/fb0\"\nEndSection" > /etc/X11/xorg.conf.d/20-fbdev.conf -fi +if [ "x$1" == "xxfce" ]; then + if [ -f /etc/lightdm/lightdm.conf ]; then + sed -i 's/#user-session=default/user-session=xfce/g' /etc/lightdm/lightdm.conf + fi + if [ -d /etc/X11/xorg.conf.d ]; then + echo -e "Section \"Device\"\n\tIdentifier \"fb gfx\"\n\tDriver \"fbdev\"\n\tOption \"fb\" \"/dev/fb0\"\nEndSection" > /etc/X11/xorg.conf.d/20-fbdev.conf + fi +elif [ "x$1" == "xdde" ]; then + if id openeuler; then + userdel -r openeuler + fi +fi \ No newline at end of file diff --git a/scripts/config/rpmlist b/scripts/config/rpmlist index a35bbf5..02d20b4 100644 --- a/scripts/config/rpmlist +++ b/scripts/config/rpmlist @@ -1,5 +1,6 @@ dnf alsa-utils +haveged wpa_supplicant vim net-tools diff --git a/scripts/config/rpmlist-dde b/scripts/config/rpmlist-dde new file mode 100644 index 0000000..be35444 --- /dev/null +++ b/scripts/config/rpmlist-dde @@ -0,0 +1,20 @@ +dnf +alsa-utils +haveged +wpa_supplicant +vim +net-tools +iproute +iputils +NetworkManager +openssh-server +passwd +hostname +bluez +pulseaudio-module-bluetooth +raspberrypi-kernel +raspberrypi-firmware +raspberrypi-bluetooth +sudo +dde +openEuler-repos diff --git a/scripts/config/standardlist b/scripts/config/rpmlist-ukui similarity index 35% rename from scripts/config/standardlist rename to scripts/config/rpmlist-ukui index 355eb25..ec38b62 100644 --- a/scripts/config/standardlist +++ b/scripts/config/rpmlist-ukui @@ -1,5 +1,6 @@ dnf alsa-utils +haveged wpa_supplicant vim net-tools @@ -15,35 +16,6 @@ raspberrypi-kernel raspberrypi-firmware raspberrypi-bluetooth sudo -xorg-x11-drv-fbdev -lightdm -lightdm-gtk -xfce4-session -xfwm4 -xfce4-panel -Thunar -thunar-archive-plugin -thunar-media-tags-plugin -thunar-vcs-plugin -thunar-volman -ristretto -xarchiver +ukui firefox -mousepad -parole -xfce4-appfinder -xfce4-notifyd -xfce4-power-manager -xfce4-screenshooter -xfce4-settings -xfce4-taskmanager -xfce4-terminal -xfce4-volumed-pulse -xfce-polkit -xfce-theme-manager -xfdesktop -blueman -network-manager-applet -gparted -librsvg2 openEuler-repos diff --git a/scripts/config/fulllist b/scripts/config/rpmlist-xfce similarity index 99% rename from scripts/config/fulllist rename to scripts/config/rpmlist-xfce index ac6fd15..5b8141e 100644 --- a/scripts/config/fulllist +++ b/scripts/config/rpmlist-xfce @@ -1,5 +1,6 @@ dnf alsa-utils +haveged wpa_supplicant vim net-tools -- Gitee