[PATCH compass-ci 5/5] openeuler: the link for one command to build openeuler initramfs image
Signed-off-by: Wang Chenglong <18509160991@163.com> --- .../openeuler/aarch64/20.03-LTS/build | 30 +++++++++++++++++++ .../initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 31 insertions(+) create mode 100755 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 100755 index 0000000..016f8f9 --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1,30 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +#. ${CCI_SRC}/container/osimage/centos/lib +#. ${CCI_SRC}/container/defconfig.sh +. $HOME/compass-ci/container/osimage/openeuler/lib +. $HOME/compass-ci/container/defconfig.sh + +export_root_passwd +DIR=$(dirname $(realpath $0)) +cmd=( + docker run + --name init_docker + -w / + -v $DIR/create-image:/root/bin/create-image + -v $DIR/packages-to-install:/tmp/packages-to-install + -v $DIR/files-to-exclude:/tmp/files-to-exclude + -v $DIR/${image}.repo:/etc/yum.repos.d/${image}.repo + -e ROOT_PASSWD=$ROOT_PASSWD + -e IMAGE_NAME=$IMAGE_NAME + $image + /root/bin/create-image +) + +pull_docker_image +"${cmd[@]}" +docker_cp_image +docker_rm init_docker &> /dev/null +echo "build finished" diff --git a/rootfs/initramfs/openeuler/aarch64/20.09/build b/rootfs/initramfs/openeuler/aarch64/20.09/build new file mode 120000 index 0000000..f04acac --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.09/build @@ -0,0 +1 @@ +../../../../../container/osimage/openeuler/run \ No newline at end of file -- 2.23.0
On Thu, Nov 26, 2020 at 09:27:54AM +0800, Wang Chenglong wrote:
Signed-off-by: Wang Chenglong <18509160991@163.com> --- .../openeuler/aarch64/20.03-LTS/build | 30 +++++++++++++++++++ .../initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 31 insertions(+) create mode 100755 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build
diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 100755 index 0000000..016f8f9 --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1,30 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +#. ${CCI_SRC}/container/osimage/centos/lib +#. ${CCI_SRC}/container/defconfig.sh
wrong annootation?
+. $HOME/compass-ci/container/osimage/openeuler/lib +. $HOME/compass-ci/container/defconfig.sh + +export_root_passwd +DIR=$(dirname $(realpath $0))
blank line Thanks, Wang Yong
On Thu, Nov 26, 2020 at 10:01:00AM +0800, Wang Yong wrote:
On Thu, Nov 26, 2020 at 09:27:54AM +0800, Wang Chenglong wrote:
Signed-off-by: Wang Chenglong <18509160991@163.com> --- .../openeuler/aarch64/20.03-LTS/build | 30 +++++++++++++++++++ .../initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 31 insertions(+) create mode 100755 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build
diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 100755 index 0000000..016f8f9 --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1,30 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +#. ${CCI_SRC}/container/osimage/centos/lib +#. ${CCI_SRC}/container/defconfig.sh
wrong annootation?
Good. I forgot to delete it.
+. $HOME/compass-ci/container/osimage/openeuler/lib +. $HOME/compass-ci/container/defconfig.sh + +export_root_passwd +DIR=$(dirname $(realpath $0))
blank line
Good. Thanks, Chenglong
Thanks, Wang Yong
On Thu, Nov 26, 2020 at 09:27:54AM +0800, Wang Chenglong wrote:
Signed-off-by: Wang Chenglong <18509160991@163.com> --- .../openeuler/aarch64/20.03-LTS/build | 30 +++++++++++++++++++ .../initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 31 insertions(+) create mode 100755 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build
diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 100755 index 0000000..016f8f9 --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1,30 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +#. ${CCI_SRC}/container/osimage/centos/lib +#. ${CCI_SRC}/container/defconfig.sh +. $HOME/compass-ci/container/osimage/openeuler/lib +. $HOME/compass-ci/container/defconfig.sh
^^^^ $CCI_SRC
+ +export_root_passwd +DIR=$(dirname $(realpath $0)) +cmd=( + docker run + --name init_docker + -w / + -v $DIR/create-image:/root/bin/create-image + -v $DIR/packages-to-install:/tmp/packages-to-install + -v $DIR/files-to-exclude:/tmp/files-to-exclude + -v $DIR/${image}.repo:/etc/yum.repos.d/${image}.repo + -e ROOT_PASSWD=$ROOT_PASSWD + -e IMAGE_NAME=$IMAGE_NAME + $image + /root/bin/create-image +) +
centos 7 8 openeuler 20.03 20.09 there's a lot of similar code consider merging it Thanks, Shenwei
+pull_docker_image +"${cmd[@]}" +docker_cp_image +docker_rm init_docker &> /dev/null +echo "build finished" diff --git a/rootfs/initramfs/openeuler/aarch64/20.09/build b/rootfs/initramfs/openeuler/aarch64/20.09/build new file mode 120000 index 0000000..f04acac --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.09/build @@ -0,0 +1 @@ +../../../../../container/osimage/openeuler/run \ No newline at end of file -- 2.23.0
On Thu, Nov 26, 2020 at 10:05:14AM +0800, Xiao Shenwei wrote:
On Thu, Nov 26, 2020 at 09:27:54AM +0800, Wang Chenglong wrote:
Signed-off-by: Wang Chenglong <18509160991@163.com> --- .../openeuler/aarch64/20.03-LTS/build | 30 +++++++++++++++++++ .../initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 31 insertions(+) create mode 100755 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build
diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 100755 index 0000000..016f8f9 --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1,30 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +#. ${CCI_SRC}/container/osimage/centos/lib +#. ${CCI_SRC}/container/defconfig.sh +. $HOME/compass-ci/container/osimage/openeuler/lib +. $HOME/compass-ci/container/defconfig.sh
^^^^ $CCI_SRC
Good.
+ +export_root_passwd +DIR=$(dirname $(realpath $0)) +cmd=( + docker run + --name init_docker + -w / + -v $DIR/create-image:/root/bin/create-image + -v $DIR/packages-to-install:/tmp/packages-to-install + -v $DIR/files-to-exclude:/tmp/files-to-exclude + -v $DIR/${image}.repo:/etc/yum.repos.d/${image}.repo + -e ROOT_PASSWD=$ROOT_PASSWD + -e IMAGE_NAME=$IMAGE_NAME + $image + /root/bin/create-image +) +
centos 7 8 openeuler 20.03 20.09 there's a lot of similar code
consider merging it
Good. I will try it. Thanks, Chenglong
Thanks, Shenwei
+pull_docker_image +"${cmd[@]}" +docker_cp_image +docker_rm init_docker &> /dev/null +echo "build finished" diff --git a/rootfs/initramfs/openeuler/aarch64/20.09/build b/rootfs/initramfs/openeuler/aarch64/20.09/build new file mode 120000 index 0000000..f04acac --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.09/build @@ -0,0 +1 @@ +../../../../../container/osimage/openeuler/run \ No newline at end of file -- 2.23.0
participants (3)
-
Wang Chenglong -
Wang Yong -
Xiao Shenwei