diff --git a/README.en.md b/README.en.md
index 68c2cc49f45feac8f51a06aafff142774dc229fd..ea19ad2cd2ef7b270d1ee55ae1369ed03cdcf3f9 100644
--- a/README.en.md
+++ b/README.en.md
@@ -21,48 +21,71 @@ You can get introduction of openEuler RaspberryPi SIG from [sig-RaspberryPi](htt
## Files and Directories
- [scripts](./scripts): Script for building openEuler image for Raspberry Pi
- - [Quickly Build(without kernel compilation)](scripts/build-image.sh)
- - [Build on host(with kernel compilation)](scripts/build-image-common.sh)
- - [Build in a Docker container(with kernel compilation)](scripts/build-image-docker.sh)
+ - [Quickly Build (without kernel compilation)](scripts/build-image.sh)
+ - [Build on host (with kernel compilation)](scripts/build-image-common.sh)
+ - [Build in a Docker container (with kernel compilation)](scripts/build-image-docker.sh)
- [documents](./documents/):
- [Building openEuler image for Raspberry Pi](documents/openEuler镜像的构建.md)
- [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 ChangeLog](documents/changelog.en.md)
- - [openEuler 20.09 ChangeLog](documents/changelog-20.09.en.md)
+ - [openEuler 20.03 LTS alpha version ChangeLog](documents/changelog/changelog.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 ChangeLog](documents/changelog/changelog-20.09-release.en.md)
## How to download latest image
-1. openEuler 20.03 LTS
-
- Alpha version of openEuler 20.03 LTS image for Raspberry Pi, [download](https://isrc.iscas.ac.cn/eulixos/repo/others/openeuler-raspberrypi/images/openEuler-20.03-LTS-aarch64-raspi.img.xz).
-
- Basic information of the above image:
-
- - [ChangeLog](documents/changelog.en.md)
- - Release date: 2020-08-10
- - Size: 259 MiB
- - OS version: openEuler 20.03 LTS
- - Kernel version: 4.19.90-2005.2.0.0002
- - 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](rhttp://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- - Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config-common/openEuler-20.03-LTS.repo)
-
-2. openEuler 20.09
-
- Alpha version of openEuler 20.09 image for Raspberry Pi, [download](https://isrc.iscas.ac.cn/eulixos/repo/others/openeuler-raspberrypi/images/openEuler-20.09-aarch64-raspi.img.xz).
-
- Basic information of the above image:
-
- - [ChangeLog](documents/changelog-20.09.en.md)
- - Release date: 2020-09-04
- - Size: 237 MiB
- - OS version: openEuler 20.09
- - Kernel version: 4.19.140-2008.3.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 built daily](http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/)
- - Repository inside the image: [openEuler 20.09 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo)
+Basic information of the image is as follows:
+
+
+
+Other information:
+- 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)
## How to Use image
@@ -85,8 +108,11 @@ Refer to [Script for building openEuler image for Raspberry Pi](documents/openEu
#### Quickly Build without kernel compilation(Recommended)
-> **NOTICE:**
+> **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.
Build images with packages of raspberrypi-kernel, raspberrypi-firmware, and raspberrypi-bluetooth.
@@ -112,33 +138,63 @@ The meaning of each parameter:
- The path of target repo file: `./openEuler-20.09.repo`
The content of the repo file is as follows:
+
```
- [MAINLINE]
- name=MAINLINE
- baseurl=http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/
+ [OS]
+ name=OS
+ baseurl=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/
enabled=1
- gpgcheck=0
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/RPM-GPG-KEY-openEuler
+
+ [everything]
+ name=everything
+ baseurl=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/RPM-GPG-KEY-openEuler
[EPOL]
name=EPOL
- baseurl=http://119.3.219.20:82/openEuler:/Epol/standard_aarch64/
+ baseurl=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/RPM-GPG-KEY-openEuler
+
+ [debuginfo]
+ name=debuginfo
+ baseurl=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+
+ [source]
+ name=source
+ baseurl=http://repo.openeuler.org/openEuler-20.09/source/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/source/RPM-GPG-KEY-openEuler
+
+ [Xfce]
+ name=Xfce
+ baseurl=https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/
enabled=1
gpgcheck=0
```
- - List of repo's baseurls: `"http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/ http://119.3.219.20:82/openEuler:/Epol/standard_aarch64/"`
+ - List of repo's baseurls: `"http://repo.openeuler.org/openEuler-20.09/everything/aarch64/ http://repo.openeuler.org/openEuler-20.09/EPOL/aarch64/ https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/"`
3. -n, --name IMAGE_NAME
The image name to be built.
- For example, `openEuler-20.09.img`. The default is `openEuler-aarch64-raspi.img`, or it is automatically generated based on parameter: `-r, --repo REPO_INFO`.
+ For example, `openEuler-20.09.img`. The default is `openEuler-raspi-aarch64.img`, or it is automatically generated based on parameter: `-n, --name IMAGE_NAME`.
4. -s, --spec SPEC
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.
+ - `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.
The default is `headless`.
@@ -150,6 +206,13 @@ 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.
+> **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.
+
##### Build on host
Run the following command to build an image:
@@ -162,15 +225,15 @@ The meaning of each parameter:
The image name to be built.
- For example, `openEuler-20.03-LTS.img`. The default is `openEuler-aarch64-raspi.img`, or it is automatically generated based on parameter: `-r, --repo REPO_INFO`.
+ For example, `openEuler-20.03-LTS.img`. The default is `openEuler-raspi-aarch64.img`, or it is automatically generated based on parameter: `-n, --name IMAGE_NAME`.
2. -k, --kernel KERNEL_URL
- The URL of kernel source's repository, which defaults to `https://gitee.com/openeuler/raspberrypi-kernel.git`.
+ The URL of kernel source repository, which defaults to `https://gitee.com/openeuler/raspberrypi-kernel.git`.
3. -b, --branch KERNEL_BRANCH
- The branch name of kernel source's repository, which defaults to `master`.
+ The branch name of kernel source repository, which defaults to `master`. `openEuler-20.03-LTS` or `openEuler-20.09` is recommended.
4. -c, --config KERNEL_DEFCONFIG
@@ -183,17 +246,61 @@ The meaning of each parameter:
Examples are as follows:
- The URL of target repo file: `https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo`
- - The path of target repo file: `./openEuler-20.03-LTS.repo`
-
- Refer to `https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo` for details about the content of the repo file.
- - List of repo's baseurls: `"http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/source"`
+ - The path of target repo file:
+
+ - `./openEuler-20.03-LTS.repo`: for building openEuler 20.03 LTS image, refer to for details.
+ - `./openEuler-20.09.repo`: for building openEuler 20.09 image, the content of the repo file is as follows:
+
+ ```
+ [OS]
+ name=OS
+ baseurl=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/RPM-GPG-KEY-openEuler
+
+ [everything]
+ name=everything
+ baseurl=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/RPM-GPG-KEY-openEuler
+
+ [EPOL]
+ name=EPOL
+ baseurl=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/RPM-GPG-KEY-openEuler
+
+ [debuginfo]
+ name=debuginfo
+ baseurl=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+
+ [source]
+ name=source
+ baseurl=http://repo.openeuler.org/openEuler-20.09/source/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/source/RPM-GPG-KEY-openEuler
+
+ [Xfce]
+ name=Xfce
+ baseurl=https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/
+ enabled=1
+ gpgcheck=0
+ ```
+ - List of repo's baseurls: `"http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/source"` or `"http://repo.openeuler.org/openEuler-20.09/everything/aarch64/ http://repo.openeuler.org/openEuler-20.09/EPOL/aarch64/ https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/"`
6. -s, --spec SPEC
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.
+ - `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.
The default is `headless`.
diff --git a/README.md b/README.md
index 6dcda1dd3e1a03e483413bb8945453d326c95d40..19d8b2d0ebfae6a05fc834a9ca1105d6b96b5620 100644
--- a/README.md
+++ b/README.md
@@ -27,40 +27,63 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
- [交叉编译内核](documents/交叉编译内核.md)
- [刷写镜像](documents/刷写镜像.md)
- [树莓派使用](documents/树莓派使用.md)
- - [openEuler 20.03 LTS 更新日志](documents/changelog.md)
- - [openEuler 20.09 更新日志](documents/changelog-20.09.md)
+ - [openEuler 20.03 LTS 内测版更新日志](documents/changelog/changelog.md)
+ - [openEuler 20.09 内测版更新日志](documents/changelog/changelog-20.09.md)
+ - [openEuler 20.09 内测版(含 Xfce 桌面环境)更新日志](documents/changelog/changelog-20.09-desktop.md)
+ - [openEuler 20.09 更新日志](documents/changelog/changelog-20.09-release.md)
## 最新镜像
-1. openEuler 20.03 LTS
-
- openEuler 20.03 LTS 的内测版本镜像,[下载](https://isrc.iscas.ac.cn/eulixos/repo/others/openeuler-raspberrypi/images/openEuler-20.03-LTS-aarch64-raspi.img.xz)。
-
- 该镜像的基本信息:
-
- - [更新日志](documents/changelog.md)
- - 发布时间:2020-08-10
- - 大小:259 MiB
- - 操作系统版本:openEuler 20.03 LTS
- - 内核版本:4.19.90-2005.2.0.0002
- - 固件来源:[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://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- - 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo)
-
-2. openEuler 20.09
-
- openEuler 20.09 的内测版本镜像,[下载](https://isrc.iscas.ac.cn/eulixos/repo/others/openeuler-raspberrypi/images/openEuler-20.09-aarch64-raspi.img.xz)。
-
- 该镜像的基本信息:
-
- - [更新日志](documents/changelog-20.09.md)
- - 发布时间:2020-09-04
- - 大小:237 MiB
- - 操作系统版本:openEuler 20.09
- - 内核版本:4.19.140-2008.3.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 每日构建的源仓库](http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/)
- - 镜像内置源仓库:[openEuler 20.09 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo)
+镜像的基本信息如下所示:
+
+
+
+其他信息:
+- 固件来源:[firmware](https://github.com/raspberrypi/firmware)、[bluez-firmware](https://github.com/RPi-Distro/bluez-firmware)、[firmware-nonfree](https://github.com/RPi-Distro/firmware-nonfree)
## 使用镜像
@@ -86,8 +109,11 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
#### 快速构建(无需编译内核,推荐)
-> **须知:**
+> **须知:**
>当前只支持 openEuler 20.09 版本。
+>如果构建包含 Xfce 桌面环境的镜像,需要注意两点:
+>1. 需要添加额外的开发源,也就是下面 `-r/--repo` 参数介绍中 `[Xfce]` 对应的信息。注意,该开发源是临时的测试源,其目的为补充 openEuler 的开发源中缺失的 Xfce 相关软件包。
+>2. 根据需要设置 `-s/--spec` 为 `standard` 或 `full`,其具体意义见该参数的介绍部分。
使用已有的树莓派内核、固件、蓝牙等 RPM 包构建镜像。
@@ -112,26 +138,56 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
- 开发源的 repo 文件路径:`./openEuler-20.09.repo`
该文件的内容如下:
+
```
- [MAINLINE]
- name=MAINLINE
- baseurl=http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/
+ [OS]
+ name=OS
+ baseurl=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/
enabled=1
- gpgcheck=0
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/RPM-GPG-KEY-openEuler
+
+ [everything]
+ name=everything
+ baseurl=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/RPM-GPG-KEY-openEuler
[EPOL]
name=EPOL
- baseurl=http://119.3.219.20:82/openEuler:/Epol/standard_aarch64/
+ baseurl=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/RPM-GPG-KEY-openEuler
+
+ [debuginfo]
+ name=debuginfo
+ baseurl=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+
+ [source]
+ name=source
+ baseurl=http://repo.openeuler.org/openEuler-20.09/source/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/source/RPM-GPG-KEY-openEuler
+
+ [Xfce]
+ name=Xfce
+ baseurl=https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/
enabled=1
gpgcheck=0
```
- - 资源库的 baseurl 列表:`"http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/ http://119.3.219.20:82/openEuler:/Epol/standard_aarch64/"`
+ - 资源库的 baseurl 列表:`"http://repo.openeuler.org/openEuler-20.09/everything/aarch64/ http://repo.openeuler.org/openEuler-20.09/EPOL/aarch64/ https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/"`
3. -n, --name IMAGE_NAME
构建的镜像名称。
- 例如,`openEuler-20.09.img`。默认为`openEuler-aarch64-raspi.img`,或者根据 `-r, --repo REPO_INFO` 参数自动生成。
+ 例如,`openEuler-20.09.img`。默认为`openEuler-raspi-aarch64.img`,或者根据 `-n, --name IMAGE_NAME` 参数自动生成。
4. -s, --spec SPEC
@@ -152,6 +208,13 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
这里,提供两种构建方式。
+> **须知:**
+>当前支持 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`,其具体意义见该参数的介绍部分。
+
##### 主机上构建
构建镜像需执行命令:
@@ -164,7 +227,7 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
构建的镜像名称。
- 例如,`openEuler-20.03-LTS.img`。默认为`openEuler-aarch64-raspi.img`,或者根据 `-r, --repo REPO_INFO` 参数自动生成。
+ 例如,`openEuler-20.03-LTS.img`。默认为`openEuler-raspi-aarch64.img`,或者根据 `-n, --name IMAGE_NAME` 参数自动生成。
2. -k, --kernel KERNEL_URL
@@ -172,7 +235,7 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
3. -b, --branch KERNEL_BRANCH
- 内核源码的对应分支,默认为 `master`。
+ 内核源码的对应分支,默认为 `master`,推荐使用分支 `openEuler-20.03-LTS` 或 `openEuler-20.09`。
4. -c, --config KERNEL_DEFCONFIG
@@ -184,10 +247,54 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community
下面分别举例:
- 开发源 repo 文件的 URL:`https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo`
- - 开发源的 repo 文件路径:`./openEuler-20.03-LTS.repo`
-
- 该文件内容参考 `https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo`。
- - 资源库的 baseurl 列表:`"http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/source"`
+ - 开发源的 repo 文件路径:
+
+ - `./openEuler-20.03-LTS.repo`:生成 openEuler 20.03 LTS 版本的镜像,该文件内容参考 。
+ - `./openEuler-20.09.repo`:生成 openEuler 20.09 版本的镜像,该文件的内容如下:
+
+ ```
+ [OS]
+ name=OS
+ baseurl=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/RPM-GPG-KEY-openEuler
+
+ [everything]
+ name=everything
+ baseurl=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/RPM-GPG-KEY-openEuler
+
+ [EPOL]
+ name=EPOL
+ baseurl=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/RPM-GPG-KEY-openEuler
+
+ [debuginfo]
+ name=debuginfo
+ baseurl=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+
+ [source]
+ name=source
+ baseurl=http://repo.openeuler.org/openEuler-20.09/source/
+ enabled=1
+ gpgcheck=1
+ gpgkey=http://repo.openeuler.org/openEuler-20.09/source/RPM-GPG-KEY-openEuler
+
+ [Xfce]
+ name=Xfce
+ baseurl=https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/
+ enabled=1
+ gpgcheck=0
+ ```
+ - 资源库的 baseurl 列表:`"http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/aarch64/ http://repo.openeuler.org/openEuler-20.03-LTS/source"` 或 `"http://repo.openeuler.org/openEuler-20.09/everything/aarch64/ http://repo.openeuler.org/openEuler-20.09/EPOL/aarch64/ https://eulixos.com/repo/others/openeuler-raspberrypi/pkgs/"`
6. -s, --spec SPEC
diff --git a/documents/changelog/changelog-20.09-desktop.en.md b/documents/changelog/changelog-20.09-desktop.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..b67fa27bd31dbb8d5e7a9f3e18acf222b2d2412c
--- /dev/null
+++ b/documents/changelog/changelog-20.09-desktop.en.md
@@ -0,0 +1,15 @@
+## Feature Release Log of openEuler 20.09 Alpha Version (with Xfce desktop environment)
+
+English | [简体中文](./changelog-20.09-desktop.md)
+
+### 2020-10-27
+
+#### Basic information
+
+- Release date: 2020/10/27
+- Size: 875 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/)
\ No newline at end of file
diff --git a/documents/changelog/changelog-20.09-desktop.md b/documents/changelog/changelog-20.09-desktop.md
new file mode 100644
index 0000000000000000000000000000000000000000..47ebcb2f0e788b84b2a2b15685c9c829cdb558c0
--- /dev/null
+++ b/documents/changelog/changelog-20.09-desktop.md
@@ -0,0 +1,15 @@
+## Feature Release Log of openEuler 20.09 Alpha Version (with Xfce desktop environment)
+
+[English](./changelog-20.09-desktop.en.md) | 简体中文
+
+### 2020-10-27
+
+#### 基本信息
+
+- 发布时间:2020/10/27
+- 大小:875 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/)
\ No newline at end of file
diff --git a/documents/changelog-20.09.en.md b/documents/changelog/changelog-20.09-release.en.md
similarity index 46%
rename from documents/changelog-20.09.en.md
rename to documents/changelog/changelog-20.09-release.en.md
index d9c9f9fd1069dbce6c01e63cddef945c82b20f86..910226ed1aa1828913781c516b7ed63cc764ba9a 100644
--- a/documents/changelog-20.09.en.md
+++ b/documents/changelog/changelog-20.09-release.en.md
@@ -1,15 +1,15 @@
-## Feature Release Log
+## Feature Release Log of openEuler 20.09 Version
-English | [简体中文](./changelog-20.09.md)
+English | [简体中文](./changelog-20.09-release.md)
-### 2020-09-04
+### 2020-09-30
#### Basic information
-- Release date: 2020-09-04
-- Size: 237 MiB
+- Release date: 2020/09/30
+- Size: 259 MiB
- OS version: openEuler 20.09
-- Kernel version: 4.19.140-2008.3.0.0001
+- 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 built daily](http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/)
-- Repository inside the image: [openEuler 20.09 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo)
\ No newline at end of file
+- Repository of rootfs: [openEuler 20.09 源仓库](https://repo.openeuler.org/openEuler-20.09/)
+- Repository inside the image: [openEuler 20.09 repository](https://repo.openeuler.org/openEuler-20.09/)
\ No newline at end of file
diff --git a/documents/changelog/changelog-20.09-release.md b/documents/changelog/changelog-20.09-release.md
new file mode 100644
index 0000000000000000000000000000000000000000..6f14bf0e47757e3e195eeee0dcc328edb6615634
--- /dev/null
+++ b/documents/changelog/changelog-20.09-release.md
@@ -0,0 +1,15 @@
+## Feature Release Log of openEuler 20.09 Version
+
+[English](./changelog-20.09-release.en.md) | 简体中文
+
+### 2020-09-30
+
+#### 基本信息
+
+- 发布时间:2020/09/30
+- 大小:259 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/)
\ No newline at end of file
diff --git a/documents/changelog/changelog-20.09.en.md b/documents/changelog/changelog-20.09.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..76c4e3d7db6a70abec72e66b2f749d0bb1fd11c0
--- /dev/null
+++ b/documents/changelog/changelog-20.09.en.md
@@ -0,0 +1,33 @@
+## Feature Release Log of openEuler 20.09 Alpha Version
+
+English | [简体中文](./changelog-20.09.md)
+
+### 2020-10-27
+
+#### Basic information
+
+- Release date: 2020/10/27
+- Size: 238 MiB
+- OS version: openEuler 20.09
+- Kernel version: 4.19.140-2009.4.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 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-2009.4.0.
+
+### 2020-09-04
+
+#### Basic information
+
+- Release date: 2020/09/04
+- Size: 237 MiB
+- OS version: openEuler 20.09
+- Kernel version: 4.19.140-2008.3.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 built daily](http://119.3.219.20:82/openEuler:/Mainline/standard_aarch64/)
+- Repository inside the image: [openEuler 20.09 repository](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.09/generic.repo)
\ No newline at end of file
diff --git a/documents/changelog-20.09.md b/documents/changelog/changelog-20.09.md
similarity index 45%
rename from documents/changelog-20.09.md
rename to documents/changelog/changelog-20.09.md
index 1bb55c4d07d231ac42f0d345c569f3f04cded773..3e3ff6d6dd3ae63fde5e6692a013ec450a493a98 100644
--- a/documents/changelog-20.09.md
+++ b/documents/changelog/changelog-20.09.md
@@ -1,12 +1,30 @@
-## Feature Release Log
+## Feature Release Log of openEuler 20.09 Alpha Version
[English](./changelog-20.09.en.md) | 简体中文
+### 2020-10-27
+
+#### 基本信息
+
+- 发布时间:2020/10/27
+- 大小:238 MiB
+- 操作系统版本:openEuler 20.09
+- 内核版本:4.19.140-2009.4.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://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-2009.4.0。
+
### 2020-09-04
#### 基本信息
-- 发布时间:2020-09-04
+- 发布时间:2020/09/04
- 大小:237 MiB
- 操作系统版本:openEuler 20.09
- 内核版本:4.19.140-2008.3.0.0001
diff --git a/documents/changelog.en.md b/documents/changelog/changelog.en.md
similarity index 64%
rename from documents/changelog.en.md
rename to documents/changelog/changelog.en.md
index a2884bd5e08bc6ce40d9f5a5a5256079c252711b..f4bbd91026272b5e9ebbc9f4c4f90b12f9cb3b1a 100644
--- a/documents/changelog.en.md
+++ b/documents/changelog/changelog.en.md
@@ -1,17 +1,35 @@
-## Feature Release Log
+## Feature Release Log of openEuler 20.03 LTS Alpha Version
English | [简体中文](./changelog.md)
+### 2020-10-27
+
+#### Basic information
+
+- Release date: 2020/10/27
+- Size: 224 MiB
+- OS version: openEuler 20.03 LTS
+- Kernel version: 4.19.90-2009.3.0.0003
+- 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](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo)
+- 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-2009.3.0.
+
### 2020-08-10
#### Basic information
-- Release date: 2020-08-10
+- Release date: 2020/08/10
- Size: 259 MiB
- OS version: openEuler 20.03 LTS
- Kernel version: 4.19.90-2005.2.0.0002
- 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](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- Repository of rootfs: [openEuler 20.03 LTS repository](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### Updates
@@ -20,16 +38,16 @@ English | [简体中文](./changelog.md)
Update to the latest stable version of openeuler: 4.19.90-2005.2.0.
-### 2020-05-09
+### 2020-05-11
#### Basic information
-- Release date: 2020-05-11
+- Release date: 2020/05/11
- Size: 245 MiB
- OS version: openEuler 20.03 LTS
- Kernel version: 4.19.90-2003.4.0.0036
- 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](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- Repository of rootfs: [openEuler 20.03 LTS repository](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### Updates
@@ -42,12 +60,12 @@ Start related services of bluetooth and bind Bluetooth devices by default.
#### Basic information
-- Release date: 2020-04-27
+- Release date: 2020/04/27
- Size: 240 MiB
- OS version: openEuler 20.03 LTS
- Kernel version: 4.19.90-2003.4.0.0036
- 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](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- Repository of rootfs: [openEuler 20.03 LTS repository](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### Updates
@@ -72,10 +90,10 @@ Set CONFIG_SERIAL_DEV_CTRL_TTYPORT and CONFIG_BT_HCIUART_BCM as 'y' to compile s
#### Basic information
-- Release date: 2020-04-15
+- Release date: 2020/04/15
- Size: 241 MiB
- OS version: openEuler 20.03 LTS
- Kernel version: 4.19.90-2003.4.0.0036
- 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](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- Repository of rootfs: [openEuler 20.03 LTS repository](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- Repository inside the image: [openEuler 20.03 LTS repository](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
\ No newline at end of file
diff --git a/documents/changelog.md b/documents/changelog/changelog.md
similarity index 63%
rename from documents/changelog.md
rename to documents/changelog/changelog.md
index 6c2abd05a45b0269eabd91d67e5e1f9f71762f40..8f71cb8dd1f49fe08fdc2ee933b3b39b6998b629 100644
--- a/documents/changelog.md
+++ b/documents/changelog/changelog.md
@@ -1,17 +1,35 @@
-## Feature Release Log
+## Feature Release Log of openEuler 20.03 LTS Alpha Version
[English](./changelog.en.md) | 简体中文
+### 2020-10-27
+
+#### 基本信息
+
+- 发布时间:2020/10/27
+- 大小:224 MiB
+- 操作系统版本:openEuler 20.03 LTS
+- 内核版本:4.19.90-2009.3.0.0003
+- 固件来源:[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 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo)
+- 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/src-openeuler/openEuler-repos/blob/openEuler-20.03-LTS/generic.repo)
+
+#### 更新说明
+
+##### 内核
+
+更新到 openEuler 最新稳定版本 4.19.90-2009.3.0。
+
### 2020-08-10
#### 基本信息
-- 发布时间:2020-08-10
+- 发布时间:2020/08/10
- 大小:259 MiB
- 操作系统版本:openEuler 20.03 LTS
- 内核版本:4.19.90-2005.2.0.0002
- 固件来源:[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://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- 构建文件系统的源仓库:[openEuler 20.03 LTS 源仓库](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### 更新说明
@@ -20,16 +38,16 @@
更新到 openEuler 最新稳定版本 4.19.90-2005.2.0。
-### 2020-05-09
+### 2020-05-11
#### 基本信息
-- 发布时间:2020-05-11
+- 发布时间:2020/05/11
- 大小:245 MiB
- 操作系统版本:openEuler 20.03 LTS
- 内核版本:4.19.90-2003.4.0.0036
- 固件来源:[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://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- 构建文件系统的源仓库:[openEuler 20.03 LTS 源仓库](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### 更新说明
@@ -42,12 +60,12 @@
#### 基本信息
-- 发布时间:2020-04-27
+- 发布时间:2020/04/27
- 大小:240 MiB
- 操作系统版本:openEuler 20.03 LTS
- 内核版本:4.19.90-2003.4.0.0036
- 固件来源:[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://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- 构建文件系统的源仓库:[openEuler 20.03 LTS 源仓库](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
#### 更新说明
@@ -72,10 +90,10 @@
#### 基本信息
-- 发布时间:2020-04-15
+- 发布时间:2020/04/15
- 大小:241 MiB
- 操作系统版本:openEuler 20.03 LTS
- 内核版本:4.19.90-2003.4.0.0036
- 固件来源:[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://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
+- 构建文件系统的源仓库:[openEuler 20.03 LTS 源仓库](http://repo.openeuler.org/openEuler-20.03-LTS/everything/aarch64/)
- 镜像内置源仓库:[openEuler 20.03 LTS 源仓库](https://gitee.com/openeuler/raspberrypi/blob/master/scripts/config/openEuler-20.03-LTS.repo)
\ No newline at end of file
diff --git "a/documents/\346\240\221\350\216\223\346\264\276\344\275\277\347\224\250.md" "b/documents/\346\240\221\350\216\223\346\264\276\344\275\277\347\224\250.md"
index 7f56d0cb08c3ee88eae4de896c406115b56105bc..5a77072299670e24dd6da42581f8831b42d1893e 100644
--- "a/documents/\346\240\221\350\216\223\346\264\276\344\275\277\347\224\250.md"
+++ "b/documents/\346\240\221\350\216\223\346\264\276\344\275\277\347\224\250.md"
@@ -45,7 +45,9 @@
版本要求:树莓派 3B/3B+/4B。
-默认用户名:root,密码:openeuler。
+默认用户名:
+- root,密码:openeuler;
+- pi,密码:raspberry。
将刷写镜像后的 SD 卡插入树莓派,通电启用。
diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh
index ad69cbb36a9fb726b2a049a999a3838bec0e84c0..2f5252c5534654ee0ea4f744a71da11a6c45c52b 100644
--- a/scripts/build-image-common.sh
+++ b/scripts/build-image-common.sh
@@ -91,6 +91,32 @@ UMOUNT_ALL(){
set -e
}
+LOSETUP_D_IMG(){
+ set +e
+ if [ -d ${root_mnt} ]; then
+ if grep -q "${root_mnt} " /proc/mounts ; then
+ umount ${root_mnt}
+ fi
+ fi
+ if [ -d ${boot_mnt} ]; then
+ if grep -q "${boot_mnt} " /proc/mounts ; then
+ umount ${boot_mnt}
+ fi
+ fi
+ if [ "x$device" != "x" ]; then
+ kpartx -d ${device}
+ losetup -d ${device}
+ device=""
+ fi
+ if [ -d ${root_mnt} ]; then
+ rm -rf ${root_mnt}
+ fi
+ if [ -d ${boot_mnt} ]; then
+ rm -rf ${boot_mnt}
+ fi
+ set -e
+}
+
INSTALL_PACKAGES(){
for item in $(cat $1)
do
@@ -174,7 +200,7 @@ prepare(){
else
img_name=${OS_NAME}
fi
- img_name=${img_name}-aarch64-raspi-${buildid}.img
+ img_name=${img_name}-raspi-aarch64-${buildid}.img
else
if [ "x${img_name:0-4}" != "x.img" ]; then
img_name=${img_name}.img
@@ -187,7 +213,7 @@ prepare(){
fi
LOG "prepare begin..."
dnf makecache
- dnf install -y bison flex wget dnf-plugins-core tar parted dosfstools grep bash xz kpartx
+ dnf install -y bison flex openssl-devel bc wget dnf-plugins-core tar parted dosfstools grep bash xz kpartx
if [ ! -d ${run_dir}/img ]; then
mkdir ${run_dir}/img
@@ -483,7 +509,7 @@ make_rootfs(){
cp pi-bluetooth/debian/pi-bluetooth.hciuart.service ${rootfs_dir}/lib/systemd/system/hciuart.service
cp -r ${output_dir}/lib/modules ${rootfs_dir}/lib/
mkdir -p ${rootfs_dir}/usr/share/licenses/raspi
- cp -a ${euler_dir}/License/* ${rootfs_dir}/usr/share/licenses/raspi/
+ cp ${euler_dir}/License/* ${rootfs_dir}/usr/share/licenses/raspi/
cp ${euler_dir}/chroot.sh ${rootfs_dir}/chroot.sh
chmod +x ${rootfs_dir}/chroot.sh
mount --bind /dev ${rootfs_dir}/dev
@@ -498,6 +524,7 @@ make_rootfs(){
make_img(){
LOG "make ${img_file} begin..."
+ LOSETUP_D_IMG
cd "${run_dir}"
size=`du -sh --block-size=1MiB ${rootfs_dir} | cut -f 1 | xargs`
size=$(($size+1150))
@@ -509,6 +536,7 @@ make_img(){
parted ${img_file} mkpart primary ext4 1593344s 100%
device=`losetup -f --show -P ${img_file}`
LOG "after losetup: ${device}"
+ trap 'LOSETUP_D_IMG' EXIT
LOG "image ${img_file} created and mounted as ${device}"
# loopX=`kpartx -va ${device} | sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1`
# LOG "after kpartx: ${loopX}"
@@ -522,23 +550,7 @@ make_img(){
mkfs.vfat -n boot ${bootp}
mkswap ${swapp}
mkfs.ext4 ${rootp}
- set +e
- if [ -d ${root_mnt} ]; then
- df -lh | grep ${root_mnt}
- if [ $? -eq 0 ]; then
- umount ${root_mnt}
- fi
- rm -rf ${root_mnt}
- fi
- if [ -d ${boot_mnt} ]; then
- df -lh | grep ${boot_mnt}
- if [ $? -eq 0 ]; then
- umount ${boot_mnt}
- fi
- rm -rf ${boot_mnt}
- fi
- set -e
- mkdir ${root_mnt} ${boot_mnt}
+ mkdir -p ${root_mnt} ${boot_mnt}
mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt}
mount -t ext4 ${rootp} ${root_mnt}
fstab_array=("" "" "" "")
@@ -582,12 +594,7 @@ make_img(){
cd "${run_dir}"
sync
sleep 10
- umount ${root_mnt}
- umount ${boot_mnt}
-
- kpartx -d ${device}
- losetup -d ${device}
-
+ LOSETUP_D_IMG
rm ${run_dir}/rootfs.tar
if [ -f ${img_file} ]; then
md5sum ${img_file} > ${img_file}.md5sum
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index c4d2714887505e89a3f4bd8bbaa2598739c9eac0..aca250e1ee2dfa4e69fa4738dedbfa90c769dd3e 100644
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -77,6 +77,32 @@ UMOUNT_ALL(){
set -e
}
+LOSETUP_D_IMG(){
+ set +e
+ if [ -d ${root_mnt} ]; then
+ if grep -q "${root_mnt} " /proc/mounts ; then
+ umount ${root_mnt}
+ fi
+ fi
+ if [ -d ${boot_mnt} ]; then
+ if grep -q "${boot_mnt} " /proc/mounts ; then
+ umount ${boot_mnt}
+ fi
+ fi
+ if [ "x$device" != "x" ]; then
+ kpartx -d ${device}
+ losetup -d ${device}
+ device=""
+ fi
+ if [ -d ${root_mnt} ]; then
+ rm -rf ${root_mnt}
+ fi
+ if [ -d ${boot_mnt} ]; then
+ rm -rf ${boot_mnt}
+ fi
+ set -e
+}
+
INSTALL_PACKAGES(){
for item in $(cat $1)
do
@@ -147,7 +173,7 @@ prepare(){
else
img_name=${OS_NAME}
fi
- img_name=${img_name}-aarch64-raspi.img
+ img_name=${img_name}-raspi-aarch64.img
else
if [ "x${img_name:0-4}" != "x.img" ]; then
img_name=${img_name}.img
@@ -241,7 +267,11 @@ make_rootfs(){
fi
cp ${euler_dir}/ifup-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifup-eth0
mkdir -p ${rootfs_dir}/usr/bin ${rootfs_dir}/lib/udev/rules.d ${rootfs_dir}/lib/systemd/system
+ if [ -d ${rootfs_dir}/usr/share/licenses/raspi ]; then
+ mkdir -p ${rootfs_dir}/usr/share/licenses/raspi
+ fi
cp ${euler_dir}/*.rules ${rootfs_dir}/lib/udev/rules.d/
+ cp ${euler_dir}/LICENCE.* ${rootfs_dir}/usr/share/licenses/raspi/
cp ${euler_dir}/chroot.sh ${rootfs_dir}/chroot.sh
chmod +x ${rootfs_dir}/chroot.sh
mount --bind /dev ${rootfs_dir}/dev
@@ -256,6 +286,7 @@ make_rootfs(){
make_img(){
LOG "make ${img_file} begin..."
+ LOSETUP_D_IMG
size=`du -sh --block-size=1MiB ${rootfs_dir} | cut -f 1 | xargs`
size=$(($size+1100))
losetup -D
@@ -266,6 +297,7 @@ make_img(){
parted ${img_file} mkpart primary ext4 1593344s 100%
device=`losetup -f --show -P ${img_file}`
LOG "after losetup: ${device}"
+ trap 'LOSETUP_D_IMG' EXIT
LOG "image ${img_file} created and mounted as ${device}"
# loopX=`kpartx -va ${device} | sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1`
# LOG "after kpartx: ${loopX}"
@@ -279,22 +311,6 @@ make_img(){
mkfs.vfat -n boot ${bootp}
mkswap ${swapp}
mkfs.ext4 ${rootp}
- set +e
- if [ -d ${root_mnt} ]; then
- df -lh | grep ${root_mnt}
- if [ $? -eq 0 ]; then
- umount ${root_mnt}
- fi
- rm -rf ${root_mnt}
- fi
- if [ -d ${boot_mnt} ]; then
- df -lh | grep ${boot_mnt}
- if [ $? -eq 0 ]; then
- umount ${boot_mnt}
- fi
- rm -rf ${boot_mnt}
- fi
- set -e
mkdir -p ${root_mnt} ${boot_mnt}
mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt}
mount -t ext4 ${rootp} ${root_mnt}
@@ -327,12 +343,7 @@ make_img(){
popd
sync
sleep 10
- umount ${root_mnt}
- umount ${boot_mnt}
-
- kpartx -d ${device}
- losetup -d ${device}
-
+ LOSETUP_D_IMG
rm ${tmp_dir}/rootfs.tar
rm -rf ${rootfs_dir}
losetup -D
diff --git a/scripts/config-common/License/LICENCE.raspberrypi-sys-mods b/scripts/config-common/License/LICENCE.raspberrypi-sys-mods
new file mode 120000
index 0000000000000000000000000000000000000000..9b6f247b5ce061607e0538d20556ee0d563313f4
--- /dev/null
+++ b/scripts/config-common/License/LICENCE.raspberrypi-sys-mods
@@ -0,0 +1 @@
+../../config/LICENCE.raspberrypi-sys-mods
\ No newline at end of file