From 35de2259f216dd4f2151d165dc41a0bf437f61be Mon Sep 17 00:00:00 2001 From: yafen Date: Wed, 1 Sep 2021 18:40:15 +0800 Subject: [PATCH] set default branch:openEuler-20.03-LTS when build kernel --- README.en.md | 2 +- README.md | 2 +- ...17\347\232\204\346\236\204\345\273\272.md" | 28 +++++++++++-------- ...26\350\257\221\345\206\205\346\240\270.md" | 28 +++++++++++-------- scripts/build-image-common.sh | 4 +-- scripts/build-image-docker.sh | 2 +- 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/README.en.md b/README.en.md index 3d0f8b9..22e133b 100644 --- a/README.en.md +++ b/README.en.md @@ -276,7 +276,7 @@ The meaning of each parameter: 3. -b, --branch KERNEL_BRANCH - The branch name of kernel source repository, which defaults to `master`. `openEuler-20.03-LTS` or `openEuler-20.09` is recommended. + The branch name of kernel source repository, which defaults to `openEuler-20.03-LTS`. `openEuler-21.09`, `openEuler-20.03-LTS` or `openEuler-20.09` is recommended. 4. -c, --config KERNEL_DEFCONFIG diff --git a/README.md b/README.md index 09c9cc6..3a2545a 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/openeuler/communit 3. -b, --branch KERNEL_BRANCH - 内核源码的对应分支，默认为 `master`，推荐使用分支 `openEuler-20.03-LTS` 或 `openEuler-20.09`。 + 内核源码的对应分支，默认为 `openEuler-20.03-LTS`，推荐使用分支 `openEuler-21.09`、`openEuler-20.03-LTS` 或 `openEuler-20.09`。 4. -c, --config KERNEL_DEFCONFIG 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 a203cfb..08f8e1b 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" @@ -88,27 +88,33 @@ ### 下载源码 -`git clone git@gitee.com:openeuler/raspberrypi-kernel.git` +根据内核不同版本，需要下载不同仓库的不同分支： -得到文件 ${WORKDIR}/raspberrypi-kernel。 +1. 5.10 内核 -### 进入内核目录 + - openEuler 21.09：`git clone git@gitee.com:openeuler/raspberrypi-kernel.git -b openEuler-21.09 && cd raspberrypi-kernel` + - openEuler 21.03：`git clone git@gitee.com:openeuler/kernel.git -b openEuler-21.03 && cd kernel` -`cd ${WORKDIR}/raspberrypi-kernel` +2. 4.19 内核 -### 切换分支 - -这里适用于树莓派的内核源码的分支有 openEuler-20.03-LTS 和 openEuler-20.09，分别对应不同的内核版本。根据需要选择对应分支，下载源码后默认为 master 分支，如果需要选择 openEuler-20.03-LTS 分支，执行下面的命令： - -`git checkout -b openEuler-20.03-LTS origin/openEuler-20.03-LTS` + - openEuler 20.03 LTS：`git clone git@gitee.com:openeuler/raspberrypi-kernel.git -b openEuler-20.03-LTS && cd raspberrypi-kernel` 下面编译时可能还需要 bison、flex、build-essential 等，根据提示安装即可。 ### 载入默认配置 -`make ARCH=arm64 openeuler-raspi_defconfig` +根据内核不同版本，需要载入不同的默认配置： + +1. 5.10 内核 + + - openEuler 21.09：`make bcm2711_defconfig` + - openEuler 21.03：`make bcm2711_defconfig` + +2. 4.19 内核 + + - openEuler 20.03 LTS：`make openeuler-raspi_defconfig` -其中 openeuler-raspi_defconfig 在 ../linux/arch/arm64/configs 下。 +对应的 defconfig 文件在 ../linux/arch/arm64/configs 下。 ### 编译 diff --git "a/documents/\344\272\244\345\217\211\347\274\226\350\257\221\345\206\205\346\240\270.md" "b/documents/\344\272\244\345\217\211\347\274\226\350\257\221\345\206\205\346\240\270.md" index cf25c0a..7b8d2c8 100644 --- "a/documents/\344\272\244\345\217\211\347\274\226\350\257\221\345\206\205\346\240\270.md" +++ "b/documents/\344\272\244\345\217\211\347\274\226\350\257\221\345\206\205\346\240\270.md" @@ -44,19 +44,16 @@ ## 下载内核源码 -`git clone git@gitee.com:openeuler/raspberrypi-kernel.git` +根据内核不同版本，需要下载不同仓库的不同分支： -得到文件 ${WORKDIR}/raspberrypi-kernel。 +1. 5.10 内核 -## 进入内核源码 + - openEuler 21.09：`git clone git@gitee.com:openeuler/raspberrypi-kernel.git -b openEuler-21.09 && cd raspberrypi-kernel` + - openEuler 21.03：`git clone git@gitee.com:openeuler/kernel.git -b openEuler-21.03 && cd kernel` -`cd ${WORKDIR}/raspberrypi-kernel` +2. 4.19 内核 -## 切换分支 - -这里适用于树莓派的内核源码的分支有 openEuler-20.03-LTS 和 openEuler-20.09，分别对应不同的内核版本。根据需要选择对应分支，下载源码后默认为 master 分支，如果需要选择 openEuler-20.03-LTS 分支，执行下面的命令： - -`git checkout -b openEuler-20.03-LTS origin/openEuler-20.03-LTS` + - openEuler 20.03 LTS：`git clone git@gitee.com:openeuler/raspberrypi-kernel.git -b openEuler-20.03-LTS && cd raspberrypi-kernel` ## 设置环境变量 @@ -66,9 +63,18 @@ ## 载入默认配置 -`make openeuler-raspi_defconfig` +根据内核不同版本，需要载入不同的默认配置： + +1. 5.10 内核 + + - openEuler 21.09：`make bcm2711_defconfig` + - openEuler 21.03：`make bcm2711_defconfig` + +2. 4.19 内核 + + - openEuler 20.03 LTS：`make openeuler-raspi_defconfig` -其中 openeuler-raspi_defconfig 在 ../linux/arch/arm64/configs 下。 +对应的 defconfig 文件在 ../linux/arch/arm64/configs 下。 ## 编译内核 diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh index 793891b..6be1f1d 100644 --- a/scripts/build-image-common.sh +++ b/scripts/build-image-common.sh @@ -8,7 +8,7 @@ Build raspberrypi image. Options: -n, --name IMAGE_NAME The raspberrypi image name to be built. -k, --kernel KERNEL_URL The URL of kernel source's repository, which defaults to https://gitee.com/openeuler/raspberrypi-kernel.git. - -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to master. + -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to openEuler-20.03-LTS. -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, xfce, ukui, dde or the file path of rpmlist. The default is headless. @@ -595,7 +595,7 @@ if [ "$EUID" -ne 0 ]; then fi kernel_url="https://gitee.com/openeuler/raspberrypi-kernel.git" -kernel_branch="master" +kernel_branch="openEuler-20.03-LTS" kernel_defconfig="openeuler-raspi_defconfig" default_defconfig="" make_cores=$(nproc) diff --git a/scripts/build-image-docker.sh b/scripts/build-image-docker.sh index 229342b..ba324ae 100644 --- a/scripts/build-image-docker.sh +++ b/scripts/build-image-docker.sh @@ -10,7 +10,7 @@ Options: -d, --docker DOCKER_FILE The URL/path of the Docker image, which defaults to https://repo.openeuler.org/openEuler-20.03-LTS-SP1/docker_img/aarch64/openEuler-docker.aarch64.tar.xz -n, --name IMAGE_NAME The raspberrypi image name to be built. -k, --kernel KERNEL_URL The URL of kernel source's repository, which defaults to https://gitee.com/openeuler/raspberrypi-kernel.git. - -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to master. + -b, --branch KERNEL_BRANCH The branch name of kernel source's repository, which defaults to openEuler-20.03-LTS. -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, xfce, ukui, dde or the file path of rpmlist. The default is headless. -- Gitee