From 8592b539bd1ad80eb4c1848deecfb8cb86e8152a Mon Sep 17 00:00:00 2001 From: yafen Date: Tue, 12 Jan 2021 12:10:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20ifup-eth0=20to=20ifcfg-eth0,=20rsy?= =?UTF-8?q?nc=20rootfs=20instead=20tar,=20=E8=A1=A5=E5=85=85=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=9D=99=E6=80=81IP=E5=92=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=9E=E6=8E=A5wifi=E6=96=87=E6=A1=A3?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=86=85=E6=B5=8B=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 36 ++++---- README.md | 36 ++++---- .../changelog-20.03-LTS-SP1-DDE.en.md | 19 ++++ .../changelog/changelog-20.03-LTS-SP1-DDE.md | 19 ++++ .../changelog-20.03-LTS-SP1-UKUI.en.md | 19 ++++ .../changelog/changelog-20.03-LTS-SP1-UKUI.md | 19 ++++ .../changelog/changelog-20.03-LTS-SP1.en.md | 19 ++++ .../changelog/changelog-20.03-LTS-SP1.md | 19 ++++ documents/changelog/changelog-20.03-LTS.en.md | 23 +++++ documents/changelog/changelog-20.03-LTS.md | 23 +++++ .../changelog/changelog-20.09-Xfce.en.md | 19 ++++ documents/changelog/changelog-20.09-Xfce.md | 19 ++++ documents/changelog/changelog-20.09.en.md | 23 +++++ documents/changelog/changelog-20.09.md | 23 +++++ ...17\347\232\204\346\236\204\345\273\272.md" | 10 +- ...23\346\264\276\344\275\277\347\224\250.md" | 91 +++++++++++++++++-- scripts/build-image-common.sh | 15 +-- scripts/build-image.sh | 17 +--- scripts/config-common/Dockerfile_makeraspi | 2 +- scripts/config-common/ifcfg-eth0 | 1 + scripts/config-common/ifup-eth0 | 1 - scripts/config/{ifup-eth0 => ifcfg-eth0} | 0 22 files changed, 377 insertions(+), 76 deletions(-) create mode 120000 scripts/config-common/ifcfg-eth0 delete mode 120000 scripts/config-common/ifup-eth0 rename scripts/config/{ifup-eth0 => ifcfg-eth0} (100%) diff --git a/README.en.md b/README.en.md index 40ce8a0..97074db 100644 --- a/README.en.md +++ b/README.en.md @@ -54,29 +54,29 @@ Basic information of the image is as follows:

Repository of rootfs

-openEuler 20.03 LTS alpha4 +openEuler 20.03 LTS alpha5 ChangeLog -

2021/01/06

-

217 MiB

-

4.19.90-2012.5.0

+

2021/01/19

+

212 MiB

+

4.19.90-2101.1.0

openEuler 20.03 LTS repository built daily -openEuler 20.09 alpha4 +openEuler 20.09 alpha5 ChangeLog -

2021/01/06

-

243 MiB

-

4.19.140-2012.2.0.0006

+

2021/01/19

+

236 MiB

+

4.19.140-2101.1.0.0007

openEuler 20.09 repository built daily -openEuler 20.09 alpha5 (with Xfce desktop environment) +openEuler 20.09 alpha6 (with Xfce desktop environment) ChangeLog -

2021/01/06

-

922 MiB

+

2021/01/19

+

903 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 repository @@ -90,28 +90,28 @@ Basic information of the image is as follows: openEuler 20.09 repository -openEuler 20.03 LTS SP1 alpha2 +openEuler 20.03 LTS SP1 alpha3 ChangeLog -

2021/01/06

-

239 MiB

+

2021/01/19

+

234 MiB

4.19.90-2012.5.0.0013

openEuler 20.03 LTS SP1 repository built daily -openEuler 20.03 LTS SP1 alpha2 (with UKUI desktop environment) +openEuler 20.03 LTS SP1 alpha3 (with UKUI desktop environment) ChangeLog -

2021/01/06

+

2021/01/19

1.0 GiB

4.19.90-2012.5.0.0013

openEuler 20.03 LTS SP1 repository built daily -openEuler 20.03 LTS SP1 alpha2 (with DDE desktop environment) +openEuler 20.03 LTS SP1 alpha3 (with DDE desktop environment) ChangeLog -

2021/01/06

+

2021/01/19

1.0 GiB

4.19.90-2012.5.0.0013

openEuler 20.03 LTS SP1 repository built daily diff --git a/README.md b/README.md index 6aa615f..f2078a9 100644 --- a/README.md +++ b/README.md @@ -53,29 +53,29 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community

构建文件系统的源仓库

-openEuler 20.03 LTS 内测版 +openEuler 20.03 LTS 内测版 更新日志 -

2021/01/06

-

217 MiB

-

4.19.90-2012.5.0

+

2021/01/19

+

212 MiB

+

4.19.90-2101.1.0

openEuler 20.03 LTS 每日构建的源仓库 -openEuler 20.09 内测版 +openEuler 20.09 内测版 更新日志 -

2021/01/06

-

243 MiB

-

4.19.140-2012.2.0.0006

+

2021/01/19

+

236 MiB

+

4.19.140-2101.1.0.0007

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

2021/01/06

-

922 MiB

+

2021/01/19

+

903 MiB

4.19.138-2008.1.0.0001

openEuler 20.09 源仓库 @@ -89,28 +89,28 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community openEuler 20.09 源仓库 -openEuler 20.03 LTS SP1 内测版 +openEuler 20.03 LTS SP1 内测版 更新日志 -

2021/01/06

-

239 MiB

+

2021/01/19

+

234 MiB

4.19.90-2012.5.0.0013

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

2021/01/06

+

2021/01/19

1.0 GiB

4.19.90-2012.5.0.0013

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

2021/01/06

+

2021/01/19

1.0 GiB

4.19.90-2012.5.0.0013

openEuler 20.03 LTS SP1 每日构建源仓库 diff --git a/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md b/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md index 1905ac8..4ba1b72 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md +++ b/documents/changelog/changelog-20.03-LTS-SP1-DDE.en.md @@ -2,6 +2,25 @@ English | [简体中文](./changelog-20.03-LTS-SP1-DDE.md) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 1.0 GiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.5.0.0013 +- 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) + +#### Updates + +##### Feature update + +- Install openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.03-LTS-SP1-DDE.md b/documents/changelog/changelog-20.03-LTS-SP1-DDE.md index 55218d8..2bc6363 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1-DDE.md +++ b/documents/changelog/changelog-20.03-LTS-SP1-DDE.md @@ -2,6 +2,25 @@ [English](./changelog-20.03-LTS-SP1-DDE.en.md) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：1.0 GiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.5.0.0013 +- 固件来源：[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) + +#### 更新说明 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：缺失文件扩展属性。 + ### 2021-01-06 #### 基本信息 diff --git a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md index 0f6a416..24d6e85 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md +++ b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.en.md @@ -2,6 +2,25 @@ English | [简体中文](./changelog-20.03-LTS-SP1-UKUI.md) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 1.0 GiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.5.0.0013 +- 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) + +#### Updates + +##### Feature update + +- Install openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md index 42298cc..a5d34a2 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md +++ b/documents/changelog/changelog-20.03-LTS-SP1-UKUI.md @@ -2,6 +2,25 @@ [English](./changelog-20.03-LTS-SP1-UKUI.en.md) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：1.0 GiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.5.0.0013 +- 固件来源：[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) + +#### 更新说明 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：缺失文件扩展属性。 + ### 2021-01-06 #### 基本信息 diff --git a/documents/changelog/changelog-20.03-LTS-SP1.en.md b/documents/changelog/changelog-20.03-LTS-SP1.en.md index 0588c64..27cf522 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1.en.md +++ b/documents/changelog/changelog-20.03-LTS-SP1.en.md @@ -2,6 +2,25 @@ English | [简体中文](./changelog-20.03-LTS-SP1.md) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 234 MiB +- OS version: openEuler 20.03 LTS SP1 +- Kernel version: 4.19.90-2012.5.0.0013 +- 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) + +#### Updates + +##### Feature update + +- Install openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.03-LTS-SP1.md b/documents/changelog/changelog-20.03-LTS-SP1.md index 343c73c..c1351f3 100644 --- a/documents/changelog/changelog-20.03-LTS-SP1.md +++ b/documents/changelog/changelog-20.03-LTS-SP1.md @@ -2,6 +2,25 @@ [English](./changelog-20.03-LTS-SP1.en.md) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：234 MiB +- 操作系统版本：openEuler 20.03 LTS SP1 +- 内核版本：4.19.90-2012.5.0.0013 +- 固件来源：[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) + +#### 更新说明 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：缺失文件扩展属性。 + ### 2021-01-06 #### 基本信息 diff --git a/documents/changelog/changelog-20.03-LTS.en.md b/documents/changelog/changelog-20.03-LTS.en.md index 60e37b9..010d426 100644 --- a/documents/changelog/changelog-20.03-LTS.en.md +++ b/documents/changelog/changelog-20.03-LTS.en.md @@ -2,6 +2,29 @@ English | [简体中文](./changelog-20.03-LTS.md) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 212 MiB +- OS version: openEuler 20.03 LTS +- Kernel version: 4.19.90-2101.1.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-2101.1.0. + +##### Feature update + +- Install openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.03-LTS.md b/documents/changelog/changelog-20.03-LTS.md index ee6ca47..4d0c86c 100644 --- a/documents/changelog/changelog-20.03-LTS.md +++ b/documents/changelog/changelog-20.03-LTS.md @@ -2,6 +2,29 @@ [English](./changelog-20.03-LTS.en.md) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：212 MiB +- 操作系统版本：openEuler 20.03 LTS +- 内核版本：4.19.90-2101.1.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-2101.1.0。 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：缺失文件扩展属性。 + ### 2021-01-06 #### 基本信息 diff --git a/documents/changelog/changelog-20.09-Xfce.en.md b/documents/changelog/changelog-20.09-Xfce.en.md index 357c326..0c65ce6 100644 --- a/documents/changelog/changelog-20.09-Xfce.en.md +++ b/documents/changelog/changelog-20.09-Xfce.en.md @@ -2,6 +2,25 @@ English | [简体中文](./changelog-20.09-Xfce.md) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 903 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 openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.09-Xfce.md b/documents/changelog/changelog-20.09-Xfce.md index 056fadf..0625af4 100644 --- a/documents/changelog/changelog-20.09-Xfce.md +++ b/documents/changelog/changelog-20.09-Xfce.md @@ -2,6 +2,25 @@ [English](./changelog-20.09-Xfce.en.md) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：903 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/) + +#### 更新说明 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：文件扩展属性缺失。 + ### 2021-01-06 #### 基本信息 diff --git a/documents/changelog/changelog-20.09.en.md b/documents/changelog/changelog-20.09.en.md index 6e6205d..08d0492 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) +### 2021-01-19 + +#### Basic information + +- Release date: 2021/01/19 +- Size: 236 MiB +- OS version: openEuler 20.09 +- Kernel version: 4.19.140-2101.1.0.0007 +- 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-2101.1.0. + +##### Feature update + +- Install openssh-clients. +- Fixed: missing files' extended attributes. + ### 2021-01-06 #### Basic information diff --git a/documents/changelog/changelog-20.09.md b/documents/changelog/changelog-20.09.md index 2b531f5..26cdabf 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) | 简体中文 +### 2021-01-19 + +#### 基本信息 + +- 发布时间：2021/01/19 +- 大小：236 MiB +- 操作系统版本：openEuler 20.09 +- 内核版本：4.19.140-2101.1.0.0007 +- 固件来源：[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-2101.1.0。 + +##### 功能改动 + +- 安装 openssh-clients。 +- 修复：缺失文件扩展属性。 + ### 2021-01-06 #### 基本信息 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 80d82a0..f191c7a 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" @@ -264,7 +264,7 @@ etc/ usr/ var/ `mkdir ${WORKDIR}/rootfs/etc/sysconfig/network-scripts` - `vim ${WORKDIR}/rootfs/etc/sysconfig/network-scripts/ifup-eth0` + `vim ${WORKDIR}/rootfs/etc/sysconfig/network-scripts/ifcfg-eth0` 内容： ``` @@ -448,13 +448,7 @@ UUID=a451bee4-4384-48a2-8d5a-d09c2dd9a1a swap swap defaults,noatime 0 0 ## rootfs 拷贝到镜像 -`cd ${WORKDIR}/rootfs/` - -`tar cpf ${WORKDIR}/rootfs.tar .` - -`cd ${WORKDIR}/root` - -`tar xpf ${WORKDIR}/rootfs.tar -C .` +`rsync -avHAXq ${WORKDIR}/rootfs/* ${WORKDIR}/root` ## boot 引导拷贝到镜像 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 5a77072..2d1fb2e 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" @@ -59,15 +59,52 @@ 2. ssh 远程登录 - 树莓派默认采用 DHCP 的方式自动获取 IP。如果树莓派连接已知路由器，可登录路由器查看，新增的 IP 即为树莓派 IP。 + 1. DHCP 自动获取 IP - ![](images/获取IP.png) + 树莓派默认采用 DHCP 的方式自动获取 IP。如果树莓派连接已知路由器，可登录路由器查看，新增的 IP 即为树莓派 IP。 - 从上图看到，树莓派对应 IP 为：192.168.31.109，使用命令 `ssh root@192.168.1.109` 后输入密码 `openeuler`，即可远程登录树莓派。 + ![](images/获取IP.png) - 如下图，登录成功后，树莓派即显示本机相关信息，包括本机 IP。 + 从上图看到，树莓派对应 IP 为：192.168.31.109，使用命令 `ssh root@192.168.31.109` 后输入密码 `openeuler`，即可远程登录树莓派。 - ![](images/登录树莓派.png) + 如下图，登录成功后，树莓派即显示本机相关信息，包括本机 IP。 + + ![](images/登录树莓派.png) + + 2. 设置固定 IP + + 1. 将树莓派的 SD 卡借助读卡器插到装有 Linux 操作系统的个人电脑，电脑中会读到两个分区：boot 分区和根目录分区。根目录分区挂载路径记为 ``。 + 2. 修改 `` 目录下的文件 `etc/sysconfig/network-scripts/ifcfg-eth0`，主要修改内容有： + - `BOOTPROTO` 设置为 `static`； + - 添加 `IPADDR`、`NETMASK`、`GATEWAY` 等字段。 + + 例如，我们设置树莓派 IP 为 192.168.31.109，同时根据实际情况设置其子网掩码和网关。最终，`/etc/sysconfig/network-scripts/ifcfg-eth0` 的内容如下： + + ``` + TYPE=Ethernet + PROXY_METHOD=none + BROWSER_ONLY=no + BOOTPROTO=static + DEFROUTE=yes + IPV4_FAILURE_FATAL=no + IPV6INIT=yes + IPV6_AUTOCONF=yes + IPV6_DEFROUTE=yes + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=eth0 + UUID=851a6f36-e65c-3a43-8f4a-78fd0fc09dc9 + ONBOOT=yes + AUTOCONNECT_PRIORITY=-999 + DEVICE=eth0 + IPADDR=192.168.31.109 + NETMASK=255.255.255.0 + GATEWAY=192.168.31.1 + ``` + + 3. 在电脑中选择 SD 卡挂载的任一盘符，右键选择 `弹出上级驱动器`，待提示 `驱动器已成功弹出` 后拔出读卡器。 + 4. 将 SD 卡插入树莓派，并通电启动。 + 5. 树莓派启动成功后，使用命令 `ssh root@192.168.31.109` 后输入密码 `openeuler`，即可远程登录树莓派。 # 根目录分区扩展 @@ -181,7 +218,7 @@ Device Boot Start End Sectors Size Id Type ## 连接 wifi -这里我们介绍连接 wifi 的两种方式：nmcli 命令行和 nmtui 字符界面。 +这里我们介绍连接 wifi 的三种方式：nmcli 命令行、nmtui 字符界面、编辑配置文件。 1. nmcli 命令行 @@ -221,6 +258,48 @@ Device Boot Start End Sectors Size Id Type 7. 查看添加的 wifi 连接是否已激活（已激活的连接名称前有 `*` 标记）。如果未激活，选择该 wifi 连接，然后按下键盘右方向键选择 `Activate`，按 `Enter` 激活该连接。待激活完成后，选择 `Back`，按 `Enter` 退出该激活界面，回退到最初的 nmtui 字符界面。 8. 选择 `Quit`，然后按下键盘右方向键选择 `OK`，按 `Enter` 退出 nmtui 字符界面。 +3. 编辑配置文件 + + 1. 添加配置文件 /etc/sysconfig/network-scripts/ifcfg-`SSID`。例如，文件内容如下： + ``` + ESSID=SSID + MODE=Managed + KEY_MGMT=WPA-PSK + SECURITYMODE=open + MAC_ADDRESS_RANDOMIZATION=default + TYPE=Wireless + PROXY_METHOD=none + BROWSER_ONLY=no + BOOTPROTO=dhcp + DEFROUTE=yes + IPV4_FAILURE_FATAL=no + IPV6INIT=yes + IPV6_AUTOCONF=yes + IPV6_DEFROUTE=yes + IPV6_FAILURE_FATAL=no + IPV6_ADDR_GEN_MODE=stable-privacy + NAME=SSID + UUID=66d533cf-525d-46af-a17f-000465660b75 + DEVICE=wlan0 + ONBOOT=yes + ``` + + >![](public_sys-resources/icon-notice.gif) **须知：** + >- 上述 `SSID` 为之前扫描到的可供连接的 wifi 的 SSID。如果 SSID 中包含特殊字符，需将该文件中的 SSID 使用单引号括起来。 + >- 该 WiFi 连接为自动分配 IP，如需要设置静态 IP，请参考 `启用树莓派` 章节 `ssh 远程登录` 中 `设置固定 IP` 的方法。 + + 2. 添加配置文件 /etc/sysconfig/network-scripts/keys-`SSID`。例如，文件内容如下： + + ``` + WPA_PSK=PWD + ``` + + >![](public_sys-resources/icon-notice.gif) **须知：** + >- 上述 `SSID` 为之前扫描到的可供连接的 wifi 的 SSID。 + >- 上述 `PWD` 为对应 wifi 的密码。如果密码中包含特殊字符，需将密码使用单引号括起来。 + + 3. 执行命令 `systemctl restart NetworkManager` 重启 NetworkManager 服务，或者执行命令 `reboot` 重启树莓派。 + ## 查看 IP 和无线网卡信息 `ip a` diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh index 818d8b6..7cbc5e2 100644 --- a/scripts/build-image-common.sh +++ b/scripts/build-image-common.sh @@ -216,7 +216,7 @@ prepare(){ LOG "prepare begin..." dnf clean all dnf makecache - dnf install -y bison flex openssl-devel bc wget dnf-plugins-core tar parted dosfstools grep bash xz kpartx + dnf install -y bison flex openssl-devel bc wget dnf-plugins-core rsync parted dosfstools grep bash xz kpartx repo_info_names=`cat ${repo_file} | grep "^\["` repo_baseurls=`cat ${repo_file} | grep "^baseurl="` @@ -469,7 +469,7 @@ make_rootfs(){ if [ ! -d $rootfs_dir/etc/sysconfig/network-scripts ]; then mkdir -p $rootfs_dir/etc/sysconfig/network-scripts fi - cp ${euler_dir}/ifup-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifup-eth0 + cp ${euler_dir}/ifcfg-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifcfg-eth0 mkdir -p ${rootfs_dir}/lib/firmware ${rootfs_dir}/usr/bin ${rootfs_dir}/lib/udev/rules.d ${rootfs_dir}/lib/systemd/system cp ${workdir}/bluez-firmware/broadcom/* ${rootfs_dir}/lib/firmware/ cp -r ${workdir}/firmware-nonfree/brcm/ ${rootfs_dir}/lib/firmware/ @@ -549,15 +549,9 @@ make_img(){ cp --preserve=mode,timestamps --no-preserve=ownership ${output_dir}/*.dtb ${boot_mnt}/ cp --preserve=mode,timestamps --no-preserve=ownership ${output_dir}/overlays/* ${boot_mnt}/overlays/ - if [ -f ${tmp_dir}/rootfs.tar ]; then - rm ${tmp_dir}/rootfs.tar - fi - pushd ${rootfs_dir} - rm -rf boot - tar cpf ${tmp_dir}/rootfs.tar . - popd + rm -rf ${rootfs_dir}/boot + rsync -avHAXq ${rootfs_dir}/* ${root_mnt} pushd ${root_mnt} - tar xpf ${tmp_dir}/rootfs.tar -C . for tmpdir in `ls ${output_dir}/lib/modules` do if [ -d ./lib/modules/${tmpdir} ]; then @@ -573,7 +567,6 @@ make_img(){ sync sleep 10 LOSETUP_D_IMG - rm ${tmp_dir}/rootfs.tar rm -rf ${rootfs_dir} losetup -D pushd ${img_dir} diff --git a/scripts/build-image.sh b/scripts/build-image.sh index 1447099..8a4f19c 100644 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -189,7 +189,7 @@ prepare(){ LOG "prepare begin..." dnf clean all dnf makecache - dnf install -y dnf-plugins-core tar parted dosfstools grep bash xz kpartx + dnf install -y dnf-plugins-core rsync parted dosfstools grep bash xz kpartx if [ -d ${rootfs_dir} ]; then rm -rf ${rootfs_dir} @@ -257,7 +257,7 @@ make_rootfs(){ if [ ! -d $rootfs_dir/etc/sysconfig/network-scripts ]; then mkdir -p $rootfs_dir/etc/sysconfig/network-scripts fi - cp ${euler_dir}/ifup-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifup-eth0 + cp ${euler_dir}/ifcfg-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifcfg-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 @@ -326,20 +326,11 @@ make_img(){ cp ${euler_dir}/config.txt ${boot_mnt}/ echo "console=serial0,115200 console=tty1 root=/dev/mmcblk0p3 rootfstype=ext4 elevator=deadline rootwait" > ${boot_mnt}/cmdline.txt - if [ -f ${tmp_dir}/rootfs.tar ]; then - rm ${tmp_dir}/rootfs.tar - fi - pushd ${rootfs_dir} - rm -rf boot - tar cpf ${tmp_dir}/rootfs.tar . - popd - pushd ${root_mnt} - tar xpf ${tmp_dir}/rootfs.tar -C . - popd + rm -rf ${rootfs_dir}/boot + rsync -avHAXq ${rootfs_dir}/* ${root_mnt} sync sleep 10 LOSETUP_D_IMG - rm ${tmp_dir}/rootfs.tar rm -rf ${rootfs_dir} losetup -D pushd ${img_dir} diff --git a/scripts/config-common/Dockerfile_makeraspi b/scripts/config-common/Dockerfile_makeraspi index 52c7316..cfa8efb 100644 --- a/scripts/config-common/Dockerfile_makeraspi +++ b/scripts/config-common/Dockerfile_makeraspi @@ -6,7 +6,7 @@ RUN dnf -y install cmake gdb gcc gcc-c++ libstdc++-static ncurses ncurses-devel dnf -y clean all RUN dnf -y install module-init-tools git openssl-devel bc bison flex dnf-plugins-core dosfstools parted wget device-mapper-multipath grep xz kpartx -RUN dnf -y install tar passwd diffutils +RUN dnf -y install rsync passwd diffutils ENV SHELL=/bin/bash ENTRYPOINT ["/bin/bash", "/work/build-image-common.sh"] diff --git a/scripts/config-common/ifcfg-eth0 b/scripts/config-common/ifcfg-eth0 new file mode 120000 index 0000000..4f62bee --- /dev/null +++ b/scripts/config-common/ifcfg-eth0 @@ -0,0 +1 @@ +../config/ifcfg-eth0 \ No newline at end of file diff --git a/scripts/config-common/ifup-eth0 b/scripts/config-common/ifup-eth0 deleted file mode 120000 index 494c56c..0000000 --- a/scripts/config-common/ifup-eth0 +++ /dev/null @@ -1 +0,0 @@ -../config/ifup-eth0 \ No newline at end of file diff --git a/scripts/config/ifup-eth0 b/scripts/config/ifcfg-eth0 similarity index 100% rename from scripts/config/ifup-eth0 rename to scripts/config/ifcfg-eth0 -- Gitee From 0d7439ff0efcb82c397845eb5f68693560735ff8 Mon Sep 17 00:00:00 2001 From: yafen Date: Sat, 23 Jan 2021 18:35:59 +0800 Subject: [PATCH 2/2] fix: can not find bluetooth device --- scripts/config/chroot.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/config/chroot.sh b/scripts/config/chroot.sh index e3cdd63..eb01b35 100755 --- a/scripts/config/chroot.sh +++ b/scripts/config/chroot.sh @@ -29,4 +29,5 @@ cd /etc/rc.d/init.d chmod +x extend-root.sh chkconfig --add extend-root.sh chkconfig extend-root.sh on -cd - \ No newline at end of file +cd - +ln -s /lib/firmware /etc/firmware \ No newline at end of file -- Gitee