October 2020 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] fix: sched: use testbox to find and submit idle jobs
by Ren Wen 14 Oct '20

14 Oct '20

Use testbox to find and submit idle jobs because of different types of physical machines have different jobs. Before: find and submit idle jobs using tbox_group queues. Now: find and submit using testbox queues. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 2fbf05d..a61a57b 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -432,7 +432,7 @@ class Sched # when find no job at "sched/#{tbox_group}" # try to get from "sched/#{tbox_group}/idle" - return get_idle_job(tbox_group, testbox) + return get_idle_job(tbox, testbox) end private def prepare_job(queue_name, testbox) @@ -457,20 +457,21 @@ class Sched return job end - private def get_idle_job(tbox_group, testbox) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + private def get_idle_job(tbox, testbox) + queue_name = "sched/#{tbox}/idle" + job = prepare_job(queue_name, testbox) # if there has no idle job, auto submit and get 1 if job.nil? - auto_submit_idle_job(tbox_group) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + auto_submit_idle_job(tbox) + job = prepare_job(queue_name, testbox) end return job end - def auto_submit_idle_job(tbox_group) - full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" + def auto_submit_idle_job(tbox) + full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox}/*.yaml" extra_job_fields = [ "idle_job=true", "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", @@ -479,7 +480,7 @@ class Sched Jobfile::Operate.auto_submit_job( full_path_patterns, - "testbox: #{tbox_group}", + "testbox: #{tbox}", extra_job_fields) if Dir.glob(full_path_patterns).size > 0 end -- 2.23.0

3 4

[PATCH lkp-tests] /lkp-tests/pkg: add PKGBUILD for test-tools
by Li Ping 14 Oct '20

14 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- pkg/test-tools/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkg/test-tools/PKGBUILD diff --git a/pkg/test-tools/PKGBUILD b/pkg/test-tools/PKGBUILD new file mode 100644 index 00000000..3335a67c --- /dev/null +++ b/pkg/test-tools/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=test-tools +pkgver=git +pkgrel=1 +pkgdesc="smoke test" +url="https://gitee.com/openeuler/test-tools.git" +arch=aarch64 +license=('GPL') +source=("https://gitee.com/openeuler/test-tools.git" + "https://gitee.com/openeuler/integration-test.git" +) +md5sums=('SKIP' 'SKIP') + +package() { + test_tools_path="${pkgdir}/lkp/benchmarks/${pkgname}" + mkdir -p "${test_tools_path}" + cp -af "${srcdir}/test-tools/"* "${test_tools_path}" + cp -af "${srcdir}/integration-test/testcases" "${test_tools_path}/mugen" + cp -af "${srcdir}/integration-test/suite2cases" "${test_tools_path}/mugen" +} -- 2.23.0

2 1

[PATCH v2 compass-ci 2/2] container/extract-stats add 'SRV_HTTP_HOST/PORT' in environment variables
by Lu Weitao 14 Oct '20

14 Oct '20

background: extract-stats service use mail-job tool that need get SRV_HTTP_HOST/PORT from ENV for display job result url in email Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/extract-stats/start | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container/extract-stats/start b/container/extract-stats/start index 6bb9f10..e5ee777 100755 --- a/container/extract-stats/start +++ b/container/extract-stats/start @@ -4,6 +4,7 @@ # frozen_string_literal: true require 'set' +require 'open3' require_relative '../defconfig.rb' names = Set.new %w[ @@ -25,6 +26,8 @@ DEFAULT_LKP = '/c/lkp-tests' DEFAULT_CCI = '/c/compass-ci' FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' +SRV_HTTP_HOST = defaults['SRV_HTTP_HOST'] || Open3.capture3('curl ip.sb')[0].chomp +SRV_HTTP_PORT = defaults['SRV_HTTP_PORT'] || '11300' docker_rm "extract-stats" cmd = %w[ @@ -35,6 +38,8 @@ cmd = %w[ ] + env + %W[ -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} + -e SRV_HTTP_HOST=#{SRV_HTTP_HOST} + -e SRV_HTTP_PORT=#{SRV_HTTP_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v /etc/localtime:/etc/localtime:ro -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

sample: mail-job crystal.92144 Date: Mon, Oct 12 2020 17:30:56PM +0800 From: team(a)crystal.ci To: lwt(a)crystal.ci Subject: [Compass-ci] job: crystal.92144 result Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: crystal.92144 had finished. Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… Regards Compass-ci https://gitee.com/openeuler/compass-ci Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/constants.rb | 5 ++++- lib/mail_job_result.rb | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..3d1ef1d 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -9,4 +9,7 @@ ES_HOST = config['ES_HOST'] || '172.17.0.1' ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' -MAIL_PORT = config['MAIL_PORT'] || 11_311 +MAIL_PORT = config['MAIL_PORT'] || 11311 + +SRV_HTTP_HOST = config['SRV_HTTP_HOST'] || ENV['SRV_HTTP_HOST'] || '172.17.0.1' +SRV_HTTP_PORT = config['SRV_HTTP_PORT'] || ENV['SRV_HTTP_PORT'] || 11300 diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 9202b81..29a9c1a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -9,8 +9,10 @@ require 'json' # compose and send email for job result class MailJobResult - def initialize(job_id) + def initialize(job_id, result_host = SRV_HTTP_HOST, result_port = SRV_HTTP_PORT) @job_id = job_id + @result_host = result_host + @result_port = result_port end def send_mail @@ -25,7 +27,7 @@ class MailJobResult body = "Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: \n\n#{signature}" + Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" { 'to' => @submitter_email, 'body' => body, 'subject' => subject } end @@ -34,6 +36,7 @@ class MailJobResult exit unless job['email'] @submitter_email = job['email'] + @result_root = job['result_root'] end def query_job -- 2.23.0

1 0

[PATCH v6 compass-ci 5/6] container/mail-robot: start file
by Luan Shengde 14 Oct '20

14 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/mail-robot/start | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 container/mail-robot/start diff --git a/container/mail-robot/start b/container/mail-robot/start new file mode 100755 index 0000000..a2e183d --- /dev/null +++ b/container/mail-robot/start @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require_relative '../defconfig.rb' +docker_rm 'mail-robot' + +JUMPER_IP = '192.168.132.2' +JUMPER_PORT = '29999' +SEND_MAIL_PORT = '11311' + +cmd = %W[ + docker run + --restart=always + --name=mail-robot + -d + -e JUMPER_IP=#{JUMPER_IP} + -e JUMPER_PORT=#{JUMPER_PORT} + -e SEND_MAIL_PORT=#{SEND_MAIL_PORT} + -v /c/upstream-repos:/upstream-repos:ro + -v /srv/cci/Maildir:/Maildir:rw + -v /c/compass-ci:/compass-ci:ro + mail-robot +] + +cmd += ['bash', '-c', 'umask 002 && ruby ./mail-robot.rb'] + +system(*cmd) -- 2.23.0

2 3

[PATCH v2 compass-ci 5/5] container/send-internet-mail: start file
by Luan Shengde 14 Oct '20

14 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/start | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 container/send-internet-mail/start diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..ef9b987 --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,54 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. /c/compass-ci/container/defconfig.sh +docker_rm send-internet-mail + +cmd=( + docker run + --restart=always + --name=send-internet-mail + -d + -p 11312:11312 + -v /etc/localtime:/etc/localtime:ro + send-internet-mail +) + +"${cmd[@]}" + +cat<<EOF +port: 11312 +--- + +No need to specify the sender + +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}' + +or + +data=" +subject: email subject +to: email_to_addr +body: email message" + +command: + curl -XPOST 'service_server_ip:service_port/send_mail_yaml' -d "\$data" + +--- +data=" +To: email_to_addr +Subject: email_subject + +mail_msg_line1 +mail_msg_line2 +... +" + +command: + curl -XPOST 'service_server_ip:service_port/send_mail_text' -d "\$data" +EOF -- 2.23.0

2 2

[PATCH v2 compass-ci] git_mirror: fix git-remote-http <defunct>
by Li Yuanchao 14 Oct '20

14 Oct '20

when use system() or %x() call shell command git, there would be a new child process to do git command. And it seems the child process doesn't clear everytime when it's finished. It needs to be waited by parent process. But it often comes out 'no child' error when wait in main thread, so I trap SIGCHLD to SIG_IGN, and the init process will handle it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 88a94ac..4ab5e32 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -45,8 +45,8 @@ class GitMirror def git_fetch(mirror_dir) fetch_info = %x(git -C #{mirror_dir} fetch 2>&1) - # Check whether mirror_dir is a good git repository by 3 conditions. If not, delete it. - if ($CHILD_STATUS.exitstatus == ERR_CODE) && fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) + # Check whether mirror_dir is a good git repository by 2 conditions. If not, delete it. + if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end return fetch_info.include? '->' @@ -89,6 +89,7 @@ class MirrorMain connection.start channel = connection.create_channel @message_queue = channel.queue('new_refs') + Signal.trap(:SIGCHLD, 'SIG_IGN') end def fork_stat_init(stat_key) -- 2.23.0

1 0

[PATCH compass-ci] add two field to config local repository
by Xiao Shenwei 14 Oct '20

14 Oct '20

DOCKER_REGISTRY_HOST, DOCKER_REGISTRY_HOST these field are our local repository address it's used by $CCI_SRC/sbin/docker-pull Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sparrow/3-code/dev-env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 80ee2cf..11c7fb0 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -10,6 +10,8 @@ server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${gitcache_port:=5000} : ${FLUENTD_SERVER_HOST:=$server_ip} : ${FLUENTD_SERVER_PORT:=24224} +: ${DOCKER_REGISTRY_HOST:=$server_ip} +: ${DOCKER_REGISTRY_PORT:=5001} mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF @@ -22,6 +24,8 @@ GITCACHE_HOST: $gitcache_host GITCACHE_PORT: $gitcache_port FLUENTD_SERVER_HOST: $FLUENTD_SERVER_HOST FLUENTD_SERVER_PORT: $FLUENTD_SERVER_PORT +DOCKER_REGISTRY_HOST: $DOCKER_REGISTRY_HOST +DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT EOF cat > /etc/profile.d/compass.sh <<'EOF' -- 2.23.0

1 0

[PATCH compass-ci 2/3] sparrow: process will exit if firewalld.service was not installed
by Hu Xuejiao 14 Oct '20

14 Oct '20

When firewalld is inactive, return code of 'systemctl status firewalld' will be 3, and install-tiny has set -e, so this will cause this process exit. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..772eb6f 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,23 @@ iptables -I FORWARD 1 -j ACCEPT iptables -t nat -A POSTROUTING -o "$PUB_IFACE" -s $BR0_SUBNET -j MASQUERADE iptables -t nat -A POSTROUTING -o $BR0_IFACE -d $BR0_SUBNET -j MASQUERADE -systemctl status firewalld | grep -q "running" && { +command -v firewall-cmd > /dev/null || { + echo "firewalld.service could not be found" + exit 0 +} + +systemctl start firewalld +[ "$(systemctl is-active firewalld)" == "active" ] || { + echo "start firewalld.service failed" + exit 0 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 - iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE - iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE +DOCKER0_SUBNET=172.17.0.0/16 - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -} +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=$DOCKER0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=$BR0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=0.0.0.0/32 accept" -- 2.23.0

2 1

[PATCH lab-z9] fix(allot): idle job should be directly assigned to the testbox level
by Yu Chuan 14 Oct '20

14 Oct '20

Assign 36 physical machines for multi-qemu job, a total of 864 virtual machines. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- allot/idle/taishan200-2280-2s48p-256g--a11 | 1 + allot/idle/taishan200-2280-2s48p-256g--a12 | 1 + allot/idle/taishan200-2280-2s48p-256g--a13 | 1 + allot/idle/taishan200-2280-2s48p-256g--a14 | 1 + allot/idle/taishan200-2280-2s48p-256g--a15 | 1 + allot/idle/taishan200-2280-2s48p-256g--a16 | 1 + allot/idle/taishan200-2280-2s48p-256g--a17 | 1 + allot/idle/taishan200-2280-2s48p-256g--a18 | 1 + allot/idle/taishan200-2280-2s48p-256g--a19 | 1 + allot/idle/taishan200-2280-2s48p-256g--a20 | 1 + allot/idle/taishan200-2280-2s48p-256g--a21 | 1 + allot/idle/taishan200-2280-2s48p-256g--a22 | 1 + allot/idle/taishan200-2280-2s48p-256g--a24 | 1 + allot/idle/taishan200-2280-2s48p-256g--a25 | 1 + allot/idle/taishan200-2280-2s48p-256g--a26 | 1 + allot/idle/taishan200-2280-2s48p-256g--a27 | 1 + allot/idle/taishan200-2280-2s48p-256g--a28 | 1 + allot/idle/taishan200-2280-2s48p-256g--a29 | 1 + allot/idle/taishan200-2280-2s48p-256g--a30 | 1 + allot/idle/taishan200-2280-2s48p-256g--a31 | 1 + allot/idle/taishan200-2280-2s48p-256g--a32 | 1 + allot/idle/taishan200-2280-2s48p-256g--a33 | 1 + allot/idle/taishan200-2280-2s48p-256g--a34 | 1 + allot/idle/taishan200-2280-2s48p-256g--a35 | 1 + .../multi-qemu.yaml | 0 allot/idle/taishan200-2280-2s48p-256g--a61 | 1 + allot/idle/taishan200-2280-2s48p-256g--a62 | 1 + allot/idle/taishan200-2280-2s48p-256g--a63 | 1 + allot/idle/taishan200-2280-2s48p-256g--a64 | 1 + allot/idle/taishan200-2280-2s48p-256g--a65 | 1 + allot/idle/taishan200-2280-2s48p-256g--a66 | 1 + allot/idle/taishan200-2280-2s48p-256g--a67 | 1 + allot/idle/taishan200-2280-2s48p-256g--a68 | 1 + allot/idle/taishan200-2280-2s48p-256g--a69 | 1 + allot/idle/taishan200-2280-2s48p-256g--a70 | 1 + allot/idle/taishan200-2280-2s48p-256g--a71 | 1 + .../taishan200-2280-2s64p-256g/multi-qemu.yaml | 18 ------------------ 37 files changed, 35 insertions(+), 18 deletions(-) create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a11 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a12 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a13 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a14 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a15 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a16 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a17 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a18 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a19 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a20 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a21 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a22 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a24 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a25 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a26 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a27 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a28 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a29 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a30 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a31 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a32 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a33 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a34 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a35 rename allot/idle/{taishan200-2280-2s48p-256g => taishan200-2280-2s48p-256g--a60}/multi-qemu.yaml (100%) create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a61 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a62 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a63 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a64 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a65 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a66 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a67 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a68 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a69 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a70 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a71 delete mode 100644 allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml diff --git a/allot/idle/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--a11 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a11 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a12 b/allot/idle/taishan200-2280-2s48p-256g--a12 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a12 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a13 b/allot/idle/taishan200-2280-2s48p-256g--a13 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a13 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a14 b/allot/idle/taishan200-2280-2s48p-256g--a14 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a14 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a15 b/allot/idle/taishan200-2280-2s48p-256g--a15 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a15 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a16 b/allot/idle/taishan200-2280-2s48p-256g--a16 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a17 b/allot/idle/taishan200-2280-2s48p-256g--a17 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a17 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a18 b/allot/idle/taishan200-2280-2s48p-256g--a18 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a18 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a19 b/allot/idle/taishan200-2280-2s48p-256g--a19 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a19 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a20 b/allot/idle/taishan200-2280-2s48p-256g--a20 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a20 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a21 b/allot/idle/taishan200-2280-2s48p-256g--a21 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a21 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a22 b/allot/idle/taishan200-2280-2s48p-256g--a22 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a22 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a24 b/allot/idle/taishan200-2280-2s48p-256g--a24 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a24 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a25 b/allot/idle/taishan200-2280-2s48p-256g--a25 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a25 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a26 b/allot/idle/taishan200-2280-2s48p-256g--a26 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a26 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a27 b/allot/idle/taishan200-2280-2s48p-256g--a27 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a27 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a28 b/allot/idle/taishan200-2280-2s48p-256g--a28 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a28 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a29 b/allot/idle/taishan200-2280-2s48p-256g--a29 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a29 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a30 b/allot/idle/taishan200-2280-2s48p-256g--a30 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a30 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a31 b/allot/idle/taishan200-2280-2s48p-256g--a31 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a31 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a32 b/allot/idle/taishan200-2280-2s48p-256g--a32 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a32 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a33 b/allot/idle/taishan200-2280-2s48p-256g--a33 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a33 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a34 b/allot/idle/taishan200-2280-2s48p-256g--a34 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a34 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a35 b/allot/idle/taishan200-2280-2s48p-256g--a35 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g/multi-qemu.yaml b/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g/multi-qemu.yaml rename to allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml diff --git a/allot/idle/taishan200-2280-2s48p-256g--a61 b/allot/idle/taishan200-2280-2s48p-256g--a61 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a61 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a62 b/allot/idle/taishan200-2280-2s48p-256g--a62 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a62 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a63 b/allot/idle/taishan200-2280-2s48p-256g--a63 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a64 b/allot/idle/taishan200-2280-2s48p-256g--a64 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a64 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a65 b/allot/idle/taishan200-2280-2s48p-256g--a65 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a65 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a66 b/allot/idle/taishan200-2280-2s48p-256g--a66 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a66 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a67 b/allot/idle/taishan200-2280-2s48p-256g--a67 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a67 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a68 b/allot/idle/taishan200-2280-2s48p-256g--a68 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a68 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a69 b/allot/idle/taishan200-2280-2s48p-256g--a69 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a69 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a70 b/allot/idle/taishan200-2280-2s48p-256g--a70 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a70 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a71 b/allot/idle/taishan200-2280-2s48p-256g--a71 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a71 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml b/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml deleted file mode 100644 index 4525fcd49735..000000000000 --- a/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml +++ /dev/null @@ -1,18 +0,0 @@ -suite: multi-qemu -category: functional - -os: openeuler -os_version: 20.03 -os_arch: aarch64 -os_mount: initramfs -simplify-ci: -multi-qemu-0: - nr_vm: 20 - tbox_group: vm-hi1620-2p8g -multi-qemu-1: - nr_vm: 2 - tbox_group: vm-hi1620-2p4g -multi-qemu-2: - nr_vm: 2 - tbox_group: vm-hi1620-1p1g -sleep: 100d -- 2.23.0

4 8

[PATCH lkp-tests] pkg: Changing the iozone-package version
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- pkg/iozone/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/iozone/PKGBUILD b/pkg/iozone/PKGBUILD index 43412913..1bc09ba4 100644 --- a/pkg/iozone/PKGBUILD +++ b/pkg/iozone/PKGBUILD @@ -1,6 +1,6 @@ pkgname=iozone pkgver=3 -pkgrel=479 +pkgrel=430 pkgdesc="A filesystem benchmark tool" arch=('i386' 'x86_64') url="http://www.iozone.org/" -- 2.23.0

2 1

[PATCH compass-ci] use local tool to pull images
by Xiao Shenwei 14 Oct '20

14 Oct '20

$CCI_SRC/sbin/docker-pull docker-pull will download images from local repository, if failed, will request docker hub Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/docker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/docker/docker.rb b/providers/docker/docker.rb index c75fc2c..b454f68 100755 --- a/providers/docker/docker.rb +++ b/providers/docker/docker.rb @@ -69,7 +69,7 @@ end def run(hostname, load_path, hash) docker_image = hash['docker_image'] - system "docker pull #{docker_image}" + system "docker-pull #{docker_image}" system( { 'hostname' => hostname, 'docker_image' => docker_image, 'load_path' => load_path }, ENV['CCI_SRC'] + '/providers/docker/run.sh' -- 2.23.0

1 0

[PATCH compass-ci 3/3] sparrow: sparrow: open the masquerade at public zone
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 772eb6f..46f2299 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -32,3 +32,4 @@ firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" +firewall-cmd --zone=public --add-masquerade -- 2.23.0

1 0

[PATCH compass-ci 1/3] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH compass-ci] fix: Error: unexpected token: or in job.cr
by Cao Xueliang 14 Oct '20

14 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 6abab9a..32aa662 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -324,7 +324,7 @@ class Job if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) - elsif "#{os_mount}" == "nfs" or "#{os_mount}" == "cifs" + elsif "#{os_mount}" == "nfs" || "#{os_mount}" == "cifs" temp_initrds.concat(nfs_cifs_initrds()) end -- 2.23.0

1 0

[PATCH compass-ci] remove from hi1620 from vm-hi1620 and vm-pxe-hi1620
by Bai Jing 14 Oct '20

14 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- doc/tutorial.md | 2 +- providers/multi-qemu | 2 +- providers/my-qemu.sh | 2 +- providers/qemu.sh | 2 +- sbin/auto_submit.yaml | 8 ++++---- sparrow/6-test/qemu | 4 ++-- src/spec/scheduler/tools_spec.cr | 6 +++--- user-client/helper/iperf.yaml | 2 +- user-client/helper/redis_op/redis_op_zrange | 4 ++-- user-client/helper/redis_op/redis_op_zremrangebyrank | 2 +- user-client/helper/redis_op_gc/consistency.rb | 2 +- user-client/helper/redis_op_gc/taskqueue_snap.rb | 8 ++++---- user-client/jobs/iperf-pxe.yaml | 4 ++-- user-client/jobs/iperf-vm.yaml | 2 +- user-client/maintain/walk-os-test/iperf-walk-os.yaml | 2 +- user-client/maintain/walk-os-test/my-qemu.sh | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index 85c9834..03f1342 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -101,7 +101,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM SUT/schduler/部署等资源相关变量。 ```yaml - testbox: vm-hi1620-2p8g + testbox: vm-2p8g os: openeuler os_version: 20.03 os_arch: aarch64 diff --git a/providers/multi-qemu b/providers/multi-qemu index 72453fb..23e0451 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -8,7 +8,7 @@ require 'fileutils' PWD = Dir.pwd # Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-hi1620-2p8g--#{ENV['USER']}" +HOSTNAME = ARGV[0] || "vm-2p8g--#{ENV['USER']}" NR_VM = ARGV[1] || 1 def run(seqno) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index 786a7aa..d97fd85 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -8,7 +8,7 @@ load_cci_defaults -: ${hostname:="vm-hi1620-1p1g-1"} +: ${hostname:="vm-1p1g-1"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 7076cca..1096014 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,7 +1,7 @@ AvxToNeon/AvxToNeon: -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 1e92a47..107204f 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -12,5 +12,5 @@ run_job() } dmidecode -s system-product-name | grep -iq "virtual" && exit -run_job vm-hi1620-2p8g -run_job vm-pxe-hi1620-2p8g +run_job vm-2p8g +run_job vm-pxe-2p8g diff --git a/src/spec/scheduler/tools_spec.cr b/src/spec/scheduler/tools_spec.cr index 0a71af0..780fce3 100644 --- a/src/spec/scheduler/tools_spec.cr +++ b/src/spec/scheduler/tools_spec.cr @@ -58,9 +58,9 @@ describe Public do result.should eq testgroup_name end - it "instance: vm-pxe-hi1620-1p1g-chief-1338976" do - testbox = "vm-pxe-hi1620-1p1g-chief-1338976" - tbox_group = "vm-pxe-hi1620-1p1g-chief" + it "instance: vm-pxe-1p1g--chief-1338976" do + testbox = "vm-pxe-1p1g--chief-1338976" + tbox_group = "vm-pxe-1p1g--chief" result = Public.get_tbox_group_name(testbox) result.should eq tbox_group diff --git a/user-client/helper/iperf.yaml b/user-client/helper/iperf.yaml index 06980c3..1509470 100644 --- a/user-client/helper/iperf.yaml +++ b/user-client/helper/iperf.yaml @@ -12,7 +12,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-1p1g-1 +testbox: vm-pxe-1p1g-1 arch: x86_64 node_roles: server client diff --git a/user-client/helper/redis_op/redis_op_zrange b/user-client/helper/redis_op/redis_op_zrange index ce4d6e7..3b1c074 100755 --- a/user-client/helper/redis_op/redis_op_zrange +++ b/user-client/helper/redis_op/redis_op_zrange @@ -4,14 +4,14 @@ if [ $# -gt 1 ]; then echo "USAGE: $0 # find all your job" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process # find jobs in queue" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process # find jobs in queue" exit 1 fi if [[ $1 ]]; then key_name=$1 else - [[ $tbox_group ]] || tbox_group=vm-hi1620-2p8g + [[ $tbox_group ]] || tbox_group=vm-2p8g key_name=queues/sched/$tbox_group-$USER/ready fi diff --git a/user-client/helper/redis_op/redis_op_zremrangebyrank b/user-client/helper/redis_op/redis_op_zremrangebyrank index 6b6365b..5a2d03f 100755 --- a/user-client/helper/redis_op/redis_op_zremrangebyrank +++ b/user-client/helper/redis_op/redis_op_zremrangebyrank @@ -4,7 +4,7 @@ if [ $# != 3 ]; then echo "USAGE: $0 key min max" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process 10 20" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process 10 20" exit 1 fi diff --git a/user-client/helper/redis_op_gc/consistency.rb b/user-client/helper/redis_op_gc/consistency.rb index f81c68f..29dd401 100755 --- a/user-client/helper/redis_op_gc/consistency.rb +++ b/user-client/helper/redis_op_gc/consistency.rb @@ -35,7 +35,7 @@ puts "options: #{options.inspect}" # it records all "task id" and task's current redis key value # like: # 25536 -# {"add_time":1596876735.944146, "queue":"sched/vm-hi1620-2p8g--$USER/ready"} +# {"add_time":1596876735.944146, "queue":"sched/vm-2p8g--$USER/ready"} cmd = "#{CMD_BASE} queues/id2content , hgetall" result = `#{cmd}`.chomp results = result.split("\n") diff --git a/user-client/helper/redis_op_gc/taskqueue_snap.rb b/user-client/helper/redis_op_gc/taskqueue_snap.rb index f0a7034..b32af8d 100755 --- a/user-client/helper/redis_op_gc/taskqueue_snap.rb +++ b/user-client/helper/redis_op_gc/taskqueue_snap.rb @@ -12,10 +12,10 @@ if !ARGV.empty? puts "input: #{__FILE__}" puts 'output: taskqueue_snap_yyyymmdd.md' puts ' # id, first add time, current queue' - puts ' # 14703, 2020-07-22 14:33, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # 14831, 2020-07-22 17:51, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-hi1620-2p8g/in_process' - puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-hi1620-2p8g/in_process' + puts ' # 14703, 2020-07-22 14:33, sched/vm-2p8g--xxx/in_process' + puts ' # 14831, 2020-07-22 17:51, sched/vm-2p8g--xxx/in_process' + puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-2p8g/in_process' + puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-2p8g/in_process' exit end diff --git a/user-client/jobs/iperf-pxe.yaml b/user-client/jobs/iperf-pxe.yaml index ccf5c9d..209c5d6 100644 --- a/user-client/jobs/iperf-pxe.yaml +++ b/user-client/jobs/iperf-pxe.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client @@ -35,7 +35,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/jobs/iperf-vm.yaml b/user-client/jobs/iperf-vm.yaml index 31c5a3a..434b964 100644 --- a/user-client/jobs/iperf-vm.yaml +++ b/user-client/jobs/iperf-vm.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-hi1620-2p8g-1 +testbox: vm-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/maintain/walk-os-test/iperf-walk-os.yaml b/user-client/maintain/walk-os-test/iperf-walk-os.yaml index 2991743..647220c 100644 --- a/user-client/maintain/walk-os-test/iperf-walk-os.yaml +++ b/user-client/maintain/walk-os-test/iperf-walk-os.yaml @@ -7,7 +7,7 @@ if role server: if role client: iperf: protocol: tcp -testbox: vm-hi1620-2p8g--USER +testbox: vm-2p8g--USER os: OS os_arch: OS_ARCH os_version: OS_VER diff --git a/user-client/maintain/walk-os-test/my-qemu.sh b/user-client/maintain/walk-os-test/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/user-client/maintain/walk-os-test/my-qemu.sh +++ b/user-client/maintain/walk-os-test/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh -- 2.23.0

1 0

[PATCH compass-ci] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH lkp-tests] depends: add git in deploy-cci(dependency)
by Hu Xuejiao 14 Oct '20

14 Oct '20

Testcase(deploy-cci): git clone https://gitee.com/**/compass-ci.git, but when os_mount=initramfs, the git package is missing. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- distro/depends/deploy-cci | 1 + 1 file changed, 1 insertion(+) create mode 100644 distro/depends/deploy-cci diff --git a/distro/depends/deploy-cci b/distro/depends/deploy-cci new file mode 100644 index 00000000..5664e303 --- /dev/null +++ b/distro/depends/deploy-cci @@ -0,0 +1 @@ +git -- 2.23.0

1 0

Re: [PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

On Tue, Oct 13, 2020 at 06:12:50PM +0800, Lu Kaiyi wrote: >On Tue, Oct 13, 2020 at 05:36:00PM +0800, Lu Weitao wrote: >>sample: mail-job crystal.92144 >>Date: Mon, Oct 12 2020 17:30:56PM +0800 >>From: team(a)crystal.ci >>To: lwt(a)crystal.ci >>Subject: [Compass-ci] job: crystal.92144 result >> >>Hi, >> Thanks for your participation in Kunpeng and software ecosystem! >> Your Job: crystal.92144 had finished. > ^ > maybe remove ":" will better for a complete sentence. 去掉也可以的，但是加上更好。这个场景就像：联系人： xxx 联系电话：xxx-xxxxxxxx 显然，加上：效果好一些(冒号在中英文的作用基本是一样的) Thanks, Weitao > Thanks, > Kaiyi >> Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… >> >>Regards

1 0

[PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

sample: mail-job crystal.92144 Date: Mon, Oct 12 2020 17:30:56PM +0800 From: team(a)crystal.ci To: lwt(a)crystal.ci Subject: [Compass-ci] job: crystal.92144 result Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: crystal.92144 had finished. Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… Regards Compass-ci https://gitee.com/openeuler/compass-ci Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/constants.rb | 3 +++ lib/mail_job_result.rb | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..5c42466 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -10,3 +10,6 @@ ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' MAIL_PORT = config['MAIL_PORT'] || 11_311 + +SRV_HTTP_HOST = config['SRV_HTTP_HOST'] || ENV['SRV_HTTP_HOST'] || '172.17.0.1' +SRV_HTTP_PORT = config['SRV_HTTP_PORT'] || ENV['SRV_HTTP_PORT'] || 11_300 diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 9202b81..29a9c1a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -9,8 +9,10 @@ require 'json' # compose and send email for job result class MailJobResult - def initialize(job_id) + def initialize(job_id, result_host = SRV_HTTP_HOST, result_port = SRV_HTTP_PORT) @job_id = job_id + @result_host = result_host + @result_port = result_port end def send_mail @@ -25,7 +27,7 @@ class MailJobResult body = "Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: \n\n#{signature}" + Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" { 'to' => @submitter_email, 'body' => body, 'subject' => subject } end @@ -34,6 +36,7 @@ class MailJobResult exit unless job['email'] @submitter_email = job['email'] + @result_root = job['result_root'] end def query_job -- 2.23.0

3 4

[PATCH lkp-tests] lib/job.rb: check pp key
by Wei Jihui 13 Oct '20

13 Oct '20

next when check key is nil, donot add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 3c555e13..c3966546 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -568,7 +568,9 @@ class Job init_program_options() for_each_in(@job, @referenced_programs.keys) do |_pk, h, p_n, p_args| k = hash_key_re_string(@job, p_n, @job['pp'].keys) - if k && !(a)job[k].is_a?(Hash) + next if k.nil? + + unless @job[k].is_a?(Hash) @job['pp'][k] = @job[k] next end -- 2.23.0

1 0

[PATCH lkp-tests] /lkp-tests/test: add test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- tests/test-tools | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 tests/test-tools diff --git a/tests/test-tools b/tests/test-tools new file mode 100755 index 00000000..9ca5d228 --- /dev/null +++ b/tests/test-tools @@ -0,0 +1,37 @@ +#!/bin/bash +# - testsuite +# - testcase +# - all + +cd $BENCHMARK_ROOT/test-tools/mugen || exit + +set_for_env() +{ + bash runoet.sh -c + source ~/.bash_profile +} + +test_one_case() +{ + + bash runoet.sh -f $testsuite -r $testcase -x +} + +test_all_cases() +{ + bash runoet.sh -a +} + +run_test() +{ + set_for_env + [ -n "$all" ] && { + test_all_cases + return + } + [ -n "$testsuite" ] || testsuite=smoke-testing + [ -n "$testcase" ] || testcase=oe_test_dd_001 + test_one_case +} + +run_test -- 2.23.0

4 4

[PATCH lkp-tests] add PKGBUILD for test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- pkg/test-tools/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkg/test-tools/PKGBUILD diff --git a/pkg/test-tools/PKGBUILD b/pkg/test-tools/PKGBUILD new file mode 100644 index 00000000..6908c193 --- /dev/null +++ b/pkg/test-tools/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=test-tools +pkgver=git +pkgrel=1 +pkgdesc="smoke test" +url="https://gitee.com/openeuler/test-tools.git" +arch=aarch64 +license=('GPL') +source=("https://gitee.com/openeuler/test-tools.git" + "https://gitee.com/openeuler/integration-test.git" +) +md5sums=('SKIP' 'SKIP') + +package() { + test_tools_path="${pkgdir}/lkp/benchmarks/${pkgname}" + mkdir -p "${test_tools_path}" + cp -af "${srcdir}/test-tools/"* "${test_tools_path}" + cp -af "${srcdir}/integration-test/testcases"* "${test_tools_path}/mugen" + cp -af "${srcdir}/integration-test/suite2cases"* "${test_tools_path}/mugen" +} -- 2.23.0

2 1

[PATCH compass-ci] user-client/maintain: use tbox to test os rootfs
by Liu Yinsi 13 Oct '20

13 Oct '20

1. vm-hi1620-2p8g--USER -> vm-2p8g--taishan200-2280-2s48p-256g--a71 2. test in tbox, so remove my-qemu.sh 3. get job run time by es-find Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- .../maintain/walk-os-test/iperf-walk-os.yaml | 2 +- .../maintain/walk-os-test/walk-os-iperf-test | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/user-client/maintain/walk-os-test/iperf-walk-os.yaml b/user-client/maintain/walk-os-test/iperf-walk-os.yaml index 2991743..b215730 100644 --- a/user-client/maintain/walk-os-test/iperf-walk-os.yaml +++ b/user-client/maintain/walk-os-test/iperf-walk-os.yaml @@ -7,7 +7,7 @@ if role server: if role client: iperf: protocol: tcp -testbox: vm-hi1620-2p8g--USER +testbox: vm-2p8g--taishan200-2280-2s48p-256g--a71 os: OS os_arch: OS_ARCH os_version: OS_VER diff --git a/user-client/maintain/walk-os-test/walk-os-iperf-test b/user-client/maintain/walk-os-test/walk-os-iperf-test index 21e1428..9c2b612 100755 --- a/user-client/maintain/walk-os-test/walk-os-iperf-test +++ b/user-client/maintain/walk-os-test/walk-os-iperf-test @@ -43,12 +43,23 @@ create_test_yaml() { echo "$hwarch $os/$os_arch/$os_ver" } +get_job_state() { + job_state='' + until [ -n "$job_state" ] + do + job_state=$(es-find id=$job_id| grep job_state) + sleep 5 + done +} + job_test() { local job_id bef aft - job_id=$(submit test.yaml |awk '{print $NF}') - bef=$(date +%s) - ./my-qemu.sh - aft=$(date +%s) + job_id=$(submit test.yaml |awk -F '=' '{print $NF}') + get_job_state + start_time=$(es-find id=$job_id| grep start_time| awk -F '"' '{print $4}') + end_time=$(es-find id=$job_id| grep end_time| awk -F '"' '{print $4}') + bef=$(date -d "$start_time" +%s) + aft=$(date -d "$end_time" +%s) logging "$1" "$2" "$3" "$(sec2date $bef)" "$(sec2date $aft)" "$((aft - bef))" "$job_id" } -- 2.23.0

2 1

[PATCH compass-ci] sched: when os_mount is container no need initrd.lkp
by Cao Xueliang 13 Oct '20

13 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index be3446e..70f2505 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -324,7 +324,7 @@ class Job if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) - else + elsif "#{os_mount}" == "nfs" or "#{os_mount}" == "cifs" temp_initrds.concat(nfs_cifs_initrds()) end -- 2.23.0

1 0

[PATCH compass-ci 2/2] container/extract-stats add 'SRV_HTTP_HOST/PORT' in environment variables
by Lu Weitao 13 Oct '20

13 Oct '20

background: extract-stats service use mail-job tool that need get SRV_HTTP_HOST/PORT from ENV for display job result url in email Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/extract-stats/start | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container/extract-stats/start b/container/extract-stats/start index 6bb9f10..e5ee777 100755 --- a/container/extract-stats/start +++ b/container/extract-stats/start @@ -4,6 +4,7 @@ # frozen_string_literal: true require 'set' +require 'open3' require_relative '../defconfig.rb' names = Set.new %w[ @@ -25,6 +26,8 @@ DEFAULT_LKP = '/c/lkp-tests' DEFAULT_CCI = '/c/compass-ci' FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' +SRV_HTTP_HOST = defaults['SRV_HTTP_HOST'] || Open3.capture3('curl ip.sb')[0].chomp +SRV_HTTP_PORT = defaults['SRV_HTTP_PORT'] || '11300' docker_rm "extract-stats" cmd = %w[ @@ -35,6 +38,8 @@ cmd = %w[ ] + env + %W[ -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} + -e SRV_HTTP_HOST=#{SRV_HTTP_HOST} + -e SRV_HTTP_PORT=#{SRV_HTTP_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v /etc/localtime:/etc/localtime:ro -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -- 2.23.0

1 0

[PATCH compass-ci] job.cr: optimize set_pp_initrd() for good reading
by Xu Xijian 13 Oct '20

13 Oct '20

Define vars for twice used string and adjust code for good reading. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- src/lib/job.cr | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index be3446e..79778e4 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -387,16 +387,13 @@ class Job if @hash["pp"]? program_params = @hash["pp"].as_h program_params.keys.each do |program| - dest_file = "#{mount_type}/#{os_dir}/#{program}" - if File.exists?("#{ENV["LKP_SRC"]}/distro/depends/#{program}") && - File.exists?("#{SRV_INITRD}/deps/#{dest_file}.cgz") - initrd_deps_arr << "#{initrd_http_prefix}" + - JobHelper.service_path("#{SRV_INITRD}/deps/#{dest_file}.cgz") + deps_dest_file = "#{SRV_INITRD}/deps/#{mount_type}/#{os_dir}/#{program}.cgz" + pkg_dest_file = "#{SRV_INITRD}/pkg/#{mount_type}/#{os_dir}/#{program}.cgz" + if File.exists?("#{ENV["LKP_SRC"]}/distro/depends/#{program}") && File.exists?(deps_dest_file) + initrd_deps_arr << "#{initrd_http_prefix}" + JobHelper.service_path(deps_dest_file) end - if File.exists?("#{ENV["LKP_SRC"]}/pkg/#{program}") && - File.exists?("#{SRV_INITRD}/pkg/#{dest_file}.cgz") - initrd_pkg_arr << "#{initrd_http_prefix}" + - JobHelper.service_path("#{SRV_INITRD}/pkg/#{dest_file}.cgz") + if File.exists?("#{ENV["LKP_SRC"]}/pkg/#{program}") && File.exists?(pkg_dest_file) + initrd_pkg_arr << "#{initrd_http_prefix}" + JobHelper.service_path(pkg_dest_file) end end end -- 2.23.0

1 0

[PATCH compass-ci] fix(dnsmasq): dnsmasq does not assign boot.ipxe to the physical machine
by Yu Chuan 13 Oct '20

13 Oct '20

When there are multiple dhcp-boot in the configuration file, the dnsmasq will send the boot file corresponding to the last matched tag. Reference: - https://wiki.fogproject.org/wiki/index.php?title=ProxyDHCP_with_dnsmasq Signed-off-by: Yu Chuan <13186087857(a)163.com> --- container/dnsmasq/dnsmasq.d/dnsmasq.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/container/dnsmasq/dnsmasq.d/dnsmasq.conf b/container/dnsmasq/dnsmasq.d/dnsmasq.conf index df5bc6814e22..6141faf0436b 100644 --- a/container/dnsmasq/dnsmasq.d/dnsmasq.conf +++ b/container/dnsmasq/dnsmasq.d/dnsmasq.conf @@ -22,10 +22,12 @@ dhcp-match=set:pxeclient,60,PXEClient* dhcp-match=set:pxeclient-arm64,93,11 dhcp-match=set:pxeclient-x64,93,7 -dhcp-boot=tag:ipxe,boot.ipxe dhcp-boot=tag:pxeclient-arm64,/tftpboot/ipxe/bin-arm64-efi/snp.efi dhcp-boot=tag:pxeclient-x64,/tftpboot/ipxe/bin-x86_64-efi/snp.efi +# dhcp-boot of boot.ipxe must be on the last line. +dhcp-boot=tag:ipxe,boot.ipxe + log-queries log-facility=/var/log/dnsmasq/dnsmasq.log # more info: -- 2.23.0

1 0

[PATCH compass-ci] use local docker repository
by Xiao Shenwei 13 Oct '20

13 Oct '20

pull image from local repository, if failed will pull from docker hub usage: docker-pull NAME[:TAG] eg: docker-pull centos:7 docker-pull dc-centos:7 Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sbin/docker-pull | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 sbin/docker-pull diff --git a/sbin/docker-pull b/sbin/docker-pull new file mode 100755 index 0000000..61ead7e --- /dev/null +++ b/sbin/docker-pull @@ -0,0 +1,31 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. $CCI_SRC/container/defconfig.sh + +load_cci_defaults + +: ${DOCKER_REGISTRY_HOST:="127.0.0.1"} +: ${DOCKER_REGISTRY_PORT:=5001} + +image_name=$1 + +local_repository() +{ + echo "pull image from local repository" + docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name +} + +docker_hub() +{ + echo "pull image from docker hub" + docker pull $image_name +} + +main() +{ + local_repository || docker_hub +} + +main -- 2.23.0

1 0

[PATCH lkp-tests 3/3] fix(iso2rootfs): solve possible problems with the checksum file
by Yu Chuan 13 Oct '20

13 Oct '20

If the remote server happens to release a new iso while the program is running. The checksum file will be the same as the newly released checksum file, not the same as the checksum file when the program was first executed. It's clearly not normal. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- tests/iso2rootfs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 735c2b9aabcd..5184041abf2b 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -66,7 +66,8 @@ get_daily_iso_checksum() ISO_NAME=$(basename "$ISO_URL") ISO_CHECKSUM_URL="${ISO_URL}.sha256sum" - SHA256SUM_NET=$(curl -s "$ISO_CHECKSUM_URL" | awk '{print $1}') + curl -o "${CHECKSUM_FILE_CACHE}.tmp" "${ISO_CHECKSUM_URL}" + SHA256SUM_NET=$(awk '{print $1}' "${CHECKSUM_FILE_CACHE}.tmp") } mount_rootfs() @@ -118,6 +119,7 @@ check_sha256sum_update() if [ "$SHA256SUM_CACHE" == "$SHA256SUM_NET" ] then log_info "${iso_os} haven't release new iso, no need to generate rootfs" + rm -f "${CHECKSUM_FILE_CACHE}.tmp" exit 0 else log_info "${iso_os} release a new iso, start to generate rootfs ..." @@ -354,17 +356,11 @@ EOF } ############ post works ############ -update_sha256sum_file() -{ - [ -f "${CHECKSUM_FILE_CACHE}" ] && rm -f "${CHECKSUM_FILE_CACHE}" - wget -c -O "${CHECKSUM_FILE_CACHE}" "${ISO_CHECKSUM_URL}" -} - post_works() { log_info "starting post works ..." - update_sha256sum_file + mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}" umount "${ROOTFS_LOCAL_PATH}" -- 2.23.0

1 0

[PATCH lkp-tests 2/3] fix(iso2rootfs): the ip of the newest openeuler iso url has changed
by Yu Chuan 13 Oct '20

13 Oct '20

The ip of the newest openeuler iso url has changed from the public ip to the internal ip. So replace it while running. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- tests/iso2rootfs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/iso2rootfs b/tests/iso2rootfs index b60a82a7c972..735c2b9aabcd 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -59,6 +59,10 @@ check_yaml_vars() get_daily_iso_checksum() { ISO_URL="$(curl "${iso_url_file}")" + [ "${iso_os}" == "openeuler" ] && { + local pub_ip=$(echo "${iso_url_file}" | grep -oEw "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}") + ISO_URL="$(curl "${iso_url_file}" |sed -r "s/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/${pub_ip}/g")" + } ISO_NAME=$(basename "$ISO_URL") ISO_CHECKSUM_URL="${ISO_URL}.sha256sum" -- 2.23.0

1 0

[PATCH lkp-tests 1/3] feat(iso2rootfs): make the rootfs mount type optional
by Yu Chuan 13 Oct '20

13 Oct '20

Current rootfs mount type only support nfs, make it optional, and support cifs mount type. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- jobs/iso2rootfs.yaml | 5 ++-- tests/iso2rootfs | 64 +++++++++++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 722c4903c84a..f413c9cee1f0 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -6,7 +6,8 @@ iso2rootfs: iso_os: iso_arch: iso_version: - rootfs_nfs_server: - rootfs_nfs_path: + rootfs_protocol: + rootfs_server: + rootfs_path: initrd_http_host: initrd_http_port: diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 38e4b0a4daee..b60a82a7c972 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -42,8 +42,9 @@ check_yaml_vars() "iso_os" "iso_arch" "iso_version" - "rootfs_nfs_server" - "rootfs_nfs_path" + "rootfs_protocol" + "rootfs_server" + "rootfs_path" "initrd_http_host" "initrd_http_port" ) @@ -64,20 +65,39 @@ get_daily_iso_checksum() SHA256SUM_NET=$(curl -s "$ISO_CHECKSUM_URL" | awk '{print $1}') } -mount_nfs() +mount_rootfs() { - NFS_SERVER_PATH="${rootfs_nfs_server}:${rootfs_nfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" - NFS_LOCAL_PATH="${WORKSPACE}/crystal_os_${iso_os}_${iso_arch}" - - [ -d "${NFS_LOCAL_PATH}" ] || mkdir -p "$NFS_LOCAL_PATH" - mount -t nfs "${NFS_SERVER_PATH}" "${NFS_LOCAL_PATH}" + case ${rootfs_protocol} in + "nfs") + ROOTFS_SERVER_PATH="${rootfs_server}:${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + install_pkgs "nfs-utils" + ;; + "cifs") + ROOTFS_SERVER_PATH="//${rootfs_server}/${rootfs_path}/${iso_os}/${iso_arch}/debug-versions/dailybuild" + ROOTFS_MOUNT_PARAM="guest,vers=1.0,noacl,nouser_xattr" + install_pkgs "cifs-utils" + ;; + *) + die "rootfs_protocol is none, exit !!!" + ;; + esac + + ROOTFS_LOCAL_PATH="${WORKSPACE}/compass_os_${iso_os}_${iso_arch}" + + [ -d "${ROOTFS_LOCAL_PATH}" ] || mkdir -p "$ROOTFS_LOCAL_PATH" + if [ -n "${ROOTFS_MOUNT_PARAM}" ] + then + mount -t ${rootfs_protocol} -o "${ROOTFS_MOUNT_PARAM}" "${ROOTFS_SERVER_PATH}" "${ROOTFS_LOCAL_PATH}" + else + mount -t ${rootfs_protocol} "${ROOTFS_SERVER_PATH}" "${ROOTFS_LOCAL_PATH}" + fi } get_cache_iso_checksum() { - mount_nfs + mount_rootfs - CHECKSUM_FILE_CACHE="${NFS_LOCAL_PATH}/${iso_version}-newest.sha256sum" + CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-newest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE") } @@ -155,6 +175,7 @@ config_git_proxy() config_iso2rootfs() { log_info "starting config iso2rootfs env ..." + install_pkgs "wget" get_cgz source "${CGZ_PATH}/config" @@ -222,12 +243,12 @@ run_iso2qcow2() download_compass_ci() { [ -d "${CCI_SRC}" ] && rm -rf "${CCI_SRC}" - git clone "$CRYSTAL_CI_GIT_URL" "${CCI_SRC}" + git clone "$COMPASS_CI_GIT_URL" "${CCI_SRC}" } config_rootfs_dir() { - ROOTFS_DES_DIR=${NFS_LOCAL_PATH}/${iso_version}-$(date "+%Y%m%d%H%M%S") + ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${iso_version}-$(date "+%Y%m%d%H%M%S") [ -d "${ROOTFS_DES_DIR}" ] && ROOTFS_DES_DIR="${ROOTFS_DES_DIR}-${HOSTNAME##*--}" mkdir -p "$ROOTFS_DES_DIR" @@ -279,12 +300,23 @@ test_rootfs() local kernel_path=$(realpath "${ROOTFS_DES_DIR}"/boot/vmlinuz*|grep -v rescue) local initrd_lkp_path=$(realpath "${ROOTFS_DES_DIR}"/boot/initramfs.lkp*) - local nfsroot_path="${NFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}")" + local root_path + case ${rootfs_protocol} in + "nfs") + root_path="${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}")" + ;; + "cifs") + root_path="cifs:${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}"),${ROOTFS_MOUNT_PARAM}" + ;; + *) + die "rootfs_protocol is none, exit !!!" + ;; + esac get_qemu_efi_fd sed -i "s|KERNEL|\"${kernel_path}\"|g" "$test_script" sed -i "s|INITRD_LKP|\"${initrd_lkp_path}\"|g" "$test_script" - sed -i "s|NFS_ROOT|\"${nfsroot_path}\"|g" "$test_script" + sed -i "s|ROOT|\"${root_path}\"|g" "$test_script" sed -i "s|QEMU_EFI_FD|\"${EFI_FD_PATH}\"|g" "$test_script" cd "$(dirname "${test_script}")" @@ -305,7 +337,7 @@ test_rootfs() send_user "\[INFO\] test rootfs ok" exit 0 } - "nfs: server * not responding, timed out" { + "server * not responding, timed out" { send_user "\[WARNING\] rootfs can start, but need to disable some services" exit 0 } @@ -330,7 +362,7 @@ post_works() update_sha256sum_file - umount "${NFS_LOCAL_PATH}" + umount "${ROOTFS_LOCAL_PATH}" log_info "iso2rootfs finished" } -- 2.23.0

1 0

[PATCH lab-z9 3/3] hosts file add ipmi_ip
by Zhang Dewan 13 Oct '20

13 Oct '20

--- hosts/taishan200-2280-2s48p-256g--a13 | 2 +- hosts/taishan200-2280-2s48p-256g--a14 | 2 +- hosts/taishan200-2280-2s48p-256g--a15 | 2 +- hosts/taishan200-2280-2s48p-256g--a17 | 2 +- hosts/taishan200-2280-2s48p-256g--a18 | 2 +- hosts/taishan200-2280-2s48p-256g--a19 | 2 +- hosts/taishan200-2280-2s48p-256g--a21 | 2 +- hosts/taishan200-2280-2s48p-256g--a22 | 2 +- hosts/taishan200-2280-2s48p-256g--a24 | 2 +- hosts/taishan200-2280-2s48p-256g--a25 | 2 +- hosts/taishan200-2280-2s48p-256g--a26 | 2 +- hosts/taishan200-2280-2s48p-256g--a27 | 2 +- hosts/taishan200-2280-2s48p-256g--a28 | 2 +- hosts/taishan200-2280-2s48p-256g--a29 | 2 +- hosts/taishan200-2280-2s48p-256g--a30 | 2 +- hosts/taishan200-2280-2s48p-256g--a31 | 2 +- hosts/taishan200-2280-2s48p-256g--a32 | 2 +- hosts/taishan200-2280-2s48p-256g--a33 | 2 +- hosts/taishan200-2280-2s48p-256g--a34 | 2 +- hosts/taishan200-2280-2s48p-256g--a52 | 2 +- hosts/taishan200-2280-2s48p-256g--a53 | 2 +- hosts/taishan200-2280-2s48p-256g--a60 | 2 +- hosts/taishan200-2280-2s48p-256g--a61 | 2 +- hosts/taishan200-2280-2s48p-256g--a62 | 2 +- hosts/taishan200-2280-2s48p-256g--a66 | 2 +- hosts/taishan200-2280-2s48p-256g--a67 | 2 +- hosts/taishan200-2280-2s48p-256g--a68 | 2 +- hosts/taishan200-2280-2s48p-256g--a69 | 2 +- hosts/taishan200-2280-2s48p-256g--a70 | 2 +- hosts/taishan200-2280-2s48p-256g--a71 | 2 +- hosts/taishan200-2280-2s64p-256g--a10 | 2 +- hosts/taishan200-2280-2s64p-256g--a40 | 2 +- hosts/taishan200-2280-2s64p-256g--a41 | 2 +- hosts/taishan200-2280-2s64p-256g--a42 | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 7fca8ed..78cd2ee 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index 7134e6c..162e687 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 5eb756c..3890ff0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index e3168bf..f2146f8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 12b6f71..e0ca747 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index a1541c4..2b3c440 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 4dea3c8..44c4e64 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index 4fabb6f..b6d10af 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index 64e1f6f..5e1571d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index 4dfb257..1f3f599 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 9ecfeee..b136009 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index a529631..96a387d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index 8682c85..5a4f298 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index ec17c19..5b7c0b8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index 41e1083..2c8d2d3 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 80abe0e..9aec903 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index 3719131..d677838 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index 13af4dc..d4df847 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index b0a1e8a..680cb6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index a3ea181..a64cdec 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index 5d97218..148e747 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 5a122da..9e969b0 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index f1eb906..2992c6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index 970d6ea..5262637 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 39b69b8..b7a3715 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 79f98db..2501f6e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 37859dc..c51e348 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 5d607e7..964f79e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index b3d1416..2424a9f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index 102ff96..501ea4b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 252G +memory: 256G mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 3abe369..fcc6c63 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 1 nr_ssd_partitions: 1 hdd_partitions: diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index 1a806ee..3172475 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 5b22bcc..4253e1f 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index 442b958..dce3cf0 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 252G +memory: 256G nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 -- 2.23.0

1 0

[PATCH lab-z9 2/3] host file add ipmi_ip
by Zhang Dewan 13 Oct '20

13 Oct '20

--- hosts/0001-add-new-hosts-file.patch | 913 ------------------ ...and-the-128G-s-host-will-be-added-to.patch | 454 --------- hosts/0003-hosts-file-add-ipmi_ip.patch | 411 -------- hosts/m | 37 + hosts/p | 10 + hosts/taishan200-2280-2s48p-256g--a11 | 20 - hosts/taishan200-2280-2s48p-256g--a13 | 20 + hosts/taishan200-2280-2s48p-256g--a14 | 20 + hosts/taishan200-2280-2s48p-256g--a15 | 20 + hosts/taishan200-2280-2s48p-256g--a17 | 20 + hosts/taishan200-2280-2s48p-256g--a18 | 20 + hosts/taishan200-2280-2s48p-256g--a19 | 20 + hosts/taishan200-2280-2s48p-256g--a21 | 20 + hosts/taishan200-2280-2s48p-256g--a22 | 20 + hosts/taishan200-2280-2s48p-256g--a24 | 8 +- hosts/taishan200-2280-2s48p-256g--a25 | 6 +- hosts/taishan200-2280-2s48p-256g--a26 | 20 + hosts/taishan200-2280-2s48p-256g--a27 | 20 + hosts/taishan200-2280-2s48p-256g--a28 | 20 + hosts/taishan200-2280-2s48p-256g--a29 | 20 + hosts/taishan200-2280-2s48p-256g--a30 | 20 + hosts/taishan200-2280-2s48p-256g--a31 | 20 + hosts/taishan200-2280-2s48p-256g--a32 | 20 + hosts/taishan200-2280-2s48p-256g--a33 | 20 + hosts/taishan200-2280-2s48p-256g--a34 | 20 + hosts/taishan200-2280-2s48p-256g--a35 | 21 + hosts/taishan200-2280-2s48p-256g--a52 | 20 + hosts/taishan200-2280-2s48p-256g--a53 | 18 + hosts/taishan200-2280-2s48p-256g--a60 | 20 + hosts/taishan200-2280-2s48p-256g--a61 | 20 + hosts/taishan200-2280-2s48p-256g--a62 | 20 + hosts/taishan200-2280-2s48p-256g--a66 | 6 +- hosts/taishan200-2280-2s48p-256g--a67 | 6 +- hosts/taishan200-2280-2s48p-256g--a68 | 6 +- hosts/taishan200-2280-2s48p-256g--a69 | 6 +- hosts/taishan200-2280-2s48p-256g--a70 | 6 +- hosts/taishan200-2280-2s48p-256g--a71 | 3 +- hosts/taishan200-2280-2s64p-256g--a10 | 9 +- hosts/taishan200-2280-2s64p-256g--a3 | 24 - hosts/taishan200-2280-2s64p-256g--a36 | 25 + hosts/taishan200-2280-2s64p-256g--a4 | 24 - hosts/taishan200-2280-2s64p-256g--a40 | 22 + hosts/taishan200-2280-2s64p-256g--a41 | 22 + hosts/taishan200-2280-2s64p-256g--a42 | 22 + hosts/taishan200-2280-2s64p-256g--a8 | 15 - hosts/taishan200-2280-2s64p-256g--a9 | 4 +- 46 files changed, 630 insertions(+), 1888 deletions(-) delete mode 100644 hosts/0001-add-new-hosts-file.patch delete mode 100644 hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch delete mode 100644 hosts/0003-hosts-file-add-ipmi_ip.patch create mode 100644 hosts/m create mode 100644 hosts/p delete mode 100644 hosts/taishan200-2280-2s48p-256g--a11 create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a3 create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a4 create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a8 diff --git a/hosts/0001-add-new-hosts-file.patch b/hosts/0001-add-new-hosts-file.patch deleted file mode 100644 index 18318eb..0000000 --- a/hosts/0001-add-new-hosts-file.patch +++ /dev/null @@ -1,913 +0,0 @@ -From bdf38f06d38302d4510387bc41b1bdce52518665 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Fri, 9 Oct 2020 19:14:31 +0800 -Subject: [PATCH lab-z9 1/3] add new hosts file - ---- - hosts/taishan200-2280-2s48p-256g--a13 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a14 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a15 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a17 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a18 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a19 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a21 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a22 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a24 | 7 +++---- - hosts/taishan200-2280-2s48p-256g--a25 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a26 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a27 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a28 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a29 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a30 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a31 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a32 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a33 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a34 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a52 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a53 | 17 +++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a60 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a61 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a62 | 19 +++++++++++++++++++ - hosts/taishan200-2280-2s48p-256g--a66 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a67 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a68 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a69 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a70 | 5 ++--- - hosts/taishan200-2280-2s48p-256g--a71 | 2 +- - hosts/taishan200-2280-2s64p-256g--a10 | 8 ++++++-- - hosts/taishan200-2280-2s64p-256g--a36 | 24 ++++++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a40 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a41 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a42 | 21 +++++++++++++++++++++ - hosts/taishan200-2280-2s64p-256g--a9 | 5 ++--- - 36 files changed, 527 insertions(+), 28 deletions(-) - create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 - create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 - create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 - -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -new file mode 100644 -index 0000000..1c8f554 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500c2799bb3 -+ - /dev/disk/by-id/scsi-35000c500c278b18b -+ - /dev/disk/by-id/scsi-35000c500c279f96b -+ - /dev/disk/by-id/scsi-35000c500c2789b4b -+mac_addr: -+ - 44:67:47:97:2b:bf -+ - 44:67:47:97:2b:c0 -+ - 44:67:47:97:2b:c1 -+ - 44:67:47:97:2b:c2 -+ - 44:67:47:97:2b:c3 -+ - 44:67:47:97:2b:c4 -+ - 44:67:47:97:2b:c5 -+ - 44:67:47:97:2b:c6 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 -new file mode 100644 -index 0000000..ae84bd5 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88b4475 -+ - /dev/disk/by-id/scsi-350000399b88b4371 -+ - /dev/disk/by-id/scsi-350000399b88b432d -+ - /dev/disk/by-id/scsi-350000399b88b4531 -+mac_addr: -+ - 44:67:47:c9:e9:c2 -+ - 44:67:47:c9:e9:c3 -+ - 44:67:47:c9:e9:c4 -+ - 44:67:47:c9:e9:c5 -+ - 44:67:47:c9:e9:c6 -+ - 44:67:47:c9:e9:c7 -+ - 44:67:47:c9:e9:c8 -+ - 44:67:47:c9:e9:c9 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 -new file mode 100644 -index 0000000..7fa0b67 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b841fff5 -+ - /dev/disk/by-id/scsi-350000399b841fcb9 -+ - /dev/disk/by-id/scsi-350000399b8420a0d -+ - /dev/disk/by-id/scsi-350000399b841ff55 -+mac_addr: -+ - 44:67:47:85:d4:9e -+ - 44:67:47:85:d4:9f -+ - 44:67:47:85:d4:a0 -+ - 44:67:47:85:d4:a1 -+ - 44:67:47:85:d4:a2 -+ - 44:67:47:85:d4:a3 -+ - 44:67:47:85:d4:a4 -+ - 44:67:47:85:d4:a5 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -new file mode 100644 -index 0000000..8be93de ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88b44cd -+ - /dev/disk/by-id/scsi-350000399b88b4541 -+ - /dev/disk/by-id/scsi-350000399b88b4495 -+ - /dev/disk/by-id/scsi-350000399b88b48d1 -+mac_addr: -+ - 44:67:47:c9:ea:1c -+ - 44:67:47:c9:ea:1d -+ - 44:67:47:c9:ea:1e -+ - 44:67:47:c9:ea:1f -+ - 44:67:47:c9:ea:20 -+ - 44:67:47:c9:ea:21 -+ - 44:67:47:c9:ea:22 -+ - 44:67:47:c9:ea:23 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 -new file mode 100644 -index 0000000..e86bdeb ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b891b4d1 -+ - /dev/disk/by-id/scsi-350000399b8890d59 -+ - /dev/disk/by-id/scsi-350000399b8890f65 -+ - /dev/disk/by-id/scsi-350000399b891b3c5 -+mac_addr: -+ - 84:46:fe:3d:a7:e9 -+ - 84:46:fe:3d:a7:ea -+ - 84:46:fe:3d:a7:eb -+ - 84:46:fe:3d:a7:ec -+ - 84:46:fe:3d:a7:ed -+ - 84:46:fe:3d:a7:ee -+ - 84:46:fe:3d:a7:ef -+ - 84:46:fe:3d:a7:f0 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 -new file mode 100644 -index 0000000..0c4a60f ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8923939 -+ - /dev/disk/by-id/scsi-350000399b8420b2d -+ - /dev/disk/by-id/scsi-350000399b891b5c5 -+ - /dev/disk/by-id/scsi-350000399b841f769 -+mac_addr: -+ - 44:67:47:85:d5:48 -+ - 44:67:47:85:d5:49 -+ - 44:67:47:85:d5:4a -+ - 44:67:47:85:d5:4b -+ - 44:67:47:85:d5:4c -+ - 44:67:47:85:d5:4d -+ - 44:67:47:85:d5:4e -+ - 44:67:47:85:d5:4f -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 -new file mode 100644 -index 0000000..51b7709 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf2d5 -+ - /dev/disk/by-id/scsi-350000399b88bf5a5 -+ - /dev/disk/by-id/scsi-350000399b88bf279 -+ - /dev/disk/by-id/scsi-350000399b88bf24d -+mac_addr: -+ - 44:67:47:86:1b:e0 -+ - 44:67:47:86:1b:e1 -+ - 44:67:47:86:1b:e2 -+ - 44:67:47:86:1b:e3 -+ - 44:67:47:86:1b:e4 -+ - 44:67:47:86:1b:e5 -+ - 44:67:47:86:1b:e6 -+ - 44:67:47:86:1b:e7 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 -new file mode 100644 -index 0000000..4de0ad0 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919069 -+ - /dev/disk/by-id/scsi-350000399b8918c15 -+ - /dev/disk/by-id/scsi-350000399b8918c79 -+ - /dev/disk/by-id/scsi-350000399b8918cb9 -+mac_addr: -+ - 44:67:47:d7:6d:14 -+ - 44:67:47:d7:6d:15 -+ - 44:67:47:d7:6d:16 -+ - 44:67:47:d7:6d:17 -+ - 44:67:47:d7:6d:18 -+ - 44:67:47:d7:6d:19 -+ - 44:67:47:d7:6d:1a -+ - 44:67:47:d7:6d:1b -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 -index f46bfab..f47947c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8917d59 -- - /dev/disk/by-id/scsi-350000399b891790d - - /dev/disk/by-id/scsi-350000399b89185d9 --rootfs_partition: -+ - /dev/disk/by-id/scsi-350000399b891790d - - /dev/disk/by-id/scsi-350000399b8917ef1 - mac_addr: - - 44:67:47:c9:d8:f4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 -index ee5eeb3..2f270e8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b4499 - - /dev/disk/by-id/scsi-350000399b88b4455 - - /dev/disk/by-id/scsi-350000399b88b442d --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88b44f9 - mac_addr: - - 44:67:47:c9:ea:08 -diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 -new file mode 100644 -index 0000000..b6de96e ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf131 -+ - /dev/disk/by-id/scsi-350000399b88bfd8d -+ - /dev/disk/by-id/scsi-350000399b88bfe55 -+ - /dev/disk/by-id/scsi-350000399b88bef31 -+mac_addr: -+ - 44:67:47:c9:e9:40 -+ - 44:67:47:c9:e9:41 -+ - 44:67:47:c9:e9:42 -+ - 44:67:47:c9:e9:43 -+ - 44:67:47:c9:e9:44 -+ - 44:67:47:c9:e9:45 -+ - 44:67:47:c9:e9:46 -+ - 44:67:47:c9:e9:47 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 -new file mode 100644 -index 0000000..b6d9945 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918ea9 -+ - /dev/disk/by-id/scsi-350000399b8918bad -+ - /dev/disk/by-id/scsi-350000399b8918d05 -+ - /dev/disk/by-id/scsi-350000399b8919415 -+mac_addr: -+ - 44:67:47:d7:6d:3c -+ - 44:67:47:d7:6d:3d -+ - 44:67:47:d7:6d:3e -+ - 44:67:47:d7:6d:3f -+ - 44:67:47:d7:6d:40 -+ - 44:67:47:d7:6d:41 -+ - 44:67:47:d7:6d:42 -+ - 44:67:47:d7:6d:43 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 -new file mode 100644 -index 0000000..ecebafc ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500cdf1eb07 -+ - /dev/disk/by-id/scsi-35000c500cdef4c6f -+ - /dev/disk/by-id/scsi-35000c500cdefac2b -+ - /dev/disk/by-id/scsi-35000c500cdefa75f -+mac_addr: -+ - 5c:e8:83:31:c8:20 -+ - 5c:e8:83:31:c8:21 -+ - 5c:e8:83:31:c8:22 -+ - 5c:e8:83:31:c8:23 -+ - 5c:e8:83:31:c8:24 -+ - 5c:e8:83:31:c8:25 -+ - 5c:e8:83:31:c8:26 -+ - 5c:e8:83:31:c8:27 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 -new file mode 100644 -index 0000000..bdb13ca ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918425 -+ - /dev/disk/by-id/scsi-350000399b891841d -+ - /dev/disk/by-id/scsi-350000399b8917859 -+ - /dev/disk/by-id/scsi-350000399b8917a51 -+mac_addr: -+ - 44:67:47:c9:d8:ea -+ - 44:67:47:c9:d8:eb -+ - 44:67:47:c9:d8:ec -+ - 44:67:47:c9:d8:ed -+ - 44:67:47:c9:d8:ee -+ - 44:67:47:c9:d8:ef -+ - 44:67:47:c9:d8:f0 -+ - 44:67:47:c9:d8:f1 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 -new file mode 100644 -index 0000000..810859b ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b883b881 -+ - /dev/disk/by-id/scsi-350000399b88bf83d -+ - /dev/disk/by-id/scsi-350000399b883bbbd -+ - /dev/disk/by-id/scsi-350000399b88bf48d -+mac_addr: -+ - 44:67:47:86:1b:cc -+ - 44:67:47:86:1b:cd -+ - 44:67:47:86:1b:ce -+ - 44:67:47:86:1b:cf -+ - 44:67:47:86:1b:d0 -+ - 44:67:47:86:1b:d1 -+ - 44:67:47:86:1b:d2 -+ - 44:67:47:86:1b:d3 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 -new file mode 100644 -index 0000000..8f9d13b ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b883b929 -+ - /dev/disk/by-id/scsi-350000399b883bbe1 -+ - /dev/disk/by-id/scsi-350000399b883c059 -+ - /dev/disk/by-id/scsi-350000399b883bc9d -+mac_addr: -+ - 44:67:47:86:1b:ae -+ - 44:67:47:86:1b:af -+ - 44:67:47:86:1b:b0 -+ - 44:67:47:86:1b:b1 -+ - 44:67:47:86:1b:b2 -+ - 44:67:47:86:1b:b3 -+ - 44:67:47:86:1b:b4 -+ - 44:67:47:86:1b:b5 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 -new file mode 100644 -index 0000000..66d9b68 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88bf141 -+ - /dev/disk/by-id/scsi-350000399b88bee25 -+ - /dev/disk/by-id/scsi-350000399b88bea59 -+ - /dev/disk/by-id/scsi-350000399b88be1d9 -+mac_addr: -+ - 44:67:47:c9:db:38 -+ - 44:67:47:c9:db:39 -+ - 44:67:47:c9:db:3a -+ - 44:67:47:c9:db:3b -+ - 44:67:47:c9:db:3c -+ - 44:67:47:c9:db:3d -+ - 44:67:47:c9:db:3e -+ - 44:67:47:c9:db:3f -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 -new file mode 100644 -index 0000000..ef3b148 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919555 -+ - /dev/disk/by-id/scsi-350000399b8918c4d -+ - /dev/disk/by-id/scsi-350000399b8919c3d -+ - /dev/disk/by-id/scsi-350000399b8919389 -+mac_addr: -+ - 44:67:47:d7:6c:c4 -+ - 44:67:47:d7:6c:c5 -+ - 44:67:47:d7:6c:c6 -+ - 44:67:47:d7:6c:c7 -+ - 44:67:47:d7:6c:c8 -+ - 44:67:47:d7:6c:c9 -+ - 44:67:47:d7:6c:ca -+ - 44:67:47:d7:6c:cb -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 -new file mode 100644 -index 0000000..528ec82 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b88be219 -+ - /dev/disk/by-id/scsi-350000399b88bdf71 -+ - /dev/disk/by-id/scsi-350000399b88bdb49 -+ - /dev/disk/by-id/scsi-350000399b891784d -+mac_addr: -+ - 44:67:47:c9:d9:26 -+ - 44:67:47:c9:d9:27 -+ - 44:67:47:c9:d9:28 -+ - 44:67:47:c9:d9:29 -+ - 44:67:47:c9:d9:2a -+ - 44:67:47:c9:d9:2b -+ - 44:67:47:c9:d9:2c -+ - 44:67:47:c9:d9:2d -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -new file mode 100644 -index 0000000..4353d4c ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500cdefd89b -+ - /dev/disk/by-id/scsi-35000c500cdefac67 -+ - /dev/disk/by-id/scsi-35000c500cdedee6f -+ - /dev/disk/by-id/scsi-35000c500cdedfdaf -+mac_addr: -+ - 5c:e8:83:31:c8:d4 -+ - 5c:e8:83:31:c8:d5 -+ - 5c:e8:83:31:c8:d6 -+ - 5c:e8:83:31:c8:d7 -+ - 5c:e8:83:31:c8:d8 -+ - 5c:e8:83:31:c8:d9 -+ - 5c:e8:83:31:c8:da -+ - 5c:e8:83:31:c8:db -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 -new file mode 100644 -index 0000000..0df1cd9 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -0,0 +1,17 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500bd6aa4e3 -+ - /dev/disk/by-id/scsi-35000c500bd681acf -+mac_addr: -+ - 5c:e8:83:73:25:c9 -+ - 5c:e8:83:73:25:ca -+ - 5c:e8:83:73:25:cb -+ - 5c:e8:83:73:25:cc -+ - 5c:e8:83:73:25:cd -+ - 5c:e8:83:73:25:ce -+ - 5c:e8:83:73:25:cf -+ - 5c:e8:83:73:25:d0 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 -new file mode 100644 -index 0000000..6986a8f ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-35000c500bd67640b -+ - /dev/disk/by-id/scsi-35000c500bd6707a7 -+ - /dev/disk/by-id/scsi-35000c500bd680dc3 -+ - /dev/disk/by-id/scsi-35000c500bd683a73 -+mac_addr: -+ - e0:00:84:2b:51:7d -+ - e0:00:84:2b:51:7e -+ - e0:00:84:2b:51:7f -+ - e0:00:84:2b:51:80 -+ - e0:00:84:2b:51:81 -+ - e0:00:84:2b:51:82 -+ - e0:00:84:2b:51:83 -+ - e0:00:84:2b:51:84 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 -new file mode 100644 -index 0000000..1c198b8 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399886a7869 -+ - /dev/disk/by-id/scsi-350000399886acc5d -+ - /dev/disk/by-id/scsi-350000399886b6861 -+ - /dev/disk/by-id/scsi-350000399886ac70d -+mac_addr: -+ - 44:67:47:c9:e4:b8 -+ - 44:67:47:c9:e4:b9 -+ - 44:67:47:c9:e4:ba -+ - 44:67:47:c9:e4:bb -+ - 44:67:47:c9:e4:bc -+ - 44:67:47:c9:e4:bd -+ - 44:67:47:c9:e4:be -+ - 44:67:47:c9:e4:bf -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 -new file mode 100644 -index 0000000..26ab646 ---- /dev/null -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -0,0 +1,19 @@ -+nr_node: 4 -+nr_cpu: 96 -+memory: 252G -+nr_hdd_partitions: 4 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b892d131 -+ - /dev/disk/by-id/scsi-350000399b892d619 -+ - /dev/disk/by-id/scsi-350000399b892dc1d -+ - /dev/disk/by-id/scsi-350000399b892dbb5 -+mac_addr: -+ - 44:67:47:c9:e3:3a -+ - 44:67:47:c9:e3:3b -+ - 44:67:47:c9:e3:3c -+ - 44:67:47:c9:e3:3d -+ - 44:67:47:c9:e3:3e -+ - 44:67:47:c9:e3:3f -+ - 44:67:47:c9:e3:40 -+ - 44:67:47:c9:e3:41 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index 881f2d6..c7b2083 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c5009a671773 - - /dev/disk/by-id/scsi-35000c5009a690c53 - - /dev/disk/by-id/scsi-35000c5009a6713fb --rootfs_partition: - - /dev/disk/by-id/scsi-35000c5009a65963f - mac_addr: - - 5c:e8:83:31:c8:8e -diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 -index d23d755..f207003 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88aed21 - - /dev/disk/by-id/scsi-350000399b88af325 - - /dev/disk/by-id/scsi-350000399b88af699 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88af421 - mac_addr: - - 44:67:47:c9:e2:2c -diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 -index 0ceb191..054105c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8909f81 - - /dev/disk/by-id/scsi-350000399b8909f79 - - /dev/disk/by-id/scsi-350000399b8909605 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8909b85 - mac_addr: - - 84:46:fe:89:b6:e6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 -index 5e948ee..e96e34c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be92d - - /dev/disk/by-id/scsi-350000399b88befc5 - - /dev/disk/by-id/scsi-350000399b88be701 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b88bea5d - mac_addr: - - 44:67:47:c9:d9:4e -diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 -index 760ce0c..61f99a3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -1,12 +1,11 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G --nr_hdd_partitions: 3 -+memory: 252G -+nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b890931d - - /dev/disk/by-id/scsi-350000399b8909d79 - - /dev/disk/by-id/scsi-350000399b8909ac5 --rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8909c99 - mac_addr: - - 84:46:fe:89:b7:22 -diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 -index dde6205..4896475 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 256G -+memory: 252G - mac_addr: - - 44:67:47:d7:6d:e6 - - 44:67:47:d7:6d:e7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index 15a9315..a66bff0 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -1,7 +1,11 @@ - nr_node: 4 - nr_cpu: 128 --memory: 256G --rootfs_partition: -+memory: 252G -+nr_hdd_partitions: 1 -+nr_ssd_partitions: 1 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399c8030fd5 -+ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 - mac_addr: - - 44:67:47:86:2c:95 -diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 -new file mode 100644 -index 0000000..d9f1184 ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a36 -@@ -0,0 +1,24 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 255G -+nr_hdd_partitions: 1 -+nr_ssd_partitions: 1 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-3500003999813487d -+ssd_partitions: -+ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 -+ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 -+mac_addr: -+ - 84:46:fe:73:b2:75 -+ - 84:46:fe:73:b2:76 -+ - 84:46:fe:73:b2:77 -+ - 84:46:fe:73:b2:78 -+ - ac:b3:b5:1e:bd:5b -+ - ac:b3:b5:1e:bd:5c -+ - ac:b3:b5:1e:bd:5d -+ - ac:b3:b5:1e:bd:5e -+ - ac:b3:b5:1e:bd:bb -+ - ac:b3:b5:1e:bd:bc -+ - ac:b3:b5:1e:bd:bd -+ - ac:b3:b5:1e:bd:be -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -new file mode 100644 -index 0000000..91f5619 ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-3500003999812ed81 -+ - /dev/disk/by-id/scsi-350000399c8020115 -+mac_addr: -+ - 84:46:fe:89:be:8e -+ - 84:46:fe:89:be:8f -+ - 84:46:fe:89:be:90 -+ - 84:46:fe:89:be:91 -+ - ac:b3:b5:1e:d7:3b -+ - ac:b3:b5:1e:d7:3c -+ - ac:b3:b5:1e:d7:3d -+ - ac:b3:b5:1e:d7:3e -+ - ac:b3:b5:1e:d6:cb -+ - ac:b3:b5:1e:d6:cc -+ - ac:b3:b5:1e:d6:cd -+ - ac:b3:b5:1e:d6:ce -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 -new file mode 100644 -index 0000000..9525cfd ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8919495 -+ - /dev/disk/by-id/scsi-35000039998130a85 -+mac_addr: -+ - 84:46:fe:89:bc:4a -+ - 84:46:fe:89:bc:4b -+ - 84:46:fe:89:bc:4c -+ - 84:46:fe:89:bc:4d -+ - ac:b3:b5:1e:b6:db -+ - ac:b3:b5:1e:b6:dc -+ - ac:b3:b5:1e:b6:dd -+ - ac:b3:b5:1e:b6:de -+ - ac:b3:b5:1e:b7:5b -+ - ac:b3:b5:1e:b7:5c -+ - ac:b3:b5:1e:b7:5d -+ - ac:b3:b5:1e:b7:5e -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 -new file mode 100644 -index 0000000..40c1c4b ---- /dev/null -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -0,0 +1,21 @@ -+nr_node: 4 -+nr_cpu: 128 -+memory: 252G -+nr_hdd_partitions: 2 -+hdd_partitions: -+ - /dev/disk/by-id/scsi-350000399b8918a11 -+ - /dev/disk/by-id/scsi-350000399c802ee75 -+mac_addr: -+ - cc:05:77:fe:d8:64 -+ - cc:05:77:fe:d8:65 -+ - cc:05:77:fe:d8:66 -+ - cc:05:77:fe:d8:67 -+ - 44:a1:91:35:6c:50 -+ - 44:a1:91:35:6c:51 -+ - 44:a1:91:35:6c:52 -+ - 44:a1:91:35:6c:53 -+ - 44:a1:91:35:68:d0 -+ - 44:a1:91:35:68:d1 -+ - 44:a1:91:35:68:d2 -+ - 44:a1:91:35:68:d3 -+model_name: Kunpeng-920 -diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 -index d6c4353..e360e88 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a9 -+++ b/hosts/taishan200-2280-2s64p-256g--a9 -@@ -1,10 +1,9 @@ - nr_node: 4 - nr_cpu: 128 --memory: 128G --nr_hdd_partitions: 1 -+memory: 126G -+nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500bd6a1347 --rootfs_partition: - - /dev/disk/by-id/scsi-35000c500bd62acb3 - mac_addr: - - cc:05:77:fe:d4:0e --- -2.23.0 - diff --git a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch deleted file mode 100644 index f16c13b..0000000 --- a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch +++ /dev/null @@ -1,454 +0,0 @@ -From 5eb020ab8c2591423a1ec55aadf716191ba9b1f3 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Sat, 10 Oct 2020 09:44:42 +0800 -Subject: [PATCH lab-z9 2/3] fix memory size, and the 128G's host will be added - to 256G as soon - ---- - hosts/taishan200-2280-2s48p-256g--a13 | 2 +- - hosts/taishan200-2280-2s48p-256g--a14 | 2 +- - hosts/taishan200-2280-2s48p-256g--a15 | 2 +- - hosts/taishan200-2280-2s48p-256g--a17 | 2 +- - hosts/taishan200-2280-2s48p-256g--a18 | 2 +- - hosts/taishan200-2280-2s48p-256g--a19 | 2 +- - hosts/taishan200-2280-2s48p-256g--a21 | 2 +- - hosts/taishan200-2280-2s48p-256g--a22 | 2 +- - hosts/taishan200-2280-2s48p-256g--a24 | 2 +- - hosts/taishan200-2280-2s48p-256g--a25 | 2 +- - hosts/taishan200-2280-2s48p-256g--a26 | 2 +- - hosts/taishan200-2280-2s48p-256g--a27 | 2 +- - hosts/taishan200-2280-2s48p-256g--a28 | 2 +- - hosts/taishan200-2280-2s48p-256g--a29 | 2 +- - hosts/taishan200-2280-2s48p-256g--a30 | 2 +- - hosts/taishan200-2280-2s48p-256g--a31 | 2 +- - hosts/taishan200-2280-2s48p-256g--a32 | 2 +- - hosts/taishan200-2280-2s48p-256g--a33 | 2 +- - hosts/taishan200-2280-2s48p-256g--a34 | 2 +- - hosts/taishan200-2280-2s48p-256g--a52 | 2 +- - hosts/taishan200-2280-2s48p-256g--a53 | 2 +- - hosts/taishan200-2280-2s48p-256g--a60 | 2 +- - hosts/taishan200-2280-2s48p-256g--a61 | 2 +- - hosts/taishan200-2280-2s48p-256g--a62 | 2 +- - hosts/taishan200-2280-2s48p-256g--a66 | 2 +- - hosts/taishan200-2280-2s48p-256g--a67 | 2 +- - hosts/taishan200-2280-2s48p-256g--a68 | 2 +- - hosts/taishan200-2280-2s48p-256g--a69 | 2 +- - hosts/taishan200-2280-2s48p-256g--a70 | 2 +- - hosts/taishan200-2280-2s48p-256g--a71 | 2 +- - hosts/taishan200-2280-2s64p-256g--a10 | 2 +- - hosts/taishan200-2280-2s64p-256g--a40 | 2 +- - hosts/taishan200-2280-2s64p-256g--a41 | 2 +- - hosts/taishan200-2280-2s64p-256g--a42 | 2 +- - 34 files changed, 34 insertions(+), 34 deletions(-) - -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -index 1c8f554..fe05233 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a13 -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500c2799bb3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 -index ae84bd5..bd5962b 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a14 -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b4475 -diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 -index 7fa0b67..9b0cd96 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a15 -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b841fff5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -index 8be93de..cbbf268 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a17 -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b44cd -diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 -index e86bdeb..648a1db 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a18 -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b891b4d1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 -index 0c4a60f..2aec477 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a19 -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8923939 -diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 -index 51b7709..9cbb5b5 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a21 -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88bf2d5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 -index 4de0ad0..6af83a7 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a22 -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8919069 -diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 -index f47947c..dd9b501 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8917d59 -diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 -index 2f270e8..5d075b9 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b4499 -diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 -index b6de96e..fe395ec 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a26 -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88bf131 -diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 -index b6d9945..63b94f3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a27 -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8918ea9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 -index ecebafc..df048f7 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a28 -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500cdf1eb07 -diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 -index bdb13ca..849be55 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a29 -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8918425 -diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 -index 810859b..2be9047 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a30 -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b883b881 -diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 -index 8f9d13b..8af7d18 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a31 -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b883b929 -diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 -index 66d9b68..fb52e7f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a32 -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88bf141 -diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 -index ef3b148..4095419 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a33 -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8919555 -diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 -index 528ec82..bae3e58 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a34 -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be219 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -index 4353d4c..654b021 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a52 -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500cdefd89b -diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 -index 0df1cd9..a90b8eb 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a53 -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500bd6aa4e3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 -index 6986a8f..b87d962 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a60 -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c500bd67640b -diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 -index 1c198b8..b33712c 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a61 -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399886a7869 -diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 -index 26ab646..5c3b04d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a62 -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b892d131 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index c7b2083..88ef791 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-35000c5009a671773 -diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 -index f207003..97ea498 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88aed21 -diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 -index 054105c..f3d50f4 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8909f81 -diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 -index e96e34c..9e5734e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be92d -diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 -index 61f99a3..0dd8208 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - nr_hdd_partitions: 4 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b890931d -diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 -index 4896475..dde6205 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 96 --memory: 252G -+memory: 256G - mac_addr: - - 44:67:47:d7:6d:e6 - - 44:67:47:d7:6d:e7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index a66bff0..4687d1a 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 1 - nr_ssd_partitions: 1 - hdd_partitions: -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -index 91f5619..c0ce550 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a40 -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-3500003999812ed81 -diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 -index 9525cfd..9e01396 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a41 -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8919495 -diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 -index 40c1c4b..1a953df 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a42 -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -1,6 +1,6 @@ - nr_node: 4 - nr_cpu: 128 --memory: 252G -+memory: 256G - nr_hdd_partitions: 2 - hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8918a11 --- -2.23.0 - diff --git a/hosts/0003-hosts-file-add-ipmi_ip.patch b/hosts/0003-hosts-file-add-ipmi_ip.patch deleted file mode 100644 index 5201fc3..0000000 --- a/hosts/0003-hosts-file-add-ipmi_ip.patch +++ /dev/null @@ -1,411 +0,0 @@ -From 02376f205393290c0fef2452decbe23836362204 Mon Sep 17 00:00:00 2001 -From: Zhang Dewan <513619464(a)qq.com> -Date: Tue, 13 Oct 2020 14:49:53 +0800 -Subject: [PATCH lab-z9 3/3] hosts file add ipmi_ip - ---- - hosts/taishan200-2280-2s48p-256g--a11 | 1 + - hosts/taishan200-2280-2s48p-256g--a13 | 1 + - hosts/taishan200-2280-2s48p-256g--a14 | 1 + - hosts/taishan200-2280-2s48p-256g--a15 | 1 + - hosts/taishan200-2280-2s48p-256g--a17 | 1 + - hosts/taishan200-2280-2s48p-256g--a18 | 1 + - hosts/taishan200-2280-2s48p-256g--a19 | 1 + - hosts/taishan200-2280-2s48p-256g--a21 | 1 + - hosts/taishan200-2280-2s48p-256g--a22 | 1 + - hosts/taishan200-2280-2s48p-256g--a24 | 1 + - hosts/taishan200-2280-2s48p-256g--a25 | 1 + - hosts/taishan200-2280-2s48p-256g--a26 | 1 + - hosts/taishan200-2280-2s48p-256g--a27 | 1 + - hosts/taishan200-2280-2s48p-256g--a28 | 1 + - hosts/taishan200-2280-2s48p-256g--a29 | 1 + - hosts/taishan200-2280-2s48p-256g--a30 | 1 + - hosts/taishan200-2280-2s48p-256g--a31 | 1 + - hosts/taishan200-2280-2s48p-256g--a32 | 1 + - hosts/taishan200-2280-2s48p-256g--a33 | 1 + - hosts/taishan200-2280-2s48p-256g--a34 | 1 + - hosts/taishan200-2280-2s48p-256g--a52 | 1 + - hosts/taishan200-2280-2s48p-256g--a53 | 1 + - hosts/taishan200-2280-2s48p-256g--a60 | 1 + - hosts/taishan200-2280-2s48p-256g--a61 | 1 + - hosts/taishan200-2280-2s48p-256g--a62 | 1 + - hosts/taishan200-2280-2s48p-256g--a66 | 1 + - hosts/taishan200-2280-2s48p-256g--a67 | 1 + - hosts/taishan200-2280-2s48p-256g--a68 | 1 + - hosts/taishan200-2280-2s48p-256g--a69 | 1 + - hosts/taishan200-2280-2s48p-256g--a70 | 1 + - hosts/taishan200-2280-2s48p-256g--a71 | 1 + - hosts/taishan200-2280-2s64p-256g--a10 | 1 + - hosts/taishan200-2280-2s64p-256g--a3 | 1 + - hosts/taishan200-2280-2s64p-256g--a36 | 1 + - hosts/taishan200-2280-2s64p-256g--a4 | 1 + - hosts/taishan200-2280-2s64p-256g--a40 | 1 + - hosts/taishan200-2280-2s64p-256g--a41 | 1 + - hosts/taishan200-2280-2s64p-256g--a42 | 1 + - hosts/taishan200-2280-2s64p-256g--a8 | 1 + - hosts/taishan200-2280-2s64p-256g--a9 | 1 + - 40 files changed, 40 insertions(+) - -diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 -index b23cb94..a281e24 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a11 -+++ b/hosts/taishan200-2280-2s48p-256g--a11 -@@ -18,3 +18,4 @@ mac_addr: - - cc:05:77:ab:97:68 - - cc:05:77:ab:97:69 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 -index fe05233..78cd2ee 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a13 -+++ b/hosts/taishan200-2280-2s48p-256g--a13 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:97:2b:c5 - - 44:67:47:97:2b:c6 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 -index bd5962b..162e687 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a14 -+++ b/hosts/taishan200-2280-2s48p-256g--a14 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e9:c8 - - 44:67:47:c9:e9:c9 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 -index 9b0cd96..3890ff0 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a15 -+++ b/hosts/taishan200-2280-2s48p-256g--a15 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:85:d4:a4 - - 44:67:47:85:d4:a5 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 -index cbbf268..f2146f8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a17 -+++ b/hosts/taishan200-2280-2s48p-256g--a17 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:ea:22 - - 44:67:47:c9:ea:23 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 -index 648a1db..e0ca747 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a18 -+++ b/hosts/taishan200-2280-2s48p-256g--a18 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:3d:a7:ef - - 84:46:fe:3d:a7:f0 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 -index 2aec477..2b3c440 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a19 -+++ b/hosts/taishan200-2280-2s48p-256g--a19 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:85:d5:4e - - 44:67:47:85:d5:4f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 -index 9cbb5b5..44c4e64 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a21 -+++ b/hosts/taishan200-2280-2s48p-256g--a21 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:e6 - - 44:67:47:86:1b:e7 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 -index 6af83a7..b6d10af 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a22 -+++ b/hosts/taishan200-2280-2s48p-256g--a22 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6d:1a - - 44:67:47:d7:6d:1b - model_name: Kunpeng-920 -+ipmi_ip: 9.3.5.12 -diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 -index dd9b501..5e1571d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a24 -+++ b/hosts/taishan200-2280-2s48p-256g--a24 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d8:fa - - 44:67:47:c9:d8:fb - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 -index 5d075b9..1f3f599 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a25 -+++ b/hosts/taishan200-2280-2s48p-256g--a25 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:ea:0e - - 44:67:47:c9:ea:0f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.2 -diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 -index fe395ec..b136009 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a26 -+++ b/hosts/taishan200-2280-2s48p-256g--a26 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e9:46 - - 44:67:47:c9:e9:47 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 -index 63b94f3..96a387d 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a27 -+++ b/hosts/taishan200-2280-2s48p-256g--a27 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6d:42 - - 44:67:47:d7:6d:43 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.4 -diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 -index df048f7..5a4f298 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a28 -+++ b/hosts/taishan200-2280-2s48p-256g--a28 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:26 - - 5c:e8:83:31:c8:27 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 -index 849be55..5b7c0b8 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a29 -+++ b/hosts/taishan200-2280-2s48p-256g--a29 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d8:f0 - - 44:67:47:c9:d8:f1 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 -index 2be9047..2c8d2d3 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a30 -+++ b/hosts/taishan200-2280-2s48p-256g--a30 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:d2 - - 44:67:47:86:1b:d3 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 -index 8af7d18..9aec903 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a31 -+++ b/hosts/taishan200-2280-2s48p-256g--a31 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:86:1b:b4 - - 44:67:47:86:1b:b5 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 -index fb52e7f..d677838 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a32 -+++ b/hosts/taishan200-2280-2s48p-256g--a32 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:db:3e - - 44:67:47:c9:db:3f - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 -index 4095419..d4df847 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a33 -+++ b/hosts/taishan200-2280-2s48p-256g--a33 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:d7:6c:ca - - 44:67:47:d7:6c:cb - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.10 -diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 -index bae3e58..680cb6f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a34 -+++ b/hosts/taishan200-2280-2s48p-256g--a34 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d9:2c - - 44:67:47:c9:d9:2d - model_name: Kunpeng-920 -+ipmi_ip: 9.3.9.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 -index 654b021..a64cdec 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a52 -+++ b/hosts/taishan200-2280-2s48p-256g--a52 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:da - - 5c:e8:83:31:c8:db - model_name: Kunpeng-920 -+ipmi_ip: 9.3.3.5 -diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 -index a90b8eb..148e747 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a53 -+++ b/hosts/taishan200-2280-2s48p-256g--a53 -@@ -15,3 +15,4 @@ mac_addr: - - 5c:e8:83:73:25:cf - - 5c:e8:83:73:25:d0 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.3.6 -diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 -index b87d962..9e969b0 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a60 -+++ b/hosts/taishan200-2280-2s48p-256g--a60 -@@ -17,3 +17,4 @@ mac_addr: - - e0:00:84:2b:51:83 - - e0:00:84:2b:51:84 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.1 -diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 -index b33712c..2992c6f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a61 -+++ b/hosts/taishan200-2280-2s48p-256g--a61 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e4:be - - 44:67:47:c9:e4:bf - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.2 -diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 -index 5c3b04d..5262637 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a62 -+++ b/hosts/taishan200-2280-2s48p-256g--a62 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e3:40 - - 44:67:47:c9:e3:41 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.3 -diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 -index 88ef791..b7a3715 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a66 -+++ b/hosts/taishan200-2280-2s48p-256g--a66 -@@ -17,3 +17,4 @@ mac_addr: - - 5c:e8:83:31:c8:94 - - 5c:e8:83:31:c8:95 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.7 -diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 -index 97ea498..2501f6e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a67 -+++ b/hosts/taishan200-2280-2s48p-256g--a67 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:e2:32 - - 44:67:47:c9:e2:33 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.8 -diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 -index f3d50f4..c51e348 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a68 -+++ b/hosts/taishan200-2280-2s48p-256g--a68 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:89:b6:ec - - 84:46:fe:89:b6:ed - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.9 -diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 -index 9e5734e..964f79e 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a69 -+++ b/hosts/taishan200-2280-2s48p-256g--a69 -@@ -17,3 +17,4 @@ mac_addr: - - 44:67:47:c9:d9:54 - - 44:67:47:c9:d9:55 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.10 -diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 -index 0dd8208..2424a9f 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a70 -+++ b/hosts/taishan200-2280-2s48p-256g--a70 -@@ -17,3 +17,4 @@ mac_addr: - - 84:46:fe:89:b7:28 - - 84:46:fe:89:b7:29 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.11 -diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 -index dde6205..501ea4b 100644 ---- a/hosts/taishan200-2280-2s48p-256g--a71 -+++ b/hosts/taishan200-2280-2s48p-256g--a71 -@@ -11,3 +11,4 @@ mac_addr: - - 44:67:47:d7:6d:ec - - 44:67:47:d7:6d:ed - model_name: Kunpeng-920 -+ipmi_ip: 9.3.4.12 -diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 -index 4687d1a..fcc6c63 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a10 -+++ b/hosts/taishan200-2280-2s64p-256g--a10 -@@ -21,3 +21,4 @@ mac_addr: - - ac:b3:b5:1e:d5:4d - - ac:b3:b5:1e:d5:4e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.10 -diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 -index 1bdadca..744978e 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a3 -+++ b/hosts/taishan200-2280-2s64p-256g--a3 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1f:74:f0 - - ac:b3:b5:1f:74:f1 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.3 -diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 -index d9f1184..e04bc3a 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a36 -+++ b/hosts/taishan200-2280-2s64p-256g--a36 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1e:bd:bd - - ac:b3:b5:1e:bd:be - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.1 -diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 -index 8ef481c..0f73c52 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a4 -+++ b/hosts/taishan200-2280-2s64p-256g--a4 -@@ -22,3 +22,4 @@ mac_addr: - - ac:b3:b5:1f:7d:50 - - ac:b3:b5:1f:7d:51 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.4 -diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 -index c0ce550..3172475 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a40 -+++ b/hosts/taishan200-2280-2s64p-256g--a40 -@@ -19,3 +19,4 @@ mac_addr: - - ac:b3:b5:1e:d6:cd - - ac:b3:b5:1e:d6:ce - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.5 -diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 -index 9e01396..4253e1f 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a41 -+++ b/hosts/taishan200-2280-2s64p-256g--a41 -@@ -19,3 +19,4 @@ mac_addr: - - ac:b3:b5:1e:b7:5d - - ac:b3:b5:1e:b7:5e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.6 -diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 -index 1a953df..dce3cf0 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a42 -+++ b/hosts/taishan200-2280-2s64p-256g--a42 -@@ -19,3 +19,4 @@ mac_addr: - - 44:a1:91:35:68:d2 - - 44:a1:91:35:68:d3 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.2.7 -diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 -index fd22672..64f2750 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a8 -+++ b/hosts/taishan200-2280-2s64p-256g--a8 -@@ -13,3 +13,4 @@ mac_addr: - - ac:b3:b5:1e:b6:7d - - ac:b3:b5:1e:b6:7e - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.8 -diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 -index e360e88..f977a7c 100644 ---- a/hosts/taishan200-2280-2s64p-256g--a9 -+++ b/hosts/taishan200-2280-2s64p-256g--a9 -@@ -15,3 +15,4 @@ mac_addr: - - 44:a1:91:35:1a:72 - - 44:a1:91:35:1a:73 - model_name: Kunpeng-920 -+ipmi_ip: 9.3.1.9 --- -2.23.0 - diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..ae2c84f --- /dev/null +++ b/hosts/m @@ -0,0 +1,37 @@ +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a35 a35 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 deleted file mode 100644 index b23cb94..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ /dev/null @@ -1,20 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8891431-part1 - - /dev/disk/by-id/scsi-350000399b8890e09 - - /dev/disk/by-id/scsi-350000399b8890cd1 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399b8727929 -mac_addr: - - cc:05:77:ab:97:62 - - cc:05:77:ab:97:63 - - cc:05:77:ab:97:64 - - cc:05:77:ab:97:65 - - cc:05:77:ab:97:66 - - cc:05:77:ab:97:67 - - cc:05:77:ab:97:68 - - cc:05:77:ab:97:69 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 new file mode 100644 index 0000000..7fca8ed --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c2799bb3 + - /dev/disk/by-id/scsi-35000c500c278b18b + - /dev/disk/by-id/scsi-35000c500c279f96b + - /dev/disk/by-id/scsi-35000c500c2789b4b +mac_addr: + - 44:67:47:97:2b:bf + - 44:67:47:97:2b:c0 + - 44:67:47:97:2b:c1 + - 44:67:47:97:2b:c2 + - 44:67:47:97:2b:c3 + - 44:67:47:97:2b:c4 + - 44:67:47:97:2b:c5 + - 44:67:47:97:2b:c6 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 new file mode 100644 index 0000000..7134e6c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4475 + - /dev/disk/by-id/scsi-350000399b88b4371 + - /dev/disk/by-id/scsi-350000399b88b432d + - /dev/disk/by-id/scsi-350000399b88b4531 +mac_addr: + - 44:67:47:c9:e9:c2 + - 44:67:47:c9:e9:c3 + - 44:67:47:c9:e9:c4 + - 44:67:47:c9:e9:c5 + - 44:67:47:c9:e9:c6 + - 44:67:47:c9:e9:c7 + - 44:67:47:c9:e9:c8 + - 44:67:47:c9:e9:c9 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 new file mode 100644 index 0000000..5eb756c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b841fff5 + - /dev/disk/by-id/scsi-350000399b841fcb9 + - /dev/disk/by-id/scsi-350000399b8420a0d + - /dev/disk/by-id/scsi-350000399b841ff55 +mac_addr: + - 44:67:47:85:d4:9e + - 44:67:47:85:d4:9f + - 44:67:47:85:d4:a0 + - 44:67:47:85:d4:a1 + - 44:67:47:85:d4:a2 + - 44:67:47:85:d4:a3 + - 44:67:47:85:d4:a4 + - 44:67:47:85:d4:a5 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 new file mode 100644 index 0000000..e3168bf --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b44cd + - /dev/disk/by-id/scsi-350000399b88b4541 + - /dev/disk/by-id/scsi-350000399b88b4495 + - /dev/disk/by-id/scsi-350000399b88b48d1 +mac_addr: + - 44:67:47:c9:ea:1c + - 44:67:47:c9:ea:1d + - 44:67:47:c9:ea:1e + - 44:67:47:c9:ea:1f + - 44:67:47:c9:ea:20 + - 44:67:47:c9:ea:21 + - 44:67:47:c9:ea:22 + - 44:67:47:c9:ea:23 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 new file mode 100644 index 0000000..12b6f71 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891b4d1 + - /dev/disk/by-id/scsi-350000399b8890d59 + - /dev/disk/by-id/scsi-350000399b8890f65 + - /dev/disk/by-id/scsi-350000399b891b3c5 +mac_addr: + - 84:46:fe:3d:a7:e9 + - 84:46:fe:3d:a7:ea + - 84:46:fe:3d:a7:eb + - 84:46:fe:3d:a7:ec + - 84:46:fe:3d:a7:ed + - 84:46:fe:3d:a7:ee + - 84:46:fe:3d:a7:ef + - 84:46:fe:3d:a7:f0 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 new file mode 100644 index 0000000..a1541c4 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8923939 + - /dev/disk/by-id/scsi-350000399b8420b2d + - /dev/disk/by-id/scsi-350000399b891b5c5 + - /dev/disk/by-id/scsi-350000399b841f769 +mac_addr: + - 44:67:47:85:d5:48 + - 44:67:47:85:d5:49 + - 44:67:47:85:d5:4a + - 44:67:47:85:d5:4b + - 44:67:47:85:d5:4c + - 44:67:47:85:d5:4d + - 44:67:47:85:d5:4e + - 44:67:47:85:d5:4f +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 new file mode 100644 index 0000000..4dea3c8 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf2d5 + - /dev/disk/by-id/scsi-350000399b88bf5a5 + - /dev/disk/by-id/scsi-350000399b88bf279 + - /dev/disk/by-id/scsi-350000399b88bf24d +mac_addr: + - 44:67:47:86:1b:e0 + - 44:67:47:86:1b:e1 + - 44:67:47:86:1b:e2 + - 44:67:47:86:1b:e3 + - 44:67:47:86:1b:e4 + - 44:67:47:86:1b:e5 + - 44:67:47:86:1b:e6 + - 44:67:47:86:1b:e7 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 new file mode 100644 index 0000000..4fabb6f --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919069 + - /dev/disk/by-id/scsi-350000399b8918c15 + - /dev/disk/by-id/scsi-350000399b8918c79 + - /dev/disk/by-id/scsi-350000399b8918cb9 +mac_addr: + - 44:67:47:d7:6d:14 + - 44:67:47:d7:6d:15 + - 44:67:47:d7:6d:16 + - 44:67:47:d7:6d:17 + - 44:67:47:d7:6d:18 + - 44:67:47:d7:6d:19 + - 44:67:47:d7:6d:1a + - 44:67:47:d7:6d:1b +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index f46bfab..64e1f6f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 - - /dev/disk/by-id/scsi-350000399b891790d - /dev/disk/by-id/scsi-350000399b89185d9 -rootfs_partition: + - /dev/disk/by-id/scsi-350000399b891790d - /dev/disk/by-id/scsi-350000399b8917ef1 mac_addr: - 44:67:47:c9:d8:f4 @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:d8:fa - 44:67:47:c9:d8:fb model_name: Kunpeng-920 +ipmi_ip: 9.3.9.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index ee5eeb3..4dfb257 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 - /dev/disk/by-id/scsi-350000399b88b4455 - /dev/disk/by-id/scsi-350000399b88b442d -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88b44f9 mac_addr: - 44:67:47:c9:ea:08 @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:ea:0e - 44:67:47:c9:ea:0f model_name: Kunpeng-920 +ipmi_ip: 9.3.9.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 new file mode 100644 index 0000000..9ecfeee --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf131 + - /dev/disk/by-id/scsi-350000399b88bfd8d + - /dev/disk/by-id/scsi-350000399b88bfe55 + - /dev/disk/by-id/scsi-350000399b88bef31 +mac_addr: + - 44:67:47:c9:e9:40 + - 44:67:47:c9:e9:41 + - 44:67:47:c9:e9:42 + - 44:67:47:c9:e9:43 + - 44:67:47:c9:e9:44 + - 44:67:47:c9:e9:45 + - 44:67:47:c9:e9:46 + - 44:67:47:c9:e9:47 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 new file mode 100644 index 0000000..a529631 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918ea9 + - /dev/disk/by-id/scsi-350000399b8918bad + - /dev/disk/by-id/scsi-350000399b8918d05 + - /dev/disk/by-id/scsi-350000399b8919415 +mac_addr: + - 44:67:47:d7:6d:3c + - 44:67:47:d7:6d:3d + - 44:67:47:d7:6d:3e + - 44:67:47:d7:6d:3f + - 44:67:47:d7:6d:40 + - 44:67:47:d7:6d:41 + - 44:67:47:d7:6d:42 + - 44:67:47:d7:6d:43 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 new file mode 100644 index 0000000..8682c85 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdf1eb07 + - /dev/disk/by-id/scsi-35000c500cdef4c6f + - /dev/disk/by-id/scsi-35000c500cdefac2b + - /dev/disk/by-id/scsi-35000c500cdefa75f +mac_addr: + - 5c:e8:83:31:c8:20 + - 5c:e8:83:31:c8:21 + - 5c:e8:83:31:c8:22 + - 5c:e8:83:31:c8:23 + - 5c:e8:83:31:c8:24 + - 5c:e8:83:31:c8:25 + - 5c:e8:83:31:c8:26 + - 5c:e8:83:31:c8:27 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 new file mode 100644 index 0000000..ec17c19 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918425 + - /dev/disk/by-id/scsi-350000399b891841d + - /dev/disk/by-id/scsi-350000399b8917859 + - /dev/disk/by-id/scsi-350000399b8917a51 +mac_addr: + - 44:67:47:c9:d8:ea + - 44:67:47:c9:d8:eb + - 44:67:47:c9:d8:ec + - 44:67:47:c9:d8:ed + - 44:67:47:c9:d8:ee + - 44:67:47:c9:d8:ef + - 44:67:47:c9:d8:f0 + - 44:67:47:c9:d8:f1 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 new file mode 100644 index 0000000..41e1083 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b881 + - /dev/disk/by-id/scsi-350000399b88bf83d + - /dev/disk/by-id/scsi-350000399b883bbbd + - /dev/disk/by-id/scsi-350000399b88bf48d +mac_addr: + - 44:67:47:86:1b:cc + - 44:67:47:86:1b:cd + - 44:67:47:86:1b:ce + - 44:67:47:86:1b:cf + - 44:67:47:86:1b:d0 + - 44:67:47:86:1b:d1 + - 44:67:47:86:1b:d2 + - 44:67:47:86:1b:d3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 new file mode 100644 index 0000000..80abe0e --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b929 + - /dev/disk/by-id/scsi-350000399b883bbe1 + - /dev/disk/by-id/scsi-350000399b883c059 + - /dev/disk/by-id/scsi-350000399b883bc9d +mac_addr: + - 44:67:47:86:1b:ae + - 44:67:47:86:1b:af + - 44:67:47:86:1b:b0 + - 44:67:47:86:1b:b1 + - 44:67:47:86:1b:b2 + - 44:67:47:86:1b:b3 + - 44:67:47:86:1b:b4 + - 44:67:47:86:1b:b5 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 new file mode 100644 index 0000000..3719131 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf141 + - /dev/disk/by-id/scsi-350000399b88bee25 + - /dev/disk/by-id/scsi-350000399b88bea59 + - /dev/disk/by-id/scsi-350000399b88be1d9 +mac_addr: + - 44:67:47:c9:db:38 + - 44:67:47:c9:db:39 + - 44:67:47:c9:db:3a + - 44:67:47:c9:db:3b + - 44:67:47:c9:db:3c + - 44:67:47:c9:db:3d + - 44:67:47:c9:db:3e + - 44:67:47:c9:db:3f +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 new file mode 100644 index 0000000..13af4dc --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919555 + - /dev/disk/by-id/scsi-350000399b8918c4d + - /dev/disk/by-id/scsi-350000399b8919c3d + - /dev/disk/by-id/scsi-350000399b8919389 +mac_addr: + - 44:67:47:d7:6c:c4 + - 44:67:47:d7:6c:c5 + - 44:67:47:d7:6c:c6 + - 44:67:47:d7:6c:c7 + - 44:67:47:d7:6c:c8 + - 44:67:47:d7:6c:c9 + - 44:67:47:d7:6c:ca + - 44:67:47:d7:6c:cb +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 new file mode 100644 index 0000000..b0a1e8a --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be219 + - /dev/disk/by-id/scsi-350000399b88bdf71 + - /dev/disk/by-id/scsi-350000399b88bdb49 + - /dev/disk/by-id/scsi-350000399b891784d +mac_addr: + - 44:67:47:c9:d9:26 + - 44:67:47:c9:d9:27 + - 44:67:47:c9:d9:28 + - 44:67:47:c9:d9:29 + - 44:67:47:c9:d9:2a + - 44:67:47:c9:d9:2b + - 44:67:47:c9:d9:2c + - 44:67:47:c9:d9:2d +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..ec1e524 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,21 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 new file mode 100644 index 0000000..a3ea181 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdefd89b + - /dev/disk/by-id/scsi-35000c500cdefac67 + - /dev/disk/by-id/scsi-35000c500cdedee6f + - /dev/disk/by-id/scsi-35000c500cdedfdaf +mac_addr: + - 5c:e8:83:31:c8:d4 + - 5c:e8:83:31:c8:d5 + - 5c:e8:83:31:c8:d6 + - 5c:e8:83:31:c8:d7 + - 5c:e8:83:31:c8:d8 + - 5c:e8:83:31:c8:d9 + - 5c:e8:83:31:c8:da + - 5c:e8:83:31:c8:db +model_name: Kunpeng-920 +ipmi_ip: 9.3.3.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 new file mode 100644 index 0000000..5d97218 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -0,0 +1,18 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd6aa4e3 + - /dev/disk/by-id/scsi-35000c500bd681acf +mac_addr: + - 5c:e8:83:73:25:c9 + - 5c:e8:83:73:25:ca + - 5c:e8:83:73:25:cb + - 5c:e8:83:73:25:cc + - 5c:e8:83:73:25:cd + - 5c:e8:83:73:25:ce + - 5c:e8:83:73:25:cf + - 5c:e8:83:73:25:d0 +model_name: Kunpeng-920 +ipmi_ip: 9.3.3.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 new file mode 100644 index 0000000..5a122da --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd67640b + - /dev/disk/by-id/scsi-35000c500bd6707a7 + - /dev/disk/by-id/scsi-35000c500bd680dc3 + - /dev/disk/by-id/scsi-35000c500bd683a73 +mac_addr: + - e0:00:84:2b:51:7d + - e0:00:84:2b:51:7e + - e0:00:84:2b:51:7f + - e0:00:84:2b:51:80 + - e0:00:84:2b:51:81 + - e0:00:84:2b:51:82 + - e0:00:84:2b:51:83 + - e0:00:84:2b:51:84 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.1 diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 new file mode 100644 index 0000000..f1eb906 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a7869 + - /dev/disk/by-id/scsi-350000399886acc5d + - /dev/disk/by-id/scsi-350000399886b6861 + - /dev/disk/by-id/scsi-350000399886ac70d +mac_addr: + - 44:67:47:c9:e4:b8 + - 44:67:47:c9:e4:b9 + - 44:67:47:c9:e4:ba + - 44:67:47:c9:e4:bb + - 44:67:47:c9:e4:bc + - 44:67:47:c9:e4:bd + - 44:67:47:c9:e4:be + - 44:67:47:c9:e4:bf +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.2 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 new file mode 100644 index 0000000..970d6ea --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 252G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b892d131 + - /dev/disk/by-id/scsi-350000399b892d619 + - /dev/disk/by-id/scsi-350000399b892dc1d + - /dev/disk/by-id/scsi-350000399b892dbb5 +mac_addr: + - 44:67:47:c9:e3:3a + - 44:67:47:c9:e3:3b + - 44:67:47:c9:e3:3c + - 44:67:47:c9:e3:3d + - 44:67:47:c9:e3:3e + - 44:67:47:c9:e3:3f + - 44:67:47:c9:e3:40 + - 44:67:47:c9:e3:41 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.3 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 881f2d6..39b69b8 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 - /dev/disk/by-id/scsi-35000c5009a690c53 - /dev/disk/by-id/scsi-35000c5009a6713fb -rootfs_partition: - /dev/disk/by-id/scsi-35000c5009a65963f mac_addr: - 5c:e8:83:31:c8:8e @@ -18,3 +17,4 @@ mac_addr: - 5c:e8:83:31:c8:94 - 5c:e8:83:31:c8:95 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.7 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index d23d755..79f98db 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 - /dev/disk/by-id/scsi-350000399b88af325 - /dev/disk/by-id/scsi-350000399b88af699 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88af421 mac_addr: - 44:67:47:c9:e2:2c @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:e2:32 - 44:67:47:c9:e2:33 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 0ceb191..37859dc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 - /dev/disk/by-id/scsi-350000399b8909f79 - /dev/disk/by-id/scsi-350000399b8909605 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909b85 mac_addr: - 84:46:fe:89:b6:e6 @@ -18,3 +17,4 @@ mac_addr: - 84:46:fe:89:b6:ec - 84:46:fe:89:b6:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 5e948ee..5d607e7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d - /dev/disk/by-id/scsi-350000399b88befc5 - /dev/disk/by-id/scsi-350000399b88be701 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bea5d mac_addr: - 44:67:47:c9:d9:4e @@ -18,3 +17,4 @@ mac_addr: - 44:67:47:c9:d9:54 - 44:67:47:c9:d9:55 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 760ce0c..b3d1416 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,12 +1,11 @@ nr_node: 4 nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +memory: 252G +nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d - /dev/disk/by-id/scsi-350000399b8909d79 - /dev/disk/by-id/scsi-350000399b8909ac5 -rootfs_partition: - /dev/disk/by-id/scsi-350000399b8909c99 mac_addr: - 84:46:fe:89:b7:22 @@ -18,3 +17,4 @@ mac_addr: - 84:46:fe:89:b7:28 - 84:46:fe:89:b7:29 model_name: Kunpeng-920 +ipmi_ip: 9.3.4.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index dde6205..102ff96 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 96 -memory: 256G +memory: 252G mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 @@ -11,3 +11,4 @@ mac_addr: - 44:67:47:d7:6d:ec - 44:67:47:d7:6d:ed model_name: Kunpeng-920 +ipmi_ip: 9.3.4.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index 15a9315..3abe369 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,7 +1,11 @@ nr_node: 4 nr_cpu: 128 -memory: 256G -rootfs_partition: +memory: 252G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399c8030fd5 +ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 mac_addr: - 44:67:47:86:2c:95 @@ -17,3 +21,4 @@ mac_addr: - ac:b3:b5:1e:d5:4d - ac:b3:b5:1e:d5:4e model_name: Kunpeng-920 +ipmi_ip: 9.3.1.10 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 deleted file mode 100644 index 1bdadca..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ /dev/null @@ -1,24 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 3 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part3 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399981347d5 -mac_addr: - - 68:4a:ae:ca:e8:ca - - 68:4a:ae:ca:e8:cb - - 68:4a:ae:ca:e8:cc - - 68:4a:ae:ca:e8:cd - - ac:b3:b5:1f:74:de - - ac:b3:b5:1f:74:df - - ac:b3:b5:1f:74:e0 - - ac:b3:b5:1f:74:e1 - - ac:b3:b5:1f:74:ee - - ac:b3:b5:1f:74:ef - - ac:b3:b5:1f:74:f0 - - ac:b3:b5:1f:74:f1 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 new file mode 100644 index 0000000..e04bc3a --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -0,0 +1,25 @@ +nr_node: 4 +nr_cpu: 128 +memory: 255G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-3500003999813487d +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 +mac_addr: + - 84:46:fe:73:b2:75 + - 84:46:fe:73:b2:76 + - 84:46:fe:73:b2:77 + - 84:46:fe:73:b2:78 + - ac:b3:b5:1e:bd:5b + - ac:b3:b5:1e:bd:5c + - ac:b3:b5:1e:bd:5d + - ac:b3:b5:1e:bd:5e + - ac:b3:b5:1e:bd:bb + - ac:b3:b5:1e:bd:bc + - ac:b3:b5:1e:bd:bd + - ac:b3:b5:1e:bd:be +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.1 diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 deleted file mode 100644 index 8ef481c..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ /dev/null @@ -1,24 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 3 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part3 -rootfs_partition: - - /dev/disk/by-id/scsi-350000399c802cfb9 -mac_addr: - - 68:4a:ae:ca:e8:a2 - - 68:4a:ae:ca:e8:a3 - - 68:4a:ae:ca:e8:a4 - - 68:4a:ae:ca:e8:a5 - - ac:b3:b5:1f:74:6e - - ac:b3:b5:1f:74:6f - - ac:b3:b5:1f:74:70 - - ac:b3:b5:1f:74:71 - - ac:b3:b5:1f:7d:4e - - ac:b3:b5:1f:7d:4f - - ac:b3:b5:1f:7d:50 - - ac:b3:b5:1f:7d:51 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 new file mode 100644 index 0000000..1a806ee --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-3500003999812ed81 + - /dev/disk/by-id/scsi-350000399c8020115 +mac_addr: + - 84:46:fe:89:be:8e + - 84:46:fe:89:be:8f + - 84:46:fe:89:be:90 + - 84:46:fe:89:be:91 + - ac:b3:b5:1e:d7:3b + - ac:b3:b5:1e:d7:3c + - ac:b3:b5:1e:d7:3d + - ac:b3:b5:1e:d7:3e + - ac:b3:b5:1e:d6:cb + - ac:b3:b5:1e:d6:cc + - ac:b3:b5:1e:d6:cd + - ac:b3:b5:1e:d6:ce +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 new file mode 100644 index 0000000..5b22bcc --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919495 + - /dev/disk/by-id/scsi-35000039998130a85 +mac_addr: + - 84:46:fe:89:bc:4a + - 84:46:fe:89:bc:4b + - 84:46:fe:89:bc:4c + - 84:46:fe:89:bc:4d + - ac:b3:b5:1e:b6:db + - ac:b3:b5:1e:b6:dc + - ac:b3:b5:1e:b6:dd + - ac:b3:b5:1e:b6:de + - ac:b3:b5:1e:b7:5b + - ac:b3:b5:1e:b7:5c + - ac:b3:b5:1e:b7:5d + - ac:b3:b5:1e:b7:5e +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.6 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 new file mode 100644 index 0000000..442b958 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -0,0 +1,22 @@ +nr_node: 4 +nr_cpu: 128 +memory: 252G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918a11 + - /dev/disk/by-id/scsi-350000399c802ee75 +mac_addr: + - cc:05:77:fe:d8:64 + - cc:05:77:fe:d8:65 + - cc:05:77:fe:d8:66 + - cc:05:77:fe:d8:67 + - 44:a1:91:35:6c:50 + - 44:a1:91:35:6c:51 + - 44:a1:91:35:6c:52 + - 44:a1:91:35:6c:53 + - 44:a1:91:35:68:d0 + - 44:a1:91:35:68:d1 + - 44:a1:91:35:68:d2 + - 44:a1:91:35:68:d3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.7 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 deleted file mode 100644 index fd22672..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ /dev/null @@ -1,15 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -rootfs_partition: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 -mac_addr: - - 84:46:fe:26:12:f5 - - 84:46:fe:26:12:f6 - - 84:46:fe:26:12:f7 - - 84:46:fe:26:12:f8 - - ac:b3:b5:1e:b6:7b - - ac:b3:b5:1e:b6:7c - - ac:b3:b5:1e:b6:7d - - ac:b3:b5:1e:b6:7e -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index a6aee01..16cdfe7 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,10 +1,9 @@ nr_node: 4 nr_cpu: 128 memory: 256G -nr_hdd_partitions: 1 +nr_hdd_partitions: 2 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -rootfs_partition: - /dev/disk/by-id/scsi-35000c500bd62acb3 mac_addr: - cc:05:77:fe:d4:0e @@ -16,3 +15,4 @@ mac_addr: - 44:a1:91:35:1a:72 - 44:a1:91:35:1a:73 model_name: Kunpeng-920 +ipmi_ip: 9.3.1.9 -- 2.23.0

1 0

[PATCH lab-z9 1/3] hosts file add ipmi_ip
by Zhang Dewan 13 Oct '20

13 Oct '20

--- hosts/0001-add-new-hosts-file.patch | 913 ++++++++++++++++++ ...and-the-128G-s-host-will-be-added-to.patch | 454 +++++++++ hosts/0003-hosts-file-add-ipmi_ip.patch | 411 ++++++++ hosts/taishan200-2280-2s64p-256g--a9 | 2 +- 4 files changed, 1779 insertions(+), 1 deletion(-) create mode 100644 hosts/0001-add-new-hosts-file.patch create mode 100644 hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch create mode 100644 hosts/0003-hosts-file-add-ipmi_ip.patch diff --git a/hosts/0001-add-new-hosts-file.patch b/hosts/0001-add-new-hosts-file.patch new file mode 100644 index 0000000..18318eb --- /dev/null +++ b/hosts/0001-add-new-hosts-file.patch @@ -0,0 +1,913 @@ +From bdf38f06d38302d4510387bc41b1bdce52518665 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Fri, 9 Oct 2020 19:14:31 +0800 +Subject: [PATCH lab-z9 1/3] add new hosts file + +--- + hosts/taishan200-2280-2s48p-256g--a13 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a14 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a15 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a17 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a18 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a19 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a21 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a22 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a24 | 7 +++---- + hosts/taishan200-2280-2s48p-256g--a25 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a26 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a27 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a28 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a29 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a30 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a31 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a32 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a33 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a34 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a52 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a53 | 17 +++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a60 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a61 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a62 | 19 +++++++++++++++++++ + hosts/taishan200-2280-2s48p-256g--a66 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a67 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a68 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a69 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a70 | 5 ++--- + hosts/taishan200-2280-2s48p-256g--a71 | 2 +- + hosts/taishan200-2280-2s64p-256g--a10 | 8 ++++++-- + hosts/taishan200-2280-2s64p-256g--a36 | 24 ++++++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a40 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a41 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a42 | 21 +++++++++++++++++++++ + hosts/taishan200-2280-2s64p-256g--a9 | 5 ++--- + 36 files changed, 527 insertions(+), 28 deletions(-) + create mode 100644 hosts/taishan200-2280-2s48p-256g--a13 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a14 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a15 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a17 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a18 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a19 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a21 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a22 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a26 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a27 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a28 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a29 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a30 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a31 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a32 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a33 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a34 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a52 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a53 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a60 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a61 + create mode 100644 hosts/taishan200-2280-2s48p-256g--a62 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a36 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a40 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a41 + create mode 100644 hosts/taishan200-2280-2s64p-256g--a42 + +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +new file mode 100644 +index 0000000..1c8f554 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500c2799bb3 ++ - /dev/disk/by-id/scsi-35000c500c278b18b ++ - /dev/disk/by-id/scsi-35000c500c279f96b ++ - /dev/disk/by-id/scsi-35000c500c2789b4b ++mac_addr: ++ - 44:67:47:97:2b:bf ++ - 44:67:47:97:2b:c0 ++ - 44:67:47:97:2b:c1 ++ - 44:67:47:97:2b:c2 ++ - 44:67:47:97:2b:c3 ++ - 44:67:47:97:2b:c4 ++ - 44:67:47:97:2b:c5 ++ - 44:67:47:97:2b:c6 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 +new file mode 100644 +index 0000000..ae84bd5 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88b4475 ++ - /dev/disk/by-id/scsi-350000399b88b4371 ++ - /dev/disk/by-id/scsi-350000399b88b432d ++ - /dev/disk/by-id/scsi-350000399b88b4531 ++mac_addr: ++ - 44:67:47:c9:e9:c2 ++ - 44:67:47:c9:e9:c3 ++ - 44:67:47:c9:e9:c4 ++ - 44:67:47:c9:e9:c5 ++ - 44:67:47:c9:e9:c6 ++ - 44:67:47:c9:e9:c7 ++ - 44:67:47:c9:e9:c8 ++ - 44:67:47:c9:e9:c9 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 +new file mode 100644 +index 0000000..7fa0b67 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b841fff5 ++ - /dev/disk/by-id/scsi-350000399b841fcb9 ++ - /dev/disk/by-id/scsi-350000399b8420a0d ++ - /dev/disk/by-id/scsi-350000399b841ff55 ++mac_addr: ++ - 44:67:47:85:d4:9e ++ - 44:67:47:85:d4:9f ++ - 44:67:47:85:d4:a0 ++ - 44:67:47:85:d4:a1 ++ - 44:67:47:85:d4:a2 ++ - 44:67:47:85:d4:a3 ++ - 44:67:47:85:d4:a4 ++ - 44:67:47:85:d4:a5 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +new file mode 100644 +index 0000000..8be93de +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88b44cd ++ - /dev/disk/by-id/scsi-350000399b88b4541 ++ - /dev/disk/by-id/scsi-350000399b88b4495 ++ - /dev/disk/by-id/scsi-350000399b88b48d1 ++mac_addr: ++ - 44:67:47:c9:ea:1c ++ - 44:67:47:c9:ea:1d ++ - 44:67:47:c9:ea:1e ++ - 44:67:47:c9:ea:1f ++ - 44:67:47:c9:ea:20 ++ - 44:67:47:c9:ea:21 ++ - 44:67:47:c9:ea:22 ++ - 44:67:47:c9:ea:23 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 +new file mode 100644 +index 0000000..e86bdeb +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b891b4d1 ++ - /dev/disk/by-id/scsi-350000399b8890d59 ++ - /dev/disk/by-id/scsi-350000399b8890f65 ++ - /dev/disk/by-id/scsi-350000399b891b3c5 ++mac_addr: ++ - 84:46:fe:3d:a7:e9 ++ - 84:46:fe:3d:a7:ea ++ - 84:46:fe:3d:a7:eb ++ - 84:46:fe:3d:a7:ec ++ - 84:46:fe:3d:a7:ed ++ - 84:46:fe:3d:a7:ee ++ - 84:46:fe:3d:a7:ef ++ - 84:46:fe:3d:a7:f0 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 +new file mode 100644 +index 0000000..0c4a60f +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8923939 ++ - /dev/disk/by-id/scsi-350000399b8420b2d ++ - /dev/disk/by-id/scsi-350000399b891b5c5 ++ - /dev/disk/by-id/scsi-350000399b841f769 ++mac_addr: ++ - 44:67:47:85:d5:48 ++ - 44:67:47:85:d5:49 ++ - 44:67:47:85:d5:4a ++ - 44:67:47:85:d5:4b ++ - 44:67:47:85:d5:4c ++ - 44:67:47:85:d5:4d ++ - 44:67:47:85:d5:4e ++ - 44:67:47:85:d5:4f ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 +new file mode 100644 +index 0000000..51b7709 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf2d5 ++ - /dev/disk/by-id/scsi-350000399b88bf5a5 ++ - /dev/disk/by-id/scsi-350000399b88bf279 ++ - /dev/disk/by-id/scsi-350000399b88bf24d ++mac_addr: ++ - 44:67:47:86:1b:e0 ++ - 44:67:47:86:1b:e1 ++ - 44:67:47:86:1b:e2 ++ - 44:67:47:86:1b:e3 ++ - 44:67:47:86:1b:e4 ++ - 44:67:47:86:1b:e5 ++ - 44:67:47:86:1b:e6 ++ - 44:67:47:86:1b:e7 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 +new file mode 100644 +index 0000000..4de0ad0 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919069 ++ - /dev/disk/by-id/scsi-350000399b8918c15 ++ - /dev/disk/by-id/scsi-350000399b8918c79 ++ - /dev/disk/by-id/scsi-350000399b8918cb9 ++mac_addr: ++ - 44:67:47:d7:6d:14 ++ - 44:67:47:d7:6d:15 ++ - 44:67:47:d7:6d:16 ++ - 44:67:47:d7:6d:17 ++ - 44:67:47:d7:6d:18 ++ - 44:67:47:d7:6d:19 ++ - 44:67:47:d7:6d:1a ++ - 44:67:47:d7:6d:1b ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 +index f46bfab..f47947c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917d59 +- - /dev/disk/by-id/scsi-350000399b891790d + - /dev/disk/by-id/scsi-350000399b89185d9 +-rootfs_partition: ++ - /dev/disk/by-id/scsi-350000399b891790d + - /dev/disk/by-id/scsi-350000399b8917ef1 + mac_addr: + - 44:67:47:c9:d8:f4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 +index ee5eeb3..2f270e8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4499 + - /dev/disk/by-id/scsi-350000399b88b4455 + - /dev/disk/by-id/scsi-350000399b88b442d +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88b44f9 + mac_addr: + - 44:67:47:c9:ea:08 +diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 +new file mode 100644 +index 0000000..b6de96e +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf131 ++ - /dev/disk/by-id/scsi-350000399b88bfd8d ++ - /dev/disk/by-id/scsi-350000399b88bfe55 ++ - /dev/disk/by-id/scsi-350000399b88bef31 ++mac_addr: ++ - 44:67:47:c9:e9:40 ++ - 44:67:47:c9:e9:41 ++ - 44:67:47:c9:e9:42 ++ - 44:67:47:c9:e9:43 ++ - 44:67:47:c9:e9:44 ++ - 44:67:47:c9:e9:45 ++ - 44:67:47:c9:e9:46 ++ - 44:67:47:c9:e9:47 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 +new file mode 100644 +index 0000000..b6d9945 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918ea9 ++ - /dev/disk/by-id/scsi-350000399b8918bad ++ - /dev/disk/by-id/scsi-350000399b8918d05 ++ - /dev/disk/by-id/scsi-350000399b8919415 ++mac_addr: ++ - 44:67:47:d7:6d:3c ++ - 44:67:47:d7:6d:3d ++ - 44:67:47:d7:6d:3e ++ - 44:67:47:d7:6d:3f ++ - 44:67:47:d7:6d:40 ++ - 44:67:47:d7:6d:41 ++ - 44:67:47:d7:6d:42 ++ - 44:67:47:d7:6d:43 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 +new file mode 100644 +index 0000000..ecebafc +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500cdf1eb07 ++ - /dev/disk/by-id/scsi-35000c500cdef4c6f ++ - /dev/disk/by-id/scsi-35000c500cdefac2b ++ - /dev/disk/by-id/scsi-35000c500cdefa75f ++mac_addr: ++ - 5c:e8:83:31:c8:20 ++ - 5c:e8:83:31:c8:21 ++ - 5c:e8:83:31:c8:22 ++ - 5c:e8:83:31:c8:23 ++ - 5c:e8:83:31:c8:24 ++ - 5c:e8:83:31:c8:25 ++ - 5c:e8:83:31:c8:26 ++ - 5c:e8:83:31:c8:27 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 +new file mode 100644 +index 0000000..bdb13ca +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918425 ++ - /dev/disk/by-id/scsi-350000399b891841d ++ - /dev/disk/by-id/scsi-350000399b8917859 ++ - /dev/disk/by-id/scsi-350000399b8917a51 ++mac_addr: ++ - 44:67:47:c9:d8:ea ++ - 44:67:47:c9:d8:eb ++ - 44:67:47:c9:d8:ec ++ - 44:67:47:c9:d8:ed ++ - 44:67:47:c9:d8:ee ++ - 44:67:47:c9:d8:ef ++ - 44:67:47:c9:d8:f0 ++ - 44:67:47:c9:d8:f1 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 +new file mode 100644 +index 0000000..810859b +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b883b881 ++ - /dev/disk/by-id/scsi-350000399b88bf83d ++ - /dev/disk/by-id/scsi-350000399b883bbbd ++ - /dev/disk/by-id/scsi-350000399b88bf48d ++mac_addr: ++ - 44:67:47:86:1b:cc ++ - 44:67:47:86:1b:cd ++ - 44:67:47:86:1b:ce ++ - 44:67:47:86:1b:cf ++ - 44:67:47:86:1b:d0 ++ - 44:67:47:86:1b:d1 ++ - 44:67:47:86:1b:d2 ++ - 44:67:47:86:1b:d3 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 +new file mode 100644 +index 0000000..8f9d13b +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b883b929 ++ - /dev/disk/by-id/scsi-350000399b883bbe1 ++ - /dev/disk/by-id/scsi-350000399b883c059 ++ - /dev/disk/by-id/scsi-350000399b883bc9d ++mac_addr: ++ - 44:67:47:86:1b:ae ++ - 44:67:47:86:1b:af ++ - 44:67:47:86:1b:b0 ++ - 44:67:47:86:1b:b1 ++ - 44:67:47:86:1b:b2 ++ - 44:67:47:86:1b:b3 ++ - 44:67:47:86:1b:b4 ++ - 44:67:47:86:1b:b5 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 +new file mode 100644 +index 0000000..66d9b68 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88bf141 ++ - /dev/disk/by-id/scsi-350000399b88bee25 ++ - /dev/disk/by-id/scsi-350000399b88bea59 ++ - /dev/disk/by-id/scsi-350000399b88be1d9 ++mac_addr: ++ - 44:67:47:c9:db:38 ++ - 44:67:47:c9:db:39 ++ - 44:67:47:c9:db:3a ++ - 44:67:47:c9:db:3b ++ - 44:67:47:c9:db:3c ++ - 44:67:47:c9:db:3d ++ - 44:67:47:c9:db:3e ++ - 44:67:47:c9:db:3f ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 +new file mode 100644 +index 0000000..ef3b148 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919555 ++ - /dev/disk/by-id/scsi-350000399b8918c4d ++ - /dev/disk/by-id/scsi-350000399b8919c3d ++ - /dev/disk/by-id/scsi-350000399b8919389 ++mac_addr: ++ - 44:67:47:d7:6c:c4 ++ - 44:67:47:d7:6c:c5 ++ - 44:67:47:d7:6c:c6 ++ - 44:67:47:d7:6c:c7 ++ - 44:67:47:d7:6c:c8 ++ - 44:67:47:d7:6c:c9 ++ - 44:67:47:d7:6c:ca ++ - 44:67:47:d7:6c:cb ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 +new file mode 100644 +index 0000000..528ec82 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b88be219 ++ - /dev/disk/by-id/scsi-350000399b88bdf71 ++ - /dev/disk/by-id/scsi-350000399b88bdb49 ++ - /dev/disk/by-id/scsi-350000399b891784d ++mac_addr: ++ - 44:67:47:c9:d9:26 ++ - 44:67:47:c9:d9:27 ++ - 44:67:47:c9:d9:28 ++ - 44:67:47:c9:d9:29 ++ - 44:67:47:c9:d9:2a ++ - 44:67:47:c9:d9:2b ++ - 44:67:47:c9:d9:2c ++ - 44:67:47:c9:d9:2d ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +new file mode 100644 +index 0000000..4353d4c +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500cdefd89b ++ - /dev/disk/by-id/scsi-35000c500cdefac67 ++ - /dev/disk/by-id/scsi-35000c500cdedee6f ++ - /dev/disk/by-id/scsi-35000c500cdedfdaf ++mac_addr: ++ - 5c:e8:83:31:c8:d4 ++ - 5c:e8:83:31:c8:d5 ++ - 5c:e8:83:31:c8:d6 ++ - 5c:e8:83:31:c8:d7 ++ - 5c:e8:83:31:c8:d8 ++ - 5c:e8:83:31:c8:d9 ++ - 5c:e8:83:31:c8:da ++ - 5c:e8:83:31:c8:db ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 +new file mode 100644 +index 0000000..0df1cd9 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -0,0 +1,17 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500bd6aa4e3 ++ - /dev/disk/by-id/scsi-35000c500bd681acf ++mac_addr: ++ - 5c:e8:83:73:25:c9 ++ - 5c:e8:83:73:25:ca ++ - 5c:e8:83:73:25:cb ++ - 5c:e8:83:73:25:cc ++ - 5c:e8:83:73:25:cd ++ - 5c:e8:83:73:25:ce ++ - 5c:e8:83:73:25:cf ++ - 5c:e8:83:73:25:d0 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 +new file mode 100644 +index 0000000..6986a8f +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-35000c500bd67640b ++ - /dev/disk/by-id/scsi-35000c500bd6707a7 ++ - /dev/disk/by-id/scsi-35000c500bd680dc3 ++ - /dev/disk/by-id/scsi-35000c500bd683a73 ++mac_addr: ++ - e0:00:84:2b:51:7d ++ - e0:00:84:2b:51:7e ++ - e0:00:84:2b:51:7f ++ - e0:00:84:2b:51:80 ++ - e0:00:84:2b:51:81 ++ - e0:00:84:2b:51:82 ++ - e0:00:84:2b:51:83 ++ - e0:00:84:2b:51:84 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 +new file mode 100644 +index 0000000..1c198b8 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399886a7869 ++ - /dev/disk/by-id/scsi-350000399886acc5d ++ - /dev/disk/by-id/scsi-350000399886b6861 ++ - /dev/disk/by-id/scsi-350000399886ac70d ++mac_addr: ++ - 44:67:47:c9:e4:b8 ++ - 44:67:47:c9:e4:b9 ++ - 44:67:47:c9:e4:ba ++ - 44:67:47:c9:e4:bb ++ - 44:67:47:c9:e4:bc ++ - 44:67:47:c9:e4:bd ++ - 44:67:47:c9:e4:be ++ - 44:67:47:c9:e4:bf ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 +new file mode 100644 +index 0000000..26ab646 +--- /dev/null ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -0,0 +1,19 @@ ++nr_node: 4 ++nr_cpu: 96 ++memory: 252G ++nr_hdd_partitions: 4 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b892d131 ++ - /dev/disk/by-id/scsi-350000399b892d619 ++ - /dev/disk/by-id/scsi-350000399b892dc1d ++ - /dev/disk/by-id/scsi-350000399b892dbb5 ++mac_addr: ++ - 44:67:47:c9:e3:3a ++ - 44:67:47:c9:e3:3b ++ - 44:67:47:c9:e3:3c ++ - 44:67:47:c9:e3:3d ++ - 44:67:47:c9:e3:3e ++ - 44:67:47:c9:e3:3f ++ - 44:67:47:c9:e3:40 ++ - 44:67:47:c9:e3:41 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index 881f2d6..c7b2083 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c5009a671773 + - /dev/disk/by-id/scsi-35000c5009a690c53 + - /dev/disk/by-id/scsi-35000c5009a6713fb +-rootfs_partition: + - /dev/disk/by-id/scsi-35000c5009a65963f + mac_addr: + - 5c:e8:83:31:c8:8e +diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 +index d23d755..f207003 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88aed21 + - /dev/disk/by-id/scsi-350000399b88af325 + - /dev/disk/by-id/scsi-350000399b88af699 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88af421 + mac_addr: + - 44:67:47:c9:e2:2c +diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 +index 0ceb191..054105c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8909f81 + - /dev/disk/by-id/scsi-350000399b8909f79 + - /dev/disk/by-id/scsi-350000399b8909605 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8909b85 + mac_addr: + - 84:46:fe:89:b6:e6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 +index 5e948ee..e96e34c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be92d + - /dev/disk/by-id/scsi-350000399b88befc5 + - /dev/disk/by-id/scsi-350000399b88be701 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bea5d + mac_addr: + - 44:67:47:c9:d9:4e +diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 +index 760ce0c..61f99a3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -1,12 +1,11 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G +-nr_hdd_partitions: 3 ++memory: 252G ++nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b890931d + - /dev/disk/by-id/scsi-350000399b8909d79 + - /dev/disk/by-id/scsi-350000399b8909ac5 +-rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8909c99 + mac_addr: + - 84:46:fe:89:b7:22 +diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 +index dde6205..4896475 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 256G ++memory: 252G + mac_addr: + - 44:67:47:d7:6d:e6 + - 44:67:47:d7:6d:e7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index 15a9315..a66bff0 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -1,7 +1,11 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 256G +-rootfs_partition: ++memory: 252G ++nr_hdd_partitions: 1 ++nr_ssd_partitions: 1 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399c8030fd5 ++ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 + mac_addr: + - 44:67:47:86:2c:95 +diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 +new file mode 100644 +index 0000000..d9f1184 +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a36 +@@ -0,0 +1,24 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 255G ++nr_hdd_partitions: 1 ++nr_ssd_partitions: 1 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-3500003999813487d ++ssd_partitions: ++ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part1 ++ - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB42949-part2 ++mac_addr: ++ - 84:46:fe:73:b2:75 ++ - 84:46:fe:73:b2:76 ++ - 84:46:fe:73:b2:77 ++ - 84:46:fe:73:b2:78 ++ - ac:b3:b5:1e:bd:5b ++ - ac:b3:b5:1e:bd:5c ++ - ac:b3:b5:1e:bd:5d ++ - ac:b3:b5:1e:bd:5e ++ - ac:b3:b5:1e:bd:bb ++ - ac:b3:b5:1e:bd:bc ++ - ac:b3:b5:1e:bd:bd ++ - ac:b3:b5:1e:bd:be ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +new file mode 100644 +index 0000000..91f5619 +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-3500003999812ed81 ++ - /dev/disk/by-id/scsi-350000399c8020115 ++mac_addr: ++ - 84:46:fe:89:be:8e ++ - 84:46:fe:89:be:8f ++ - 84:46:fe:89:be:90 ++ - 84:46:fe:89:be:91 ++ - ac:b3:b5:1e:d7:3b ++ - ac:b3:b5:1e:d7:3c ++ - ac:b3:b5:1e:d7:3d ++ - ac:b3:b5:1e:d7:3e ++ - ac:b3:b5:1e:d6:cb ++ - ac:b3:b5:1e:d6:cc ++ - ac:b3:b5:1e:d6:cd ++ - ac:b3:b5:1e:d6:ce ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 +new file mode 100644 +index 0000000..9525cfd +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8919495 ++ - /dev/disk/by-id/scsi-35000039998130a85 ++mac_addr: ++ - 84:46:fe:89:bc:4a ++ - 84:46:fe:89:bc:4b ++ - 84:46:fe:89:bc:4c ++ - 84:46:fe:89:bc:4d ++ - ac:b3:b5:1e:b6:db ++ - ac:b3:b5:1e:b6:dc ++ - ac:b3:b5:1e:b6:dd ++ - ac:b3:b5:1e:b6:de ++ - ac:b3:b5:1e:b7:5b ++ - ac:b3:b5:1e:b7:5c ++ - ac:b3:b5:1e:b7:5d ++ - ac:b3:b5:1e:b7:5e ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 +new file mode 100644 +index 0000000..40c1c4b +--- /dev/null ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -0,0 +1,21 @@ ++nr_node: 4 ++nr_cpu: 128 ++memory: 252G ++nr_hdd_partitions: 2 ++hdd_partitions: ++ - /dev/disk/by-id/scsi-350000399b8918a11 ++ - /dev/disk/by-id/scsi-350000399c802ee75 ++mac_addr: ++ - cc:05:77:fe:d8:64 ++ - cc:05:77:fe:d8:65 ++ - cc:05:77:fe:d8:66 ++ - cc:05:77:fe:d8:67 ++ - 44:a1:91:35:6c:50 ++ - 44:a1:91:35:6c:51 ++ - 44:a1:91:35:6c:52 ++ - 44:a1:91:35:6c:53 ++ - 44:a1:91:35:68:d0 ++ - 44:a1:91:35:68:d1 ++ - 44:a1:91:35:68:d2 ++ - 44:a1:91:35:68:d3 ++model_name: Kunpeng-920 +diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 +index d6c4353..e360e88 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a9 ++++ b/hosts/taishan200-2280-2s64p-256g--a9 +@@ -1,10 +1,9 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 128G +-nr_hdd_partitions: 1 ++memory: 126G ++nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd6a1347 +-rootfs_partition: + - /dev/disk/by-id/scsi-35000c500bd62acb3 + mac_addr: + - cc:05:77:fe:d4:0e +-- +2.23.0 + diff --git a/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch new file mode 100644 index 0000000..f16c13b --- /dev/null +++ b/hosts/0002-fix-memory-size-and-the-128G-s-host-will-be-added-to.patch @@ -0,0 +1,454 @@ +From 5eb020ab8c2591423a1ec55aadf716191ba9b1f3 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Sat, 10 Oct 2020 09:44:42 +0800 +Subject: [PATCH lab-z9 2/3] fix memory size, and the 128G's host will be added + to 256G as soon + +--- + hosts/taishan200-2280-2s48p-256g--a13 | 2 +- + hosts/taishan200-2280-2s48p-256g--a14 | 2 +- + hosts/taishan200-2280-2s48p-256g--a15 | 2 +- + hosts/taishan200-2280-2s48p-256g--a17 | 2 +- + hosts/taishan200-2280-2s48p-256g--a18 | 2 +- + hosts/taishan200-2280-2s48p-256g--a19 | 2 +- + hosts/taishan200-2280-2s48p-256g--a21 | 2 +- + hosts/taishan200-2280-2s48p-256g--a22 | 2 +- + hosts/taishan200-2280-2s48p-256g--a24 | 2 +- + hosts/taishan200-2280-2s48p-256g--a25 | 2 +- + hosts/taishan200-2280-2s48p-256g--a26 | 2 +- + hosts/taishan200-2280-2s48p-256g--a27 | 2 +- + hosts/taishan200-2280-2s48p-256g--a28 | 2 +- + hosts/taishan200-2280-2s48p-256g--a29 | 2 +- + hosts/taishan200-2280-2s48p-256g--a30 | 2 +- + hosts/taishan200-2280-2s48p-256g--a31 | 2 +- + hosts/taishan200-2280-2s48p-256g--a32 | 2 +- + hosts/taishan200-2280-2s48p-256g--a33 | 2 +- + hosts/taishan200-2280-2s48p-256g--a34 | 2 +- + hosts/taishan200-2280-2s48p-256g--a52 | 2 +- + hosts/taishan200-2280-2s48p-256g--a53 | 2 +- + hosts/taishan200-2280-2s48p-256g--a60 | 2 +- + hosts/taishan200-2280-2s48p-256g--a61 | 2 +- + hosts/taishan200-2280-2s48p-256g--a62 | 2 +- + hosts/taishan200-2280-2s48p-256g--a66 | 2 +- + hosts/taishan200-2280-2s48p-256g--a67 | 2 +- + hosts/taishan200-2280-2s48p-256g--a68 | 2 +- + hosts/taishan200-2280-2s48p-256g--a69 | 2 +- + hosts/taishan200-2280-2s48p-256g--a70 | 2 +- + hosts/taishan200-2280-2s48p-256g--a71 | 2 +- + hosts/taishan200-2280-2s64p-256g--a10 | 2 +- + hosts/taishan200-2280-2s64p-256g--a40 | 2 +- + hosts/taishan200-2280-2s64p-256g--a41 | 2 +- + hosts/taishan200-2280-2s64p-256g--a42 | 2 +- + 34 files changed, 34 insertions(+), 34 deletions(-) + +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +index 1c8f554..fe05233 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a13 ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c2799bb3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 +index ae84bd5..bd5962b 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a14 ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4475 +diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 +index 7fa0b67..9b0cd96 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a15 ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b841fff5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +index 8be93de..cbbf268 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a17 ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b44cd +diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 +index e86bdeb..648a1db 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a18 ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891b4d1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 +index 0c4a60f..2aec477 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a19 ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8923939 +diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 +index 51b7709..9cbb5b5 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a21 ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf2d5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 +index 4de0ad0..6af83a7 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a22 ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919069 +diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 +index f47947c..dd9b501 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917d59 +diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 +index 2f270e8..5d075b9 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4499 +diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 +index b6de96e..fe395ec 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a26 ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf131 +diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 +index b6d9945..63b94f3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a27 ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918ea9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 +index ecebafc..df048f7 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a28 ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdf1eb07 +diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 +index bdb13ca..849be55 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a29 ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918425 +diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 +index 810859b..2be9047 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a30 ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b881 +diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 +index 8f9d13b..8af7d18 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a31 ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883b929 +diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 +index 66d9b68..fb52e7f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a32 ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf141 +diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 +index ef3b148..4095419 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a33 ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919555 +diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 +index 528ec82..bae3e58 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a34 ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be219 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +index 4353d4c..654b021 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a52 ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500cdefd89b +diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 +index 0df1cd9..a90b8eb 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a53 ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd6aa4e3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 +index 6986a8f..b87d962 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a60 ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd67640b +diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 +index 1c198b8..b33712c 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a61 ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a7869 +diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 +index 26ab646..5c3b04d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a62 ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b892d131 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index c7b2083..88ef791 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-35000c5009a671773 +diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 +index f207003..97ea498 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88aed21 +diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 +index 054105c..f3d50f4 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8909f81 +diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 +index e96e34c..9e5734e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88be92d +diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 +index 61f99a3..0dd8208 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 4 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b890931d +diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 +index 4896475..dde6205 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 96 +-memory: 252G ++memory: 256G + mac_addr: + - 44:67:47:d7:6d:e6 + - 44:67:47:d7:6d:e7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index a66bff0..4687d1a 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 1 + nr_ssd_partitions: 1 + hdd_partitions: +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +index 91f5619..c0ce550 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a40 ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-3500003999812ed81 +diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 +index 9525cfd..9e01396 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a41 ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8919495 +diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 +index 40c1c4b..1a953df 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a42 ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -1,6 +1,6 @@ + nr_node: 4 + nr_cpu: 128 +-memory: 252G ++memory: 256G + nr_hdd_partitions: 2 + hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8918a11 +-- +2.23.0 + diff --git a/hosts/0003-hosts-file-add-ipmi_ip.patch b/hosts/0003-hosts-file-add-ipmi_ip.patch new file mode 100644 index 0000000..5201fc3 --- /dev/null +++ b/hosts/0003-hosts-file-add-ipmi_ip.patch @@ -0,0 +1,411 @@ +From 02376f205393290c0fef2452decbe23836362204 Mon Sep 17 00:00:00 2001 +From: Zhang Dewan <513619464(a)qq.com> +Date: Tue, 13 Oct 2020 14:49:53 +0800 +Subject: [PATCH lab-z9 3/3] hosts file add ipmi_ip + +--- + hosts/taishan200-2280-2s48p-256g--a11 | 1 + + hosts/taishan200-2280-2s48p-256g--a13 | 1 + + hosts/taishan200-2280-2s48p-256g--a14 | 1 + + hosts/taishan200-2280-2s48p-256g--a15 | 1 + + hosts/taishan200-2280-2s48p-256g--a17 | 1 + + hosts/taishan200-2280-2s48p-256g--a18 | 1 + + hosts/taishan200-2280-2s48p-256g--a19 | 1 + + hosts/taishan200-2280-2s48p-256g--a21 | 1 + + hosts/taishan200-2280-2s48p-256g--a22 | 1 + + hosts/taishan200-2280-2s48p-256g--a24 | 1 + + hosts/taishan200-2280-2s48p-256g--a25 | 1 + + hosts/taishan200-2280-2s48p-256g--a26 | 1 + + hosts/taishan200-2280-2s48p-256g--a27 | 1 + + hosts/taishan200-2280-2s48p-256g--a28 | 1 + + hosts/taishan200-2280-2s48p-256g--a29 | 1 + + hosts/taishan200-2280-2s48p-256g--a30 | 1 + + hosts/taishan200-2280-2s48p-256g--a31 | 1 + + hosts/taishan200-2280-2s48p-256g--a32 | 1 + + hosts/taishan200-2280-2s48p-256g--a33 | 1 + + hosts/taishan200-2280-2s48p-256g--a34 | 1 + + hosts/taishan200-2280-2s48p-256g--a52 | 1 + + hosts/taishan200-2280-2s48p-256g--a53 | 1 + + hosts/taishan200-2280-2s48p-256g--a60 | 1 + + hosts/taishan200-2280-2s48p-256g--a61 | 1 + + hosts/taishan200-2280-2s48p-256g--a62 | 1 + + hosts/taishan200-2280-2s48p-256g--a66 | 1 + + hosts/taishan200-2280-2s48p-256g--a67 | 1 + + hosts/taishan200-2280-2s48p-256g--a68 | 1 + + hosts/taishan200-2280-2s48p-256g--a69 | 1 + + hosts/taishan200-2280-2s48p-256g--a70 | 1 + + hosts/taishan200-2280-2s48p-256g--a71 | 1 + + hosts/taishan200-2280-2s64p-256g--a10 | 1 + + hosts/taishan200-2280-2s64p-256g--a3 | 1 + + hosts/taishan200-2280-2s64p-256g--a36 | 1 + + hosts/taishan200-2280-2s64p-256g--a4 | 1 + + hosts/taishan200-2280-2s64p-256g--a40 | 1 + + hosts/taishan200-2280-2s64p-256g--a41 | 1 + + hosts/taishan200-2280-2s64p-256g--a42 | 1 + + hosts/taishan200-2280-2s64p-256g--a8 | 1 + + hosts/taishan200-2280-2s64p-256g--a9 | 1 + + 40 files changed, 40 insertions(+) + +diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 +index b23cb94..a281e24 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a11 ++++ b/hosts/taishan200-2280-2s48p-256g--a11 +@@ -18,3 +18,4 @@ mac_addr: + - cc:05:77:ab:97:68 + - cc:05:77:ab:97:69 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 +index fe05233..78cd2ee 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a13 ++++ b/hosts/taishan200-2280-2s48p-256g--a13 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:97:2b:c5 + - 44:67:47:97:2b:c6 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 +index bd5962b..162e687 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a14 ++++ b/hosts/taishan200-2280-2s48p-256g--a14 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e9:c8 + - 44:67:47:c9:e9:c9 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 +index 9b0cd96..3890ff0 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a15 ++++ b/hosts/taishan200-2280-2s48p-256g--a15 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:85:d4:a4 + - 44:67:47:85:d4:a5 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 +index cbbf268..f2146f8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a17 ++++ b/hosts/taishan200-2280-2s48p-256g--a17 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:ea:22 + - 44:67:47:c9:ea:23 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 +index 648a1db..e0ca747 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a18 ++++ b/hosts/taishan200-2280-2s48p-256g--a18 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:3d:a7:ef + - 84:46:fe:3d:a7:f0 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 +index 2aec477..2b3c440 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a19 ++++ b/hosts/taishan200-2280-2s48p-256g--a19 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:85:d5:4e + - 44:67:47:85:d5:4f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 +index 9cbb5b5..44c4e64 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a21 ++++ b/hosts/taishan200-2280-2s48p-256g--a21 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:e6 + - 44:67:47:86:1b:e7 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 +index 6af83a7..b6d10af 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a22 ++++ b/hosts/taishan200-2280-2s48p-256g--a22 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6d:1a + - 44:67:47:d7:6d:1b + model_name: Kunpeng-920 ++ipmi_ip: 9.3.5.12 +diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 +index dd9b501..5e1571d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a24 ++++ b/hosts/taishan200-2280-2s48p-256g--a24 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d8:fa + - 44:67:47:c9:d8:fb + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 +index 5d075b9..1f3f599 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a25 ++++ b/hosts/taishan200-2280-2s48p-256g--a25 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:ea:0e + - 44:67:47:c9:ea:0f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.2 +diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 +index fe395ec..b136009 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a26 ++++ b/hosts/taishan200-2280-2s48p-256g--a26 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e9:46 + - 44:67:47:c9:e9:47 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 +index 63b94f3..96a387d 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a27 ++++ b/hosts/taishan200-2280-2s48p-256g--a27 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6d:42 + - 44:67:47:d7:6d:43 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.4 +diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 +index df048f7..5a4f298 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a28 ++++ b/hosts/taishan200-2280-2s48p-256g--a28 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:26 + - 5c:e8:83:31:c8:27 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 +index 849be55..5b7c0b8 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a29 ++++ b/hosts/taishan200-2280-2s48p-256g--a29 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d8:f0 + - 44:67:47:c9:d8:f1 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 +index 2be9047..2c8d2d3 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a30 ++++ b/hosts/taishan200-2280-2s48p-256g--a30 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:d2 + - 44:67:47:86:1b:d3 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 +index 8af7d18..9aec903 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a31 ++++ b/hosts/taishan200-2280-2s48p-256g--a31 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:86:1b:b4 + - 44:67:47:86:1b:b5 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 +index fb52e7f..d677838 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a32 ++++ b/hosts/taishan200-2280-2s48p-256g--a32 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:db:3e + - 44:67:47:c9:db:3f + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 +index 4095419..d4df847 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a33 ++++ b/hosts/taishan200-2280-2s48p-256g--a33 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:d7:6c:ca + - 44:67:47:d7:6c:cb + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.10 +diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 +index bae3e58..680cb6f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a34 ++++ b/hosts/taishan200-2280-2s48p-256g--a34 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d9:2c + - 44:67:47:c9:d9:2d + model_name: Kunpeng-920 ++ipmi_ip: 9.3.9.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 +index 654b021..a64cdec 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a52 ++++ b/hosts/taishan200-2280-2s48p-256g--a52 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:da + - 5c:e8:83:31:c8:db + model_name: Kunpeng-920 ++ipmi_ip: 9.3.3.5 +diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 +index a90b8eb..148e747 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a53 ++++ b/hosts/taishan200-2280-2s48p-256g--a53 +@@ -15,3 +15,4 @@ mac_addr: + - 5c:e8:83:73:25:cf + - 5c:e8:83:73:25:d0 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.3.6 +diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 +index b87d962..9e969b0 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a60 ++++ b/hosts/taishan200-2280-2s48p-256g--a60 +@@ -17,3 +17,4 @@ mac_addr: + - e0:00:84:2b:51:83 + - e0:00:84:2b:51:84 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.1 +diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 +index b33712c..2992c6f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a61 ++++ b/hosts/taishan200-2280-2s48p-256g--a61 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e4:be + - 44:67:47:c9:e4:bf + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.2 +diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 +index 5c3b04d..5262637 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a62 ++++ b/hosts/taishan200-2280-2s48p-256g--a62 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e3:40 + - 44:67:47:c9:e3:41 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.3 +diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 +index 88ef791..b7a3715 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a66 ++++ b/hosts/taishan200-2280-2s48p-256g--a66 +@@ -17,3 +17,4 @@ mac_addr: + - 5c:e8:83:31:c8:94 + - 5c:e8:83:31:c8:95 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.7 +diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 +index 97ea498..2501f6e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a67 ++++ b/hosts/taishan200-2280-2s48p-256g--a67 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:e2:32 + - 44:67:47:c9:e2:33 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.8 +diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 +index f3d50f4..c51e348 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a68 ++++ b/hosts/taishan200-2280-2s48p-256g--a68 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:89:b6:ec + - 84:46:fe:89:b6:ed + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.9 +diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 +index 9e5734e..964f79e 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a69 ++++ b/hosts/taishan200-2280-2s48p-256g--a69 +@@ -17,3 +17,4 @@ mac_addr: + - 44:67:47:c9:d9:54 + - 44:67:47:c9:d9:55 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.10 +diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 +index 0dd8208..2424a9f 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a70 ++++ b/hosts/taishan200-2280-2s48p-256g--a70 +@@ -17,3 +17,4 @@ mac_addr: + - 84:46:fe:89:b7:28 + - 84:46:fe:89:b7:29 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.11 +diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 +index dde6205..501ea4b 100644 +--- a/hosts/taishan200-2280-2s48p-256g--a71 ++++ b/hosts/taishan200-2280-2s48p-256g--a71 +@@ -11,3 +11,4 @@ mac_addr: + - 44:67:47:d7:6d:ec + - 44:67:47:d7:6d:ed + model_name: Kunpeng-920 ++ipmi_ip: 9.3.4.12 +diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 +index 4687d1a..fcc6c63 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a10 ++++ b/hosts/taishan200-2280-2s64p-256g--a10 +@@ -21,3 +21,4 @@ mac_addr: + - ac:b3:b5:1e:d5:4d + - ac:b3:b5:1e:d5:4e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.10 +diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 +index 1bdadca..744978e 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a3 ++++ b/hosts/taishan200-2280-2s64p-256g--a3 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1f:74:f0 + - ac:b3:b5:1f:74:f1 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.3 +diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 +index d9f1184..e04bc3a 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a36 ++++ b/hosts/taishan200-2280-2s64p-256g--a36 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1e:bd:bd + - ac:b3:b5:1e:bd:be + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.1 +diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 +index 8ef481c..0f73c52 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a4 ++++ b/hosts/taishan200-2280-2s64p-256g--a4 +@@ -22,3 +22,4 @@ mac_addr: + - ac:b3:b5:1f:7d:50 + - ac:b3:b5:1f:7d:51 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.4 +diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 +index c0ce550..3172475 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a40 ++++ b/hosts/taishan200-2280-2s64p-256g--a40 +@@ -19,3 +19,4 @@ mac_addr: + - ac:b3:b5:1e:d6:cd + - ac:b3:b5:1e:d6:ce + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.5 +diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 +index 9e01396..4253e1f 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a41 ++++ b/hosts/taishan200-2280-2s64p-256g--a41 +@@ -19,3 +19,4 @@ mac_addr: + - ac:b3:b5:1e:b7:5d + - ac:b3:b5:1e:b7:5e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.6 +diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 +index 1a953df..dce3cf0 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a42 ++++ b/hosts/taishan200-2280-2s64p-256g--a42 +@@ -19,3 +19,4 @@ mac_addr: + - 44:a1:91:35:68:d2 + - 44:a1:91:35:68:d3 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.2.7 +diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 +index fd22672..64f2750 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a8 ++++ b/hosts/taishan200-2280-2s64p-256g--a8 +@@ -13,3 +13,4 @@ mac_addr: + - ac:b3:b5:1e:b6:7d + - ac:b3:b5:1e:b6:7e + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.8 +diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 +index e360e88..f977a7c 100644 +--- a/hosts/taishan200-2280-2s64p-256g--a9 ++++ b/hosts/taishan200-2280-2s64p-256g--a9 +@@ -15,3 +15,4 @@ mac_addr: + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 + model_name: Kunpeng-920 ++ipmi_ip: 9.3.1.9 +-- +2.23.0 + diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index d6c4353..a6aee01 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,6 +1,6 @@ nr_node: 4 nr_cpu: 128 -memory: 128G +memory: 256G nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

1 0

[PATCH compass-ci] git_mirror: fix git-remote-http <defunct>
by Li Yuanchao 13 Oct '20

13 Oct '20

when use system() or %x() call shell command git, there would be a new child process to do git command. And it seems the child process doesn't clear everytime when it's finished. It needs to be waited by parent process. But it often comes out 'no child' error when wait in main thread, so I trap SIGCHLD to SIG_IGN, and the init process will handle it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 88a94ac..0420c10 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -46,7 +46,7 @@ class GitMirror def git_fetch(mirror_dir) fetch_info = %x(git -C #{mirror_dir} fetch 2>&1) # Check whether mirror_dir is a good git repository by 3 conditions. If not, delete it. - if ($CHILD_STATUS.exitstatus == ERR_CODE) && fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) + if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end return fetch_info.include? '->' @@ -89,6 +89,7 @@ class MirrorMain connection.start channel = connection.create_channel @message_queue = channel.queue('new_refs') + Signal.trap(:SIGCHLD, 'SIG_IGN') end def fork_stat_init(stat_key) -- 2.23.0

3 4

[PATCH v2 compass-ci 4/5] container/send-internet-mail: build file
by Luan Shengde 13 Oct '20

13 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/send-internet-mail/build diff --git a/container/send-internet-mail/build b/container/send-internet-mail/build new file mode 100755 index 0000000..078adaf --- /dev/null +++ b/container/send-internet-mail/build @@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t send-internet-mail:latest . -- 2.23.0

1 0

[PATCH v2 compass-ci 3/5] container/send-internet-mail: Dockerfile
by Luan Shengde 13 Oct '20

13 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 container/send-internet-mail/Dockerfile diff --git a/container/send-internet-mail/Dockerfile b/container/send-internet-mail/Dockerfile new file mode 100644 index 0000000..b8bc3a5 --- /dev/null +++ b/container/send-internet-mail/Dockerfile @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM debian + +MAINTAINER shdluan(a)163.com + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get install -y ruby-mail ruby-json ruby-sinatra && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo 'Asia/Shanghai' > /etc/timezone + +EXPOSE 25 + +COPY mail-post.rb /usr/local/bin/ + +COPY send-internet-mail.rb /usr/local/bin/ + +CMD ["/usr/local/bin/mail-post.rb"] -- 2.23.0

1 0

[PATCH v2 compass-ci 2/5] container/send-internet-mail: send-internet-mail.rb
by Luan Shengde 13 Oct '20

13 Oct '20

setup smtp send mail with received email info Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- .../send-internet-mail/send-internet-mail.rb | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 container/send-internet-mail/send-internet-mail.rb diff --git a/container/send-internet-mail/send-internet-mail.rb b/container/send-internet-mail/send-internet-mail.rb new file mode 100755 index 0000000..f0d7698 --- /dev/null +++ b/container/send-internet-mail/send-internet-mail.rb @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'mail' + +# setup smtp config +smtp = { + address: 'smtp.qq.com', + port: 25, + domain: 'qq.com', + user_name: 'compass-ci(a)qq.com', + password: 'passwd for user_name', + # enable_ssl: true, + # authentication: :login, + openssl_verify_mode: 'none', + enable_starttls_auto: true +} + +Mail.defaults { delivery_method :smtp, smtp } + +# send mail +def send_mail(mail_info) + mail = Mail.new do + references mail_info['references'] + from 'compass-ci(a)qq.com' + to mail_info['to'] + subject mail_info['subject'] + body mail_info['body'] + end + mail.deliver! +end -- 2.23.0

1 0

[PATCH compass-ci] generate conserver configuration file
by Cui Yili 13 Oct '20

13 Oct '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/conserver/conserver-head.cf | 16 +++++++++++ container/conserver/generate_conserver | 37 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 container/conserver/conserver-head.cf create mode 100755 container/conserver/generate_conserver diff --git a/container/conserver/conserver-head.cf b/container/conserver/conserver-head.cf new file mode 100644 index 0000000..6648f88 --- /dev/null +++ b/container/conserver/conserver-head.cf @@ -0,0 +1,16 @@ +# This is a fairly basic configuration file that interacts with one + +default * { + logfile /srv/cci/serial/logs/&; # '&' is replaced with console name + timestamp 1hab; # write timestamps + rw *; # allow all users + type exec; + master localhost; + portbase 2000; # port numbers start at 2001 and + portinc 100; # go up by 1 (port #1 == 2001, etc) +} + +access * { + trusted 127.0.0.1; +} + diff --git a/container/conserver/generate_conserver b/container/conserver/generate_conserver new file mode 100755 index 0000000..0d01350 --- /dev/null +++ b/container/conserver/generate_conserver @@ -0,0 +1,37 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ + +git clone file:///$CCI_REPOS/lab-$lab.git > /dev/null 2>&1 || exit 1 + +cat conserver-head.cf > conserver.cf + +# lab-z9/hosts/xxx +# nr_node: x +# nr_cpu: xx +# memory: xx +# nr_hdd_partitions: x +# hdd_partitions: +# - xx +# rootfs_partition: +# - xx +# mac_addr: +# - xx:xx:xx:xx:xx:xx +# model_name: xx-xx +for host in $(ls lab-$lab/hosts/*) +do + ipmi_ip=$(grep -q "ipmi_ip:" $host | awk '{print $2}') + [[ "$ipmi_ip" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] || continue + + textbox=$host + [ -n "$textbox" ] || continue + + cat <<EOF >> conserver.cf +console $textbox { + exec /usr/local/bin/ipmi-sol $ipmi_ip; +} + +EOF + +done + +[ -d "$PWD/lab-$lab" ] && rm -rf "$PWD/lab-$lab" -- 2.23.0

2 1

[PATCH lkp-tests] depends: add host-info
by Zhang Yu 13 Oct '20

13 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- distro/depends/host-info | 1 + 1 file changed, 1 insertion(+) create mode 100644 distro/depends/host-info diff --git a/distro/depends/host-info b/distro/depends/host-info new file mode 100644 index 00000000..3335a68b --- /dev/null +++ b/distro/depends/host-info @@ -0,0 +1 @@ +ipmitool -- 2.23.0

1 0

[PATCH v2 lkp-tests] pkg/lmbench3: fix the lmbench3 adaption the openeuler OS
by Bai Jing 13 Oct '20

13 Oct '20

problem: ../scripts/gnu-os: unable to guess system type. This script, last modified 2004-08-18,has failed to recognize the operating system you are using Modification: 1.sed -i 's/llseek/lseek64/g' ./src/disk.c 2.mkdir SCCS && touch ./SCCS/s.ChangeSet 3.sripts/gnu-os update Signed-off-by: Bai Jing <799286817(a)qq.com> --- pkg/lmbench3/lmbench.patch | 2358 ++++++++++++++++++++++++++++++++++++ 1 file changed, 2358 insertions(+) create mode 100644 pkg/lmbench3/lmbench.patch diff --git a/pkg/lmbench3/lmbench.patch b/pkg/lmbench3/lmbench.patch new file mode 100644 index 00000000..78550d56 --- /dev/null +++ b/pkg/lmbench3/lmbench.patch @@ -0,0 +1,2358 @@ +diff -uNr b/scripts/gnu-os a/scripts/gnu-os +--- b/scripts/gnu-os 2020-09-23 09:33:24.921303235 +0800 ++++ a/scripts/gnu-os 2020-09-23 09:33:24.913302982 +0800 +@@ -1,13 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# Copyright 1992-2020 Free Software Foundation, Inc. + +-timestamp='2004-08-18' ++timestamp='2020-04-26' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -16,24 +15,22 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see <https://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Originally written by Per Bothner <per(a)bothner.com>. +-# Please send patches to <config-patches(a)gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++# ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# You can get the latest version of this script from: ++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gue… + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# Please send patches to <config-patches(a)gnu.org>. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -42,7 +39,7 @@ + + Output the configuration name of the system \`$me' is run on. + +-Operation modes: ++Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit +@@ -53,8 +50,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright 1992-2020 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +62,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -88,15 +84,6 @@ + exit 1 + fi + +-trap 'exit 1' 1 2 15 +- +-for t in /usr/tmp /var/tmp /tmp; do +- if [ -d $t -a -w $t ] +- then TMPDIR=$t +- break +- fi +-done +- + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a + # compiler to aid in system detection is discouraged as it requires + # temporary files to be created and, as you can see below, it is a +@@ -107,34 +94,40 @@ + + # Portable tmp directory creation inspired by the Autoconf team. + +-set_cc_for_build=' +-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +-: ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || +- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +-dummy=$tmp/dummy ; +-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +-case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int x;" > $dummy.c ; +- for c in cc gcc c89 c99 ; do +- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +- CC_FOR_BUILD="$c"; break ; +- fi ; +- done ; +- if test x"$CC_FOR_BUILD" = x ; then +- CC_FOR_BUILD=no_compiler_found ; +- fi +- ;; +- ,,*) CC_FOR_BUILD=$CC ;; +- ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++tmp= ++# shellcheck disable=SC2172 ++trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 ++ ++set_cc_for_build() { ++ # prevent multiple calls if $tmp is already set ++ test "$tmp" && return 0 ++ : "${TMPDIR=/tmp}" ++ # shellcheck disable=SC2039 ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ++ dummy=$tmp/dummy ++ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ++ ,,) echo "int x;" > "$dummy.c" ++ for driver in cc gcc c89 c99 ; do ++ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$driver" ++ break ++ fi ++ done ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++ esac ++} + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi(a)noc.rutgers.edu 1994-08-24) +-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++if test -f /.attbin/uname ; then + PATH=$PATH:/.attbin ; export PATH + fi + +@@ -143,12 +136,40 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "$UNAME_SYSTEM" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ set_cc_for_build ++ cat <<-EOF > "$dummy.c" ++ #include <features.h> ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" ++ ++ # If ldd exists, use it to detect musl libc. ++ if command -v ldd >/dev/null && \ ++ ldd --version 2>&1 | grep -q ^musl ++ then ++ LIBC=musl ++ fi ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -158,22 +179,33 @@ + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" +- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ +- /usr/sbin/$sysctl 2>/dev/null || echo unknown)` +- case "${UNAME_MACHINE_ARCH}" in ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ ++ "/sbin/$sysctl" 2>/dev/null || \ ++ "/usr/sbin/$sysctl" 2>/dev/null || \ ++ echo unknown)` ++ case "$UNAME_MACHINE_ARCH" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; +- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ earmv*) ++ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv[0-9]$.*$,\1,'` ++ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'` ++ machine="${arch}${endian}"-unknown ++ ;; ++ *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + esac + # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. +- case "${UNAME_MACHINE_ARCH}" in ++ # to ELF recently (or will in the future) and ABI. ++ case "$UNAME_MACHINE_ARCH" in ++ earm*) ++ os=netbsdelf ++ ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) +- eval $set_cc_for_build ++ set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -183,7 +215,14 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd ++ ;; ++ esac ++ # Determine ABI tags. ++ case "$UNAME_MACHINE_ARCH" in ++ earm*) ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' ++ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac + # The OS release +@@ -191,65 +230,70 @@ + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. +- case "${UNAME_VERSION}" in ++ case "$UNAME_VERSION" in + Debian*) + release='-gnu' + ;; + *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +- echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo "$machine-${os}${release}${abi-}" ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" ++ exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" ++ exit ;; ++ *:MidnightBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" ++ exit ;; ++ *:SolidBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" ++ exit ;; ++ *:OS108:*:*) ++ echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd"$UNAME_RELEASE" ++ exit ;; ++ *:MirBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" ++ exit ;; ++ *:Sortix:*:*) ++ echo "$UNAME_MACHINE"-unknown-sortix ++ exit ;; ++ *:Twizzler:*:*) ++ echo "$UNAME_MACHINE"-unknown-twizzler ++ exit ;; ++ *:Redox:*:*) ++ echo "$UNAME_MACHINE"-unknown-redox ++ exit ;; ++ mips:OSF1:*.*) ++ echo mips-dec-osf1 ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -257,75 +301,73 @@ + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") +- UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; +- Alpha\ *:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # Should we change UNAME_MACHINE based on the output of uname instead +- # of the specific Alpha model? +- echo alpha-pc-interix +- exit 0 ;; +- 21064:Windows_NT:50:3) +- echo alpha-dec-winnt3.5 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-amigaos ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-morphos ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit 0 ;; ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +- echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ echo arm-acorn-riscix"$UNAME_RELEASE" ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -333,32 +375,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" ++ exit ;; + sun4H:SunOS:5.*:*) +- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux"$UNAME_RELEASE" ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ set_cc_for_build ++ SUN_ARCH=i386 ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH=x86_64 ++ fi ++ fi ++ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. +- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -366,26 +427,26 @@ + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. +- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" ++ exit ;; + sun3*:SunOS:*:*) +- echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-sun-sunos"$UNAME_RELEASE" ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +- echo m68k-sun-sunos${UNAME_RELEASE} ++ echo m68k-sun-sunos"$UNAME_RELEASE" + ;; + sun4) +- echo sparc-sun-sunos${UNAME_RELEASE} ++ echo sparc-sun-sunos"$UNAME_RELEASE" + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) +- echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-auspex-sunos"$UNAME_RELEASE" ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -395,41 +456,44 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint"$UNAME_RELEASE" ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint"$UNAME_RELEASE" ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint"$UNAME_RELEASE" ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten"$UNAME_RELEASE" ++ exit ;; + powerpc:machten:*:*) +- echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-apple-machten"$UNAME_RELEASE" ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) +- echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-dec-ultrix"$UNAME_RELEASE" ++ exit ;; + VAX*:ULTRIX*:*:*) +- echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ echo vax-dec-ultrix"$UNAME_RELEASE" ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) +- echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ echo clipper-intergraph-clix"$UNAME_RELEASE" ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #ifdef __cplusplus + #include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +@@ -438,94 +502,95 @@ + #endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) +- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) +- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ +- && exit 0 +- echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && ++ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$[0-9]*$.*/\1/p'` && ++ SYSTEM_NAME=`"$dummy" "$dummyarg"` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos"$UNAME_RELEASE" ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +- [ ${TARGET_BINARY_INTERFACE}x = x ] ++ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ ++ [ "$TARGET_BINARY_INTERFACE"x = x ] + then +- echo m88k-dg-dgux${UNAME_RELEASE} ++ echo m88k-dg-dgux"$UNAME_RELEASE" + else +- echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ echo m88k-dg-dguxbcs"$UNAME_RELEASE" + fi + else +- echo i586-dg-dgux${UNAME_RELEASE} ++ echo i586-dg-dgux"$UNAME_RELEASE" + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) +- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + fi +- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #include <sys/systemcfg.h> + + main() +@@ -536,128 +601,143 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` +- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + fi +- echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ echo "$IBM_ARCH"-ibm-aix"$IBM_REV" ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; +- ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and +- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; ++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` ++ case "$UNAME_MACHINE" in ++ 9000/31?) HP_ARCH=m68000 ;; ++ 9000/[34]??) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; +- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "$sc_cpu_version" in ++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "$sc_kernel_bits" in ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 ++ esac ;; ++ esac + fi +- if [ "${HP_ARCH}" = "" ]; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ if [ "$HP_ARCH" = "" ]; then ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF +- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac +- if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ "$HP_ARCH" = hppa2.0w ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then +- HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w + else +- HP_ARCH="hppa64" ++ HP_ARCH=hppa64 + fi + fi +- echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ echo "$HP_ARCH"-hp-hpux"$HPUX_REV" ++ exit ;; + ia64:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux"$HPUX_REV" ++ exit ;; + 3050*:HI-UX:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #include <unistd.h> + int + main () +@@ -682,357 +762,409 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; +- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; +- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-unknown-osf1mk ++ echo "$UNAME_MACHINE"-unknown-osf1mk + else +- echo ${UNAME_MACHINE}-unknown-osf1 ++ echo "$UNAME_MACHINE"-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*[A-Z]90:*:*:*) +- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ + | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*T3E:*:*:*) +- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*SV1:*:*:*) +- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) +- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" ++ exit ;; + sparc*:BSD/OS:*:*) +- echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-unknown-bsdi"$UNAME_RELEASE" ++ exit ;; + *:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" ++ exit ;; ++ arm:FreeBSD:*:*) ++ UNAME_PROCESSOR=`uname -p` ++ set_cc_for_build ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi ++ else ++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf ++ fi ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case "$UNAME_PROCESSOR" in ++ amd64) ++ UNAME_PROCESSOR=x86_64 ;; ++ i386) ++ UNAME_PROCESSOR=i586 ;; ++ esac ++ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ exit ;; + i*:CYGWIN*:*) +- echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) +- echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-cygwin ++ exit ;; ++ *:MINGW64*:*) ++ echo "$UNAME_MACHINE"-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) ++ echo "$UNAME_MACHINE"-pc-mingw32 ++ exit ;; ++ *:MSYS*:*) ++ echo "$UNAME_MACHINE"-pc-msys ++ exit ;; + i*:PW*:*) +- echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; +- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) +- echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; +- i*:Windows_NT*:* | Pentium*:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +- # UNAME_MACHINE based on the output of uname instead of i386? +- echo i586-pc-interix +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case "$UNAME_MACHINE" in ++ x86) ++ echo i586-pc-interix"$UNAME_RELEASE" ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix"$UNAME_RELEASE" ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix"$UNAME_RELEASE" ++ exit ;; ++ esac ;; + i*:UWIN*:*) +- echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; +- p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-pc-cygwin ++ exit ;; + prep*:SunOS:5.*:*) +- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; +- i*86:Minix:*:*) +- echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" ++ exit ;; ++ *:Minix:*:*) ++ echo "$UNAME_MACHINE"-unknown-minix ++ exit ;; ++ aarch64:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi ++ else ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC" ++ exit ;; ++ crisv32:Linux:*:*) ++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC" ++ exit ;; ++ e2k:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ frv:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ hexagon:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ i*86:Linux:*:*) ++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC" ++ exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ k1om:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ m32r*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ set_cc_for_build ++ IS_GLIBC=0 ++ test x"${LIBC}" = xgnu && IS_GLIBC=1 ++ sed 's/^ //' << EOF > "$dummy.c" + #undef CPU + #undef mips + #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ #undef mips64 ++ #undef mips64el ++ #if ${IS_GLIBC} && defined(_ABI64) ++ LIBCABI=gnuabi64 + #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ #if ${IS_GLIBC} && defined(_ABIN32) ++ LIBCABI=gnuabin32 + #else +- CPU= ++ LIBCABI=${LIBC} + #endif + #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el ++ ++ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 ++ CPU=mipsisa64r6 ++ #else ++ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 ++ CPU=mipsisa32r6 ++ #else ++ #if defined(__mips64) ++ CPU=mips64 ++ #else ++ CPU=mips ++ #endif ++ #endif ++ #endif ++ + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ MIPS_ENDIAN=el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ MIPS_ENDIAN= + #else +- CPU= ++ MIPS_ENDIAN= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" ++ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ mips64el:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-"$LIBC" ++ exit ;; ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-"$LIBC" ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-"$LIBC" ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; ++ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; ++ *) echo hppa-unknown-linux-"$LIBC" ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-"$LIBC" ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-"$LIBC" ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-"$LIBC" ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-"$LIBC" ++ exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ tile*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ vax:Linux:*:*) ++ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ set_cc_for_build ++ LIBCABI=$LIBC ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_X32 >/dev/null ++ then ++ LIBCABI="$LIBC"x32 ++ fi ++ fi ++ echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. +- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-os2-emx ++ exit ;; + i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-stop ++ exit ;; + i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) +- echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo "$UNAME_MACHINE"-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; +- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) +- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ echo "$UNAME_MACHINE"-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:*) ++ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac +- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` +- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL ++ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" + elif /bin/uname -X 2>/dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 +@@ -1042,214 +1174,326 @@ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 +- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + else +- echo ${UNAME_MACHINE}-pc-sysv32 ++ echo "$UNAME_MACHINE"-pc-sysv32 + fi +- exit 0 ;; ++ exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configure will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + rs6000:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) +- echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo rs6000-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + SM[BE]S:UNIX_SV:*:*) +- echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-dde-sysv"$UNAME_RELEASE" ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +- echo ${UNAME_MACHINE}-sni-sysv4 ++ echo "$UNAME_MACHINE"-sni-sysv4 + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel(a)ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel(a)ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes(a)openmarket.com>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf(a)swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green(a)stratus.com. ++ echo "$UNAME_MACHINE"-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green(a)stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) +- echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-apple-aux"$UNAME_RELEASE" ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv"$UNAME_RELEASE" + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv"$UNAME_RELEASE" + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx4-nec-superux"$UNAME_RELEASE" ++ exit ;; + SX-5:SUPER-UX:*:*) +- echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx5-nec-superux"$UNAME_RELEASE" ++ exit ;; + SX-6:SUPER-UX:*:*) +- echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx6-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux"$UNAME_RELEASE" ++ exit ;; + Power*:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-apple-rhapsody"$UNAME_RELEASE" ++ exit ;; + *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac +- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ if command -v xcode-select > /dev/null 2> /dev/null && \ ++ ! xcode-select --print-path > /dev/null 2> /dev/null ; then ++ # Avoid executing cc if there is no toolchain installed as ++ # cc will be a stub that puts up a graphical alert ++ # prompting the user to install developer tools. ++ CC_FOR_BUILD=no_compiler_found ++ else ++ set_cc_for_build ++ fi ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc ++ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_PPC >/dev/null ++ then ++ UNAME_PROCESSOR=powerpc ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # uname -m returns i386 or x86_64 ++ UNAME_PROCESSOR=$UNAME_MACHINE ++ fi ++ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` +- if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-?:NONSTOP_KERNEL:*:*) +- echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ NEO-*:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSR-*:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSV-*:NONSTOP_KERNEL:*:*) ++ echo nsv-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSX-*:NONSTOP_KERNEL:*:*) ++ echo nsx-tandem-nsk"$UNAME_RELEASE" ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) +- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. +- if test "$cputype" = "386"; then ++ # shellcheck disable=SC2154 ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi +- echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-plan9 ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; +- *:DRAGONFLY:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-sei-seiux"$UNAME_RELEASE" ++ exit ;; ++ *:DragonFly:*:*) ++ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "$UNAME_MACHINE" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" ++ exit ;; ++ i*86:rdos:*:*) ++ echo "$UNAME_MACHINE"-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo "$UNAME_MACHINE"-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo "$UNAME_MACHINE"-unknown-esx ++ exit ;; ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs ++ exit ;; ++ *:Unleashed:*:*) ++ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c <<EOF ++# No uname command or uname output not recognized. ++set_cc_for_build ++cat > "$dummy.c" <<EOF + #ifdef _SEQUENT_ +-# include <sys/types.h> +-# include <sys/utsname.h> ++#include <sys/types.h> ++#include <sys/utsname.h> ++#endif ++#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) ++#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) ++#include <signal.h> ++#if defined(_SIZE_T_) || defined(SIGLOST) ++#include <sys/utsname.h> ++#endif ++#endif + #endif + main () + { +@@ -1262,20 +1506,12 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" +-#endif +- ); exit (0); ++ "" + #endif ++ ); exit (0); + #endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); + #endif + + #if defined (NeXT) +@@ -1317,39 +1553,54 @@ + #endif + + #if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); ++ struct utsname un; + ++ uname(&un); ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); + #endif + + #if defined (vax) +-# if !defined (ultrix) +-# include <sys/param.h> +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif ++#if !defined (ultrix) ++#include <sys/param.h> ++#if defined (BSD) ++#if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++#else ++#if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++#else ++ printf ("vax-dec-bsd\n"); exit (0); ++#endif ++#endif ++#else ++ printf ("vax-dec-bsd\n"); exit (0); ++#endif ++#else ++#if defined(_SIZE_T_) || defined(SIGLOST) ++ struct utsname un; ++ uname (&un); ++ printf ("vax-dec-ultrix%s\n", un.release); exit (0); ++#else ++ printf ("vax-dec-ultrix\n"); exit (0); ++#endif ++#endif ++#endif ++#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) ++#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) ++#if defined(_SIZE_T_) || defined(SIGLOST) ++ struct utsname *un; ++ uname (&un); ++ printf ("mips-dec-ultrix%s\n", un.release); exit (0); ++#else ++ printf ("mips-dec-ultrix\n"); exit (0); ++#endif ++#endif + #endif + + #if defined (alliant) && defined (i860) +@@ -1360,51 +1611,44 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. ++test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++echo "$0: unable to guess system type" >&2 + +-# Convex versions that predate uname can use getsysinfo(1) ++case "$UNAME_MACHINE:$UNAME_SYSTEM" in ++ mips:Linux | mips64:Linux) ++ # If we got here on MIPS GNU/Linux, output extra information. ++ cat >&2 <<EOF + +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit 0 ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- c34*) +- echo c34-convex-bsd +- exit 0 ;; +- c38*) +- echo c38-convex-bsd +- exit 0 ;; +- c4*) +- echo c4-convex-bsd +- exit 0 ;; +- esac +-fi ++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize ++the system type. Please install a C compiler and try again. ++EOF ++ ;; ++esac + + cat >&2 <<EOF +-$0: unable to guess system type + +-This script, last modified $timestamp, has failed to recognize +-the operating system you are using. It is advised that you +-download the most up to date version of the config scripts from +- +- ftp://ftp.gnu.org/pub/gnu/config/ +- +-If the version you run ($0) is already up to date, please +-send the following data and any information you think might be +-pertinent to <config-patches(a)gnu.org> in order to provide the needed +-information to handle your system. ++This script (version $timestamp), has failed to recognize the ++operating system you are using. If your script is old, overwrite *all* ++copies of config.guess and config.sub with the latest versions from: ++ ++ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gue… ++and ++ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub ++EOF ++ ++year=`echo $timestamp | sed 's,-.*,,'` ++# shellcheck disable=SC2003 ++if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then ++ cat >&2 <<EOF ++ ++If $0 has already been updated, send the following data and any ++information you think might be pertinent to config-patches(a)gnu.org to ++provide the necessary information to handle your system. + + config.guess timestamp = $timestamp + +@@ -1423,16 +1667,17 @@ + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +-UNAME_MACHINE = ${UNAME_MACHINE} +-UNAME_RELEASE = ${UNAME_RELEASE} +-UNAME_SYSTEM = ${UNAME_SYSTEM} +-UNAME_VERSION = ${UNAME_VERSION} ++UNAME_MACHINE = "$UNAME_MACHINE" ++UNAME_RELEASE = "$UNAME_RELEASE" ++UNAME_SYSTEM = "$UNAME_SYSTEM" ++UNAME_VERSION = "$UNAME_VERSION" + EOF ++fi + + exit 1 + + # Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) ++# eval: (add-hook 'before-save-hook 'time-stamp) + # time-stamp-start: "timestamp='" + # time-stamp-format: "%:y-%02m-%02d" + # time-stamp-end: "'" +diff -uNr b/src/disk.c a/src/disk.c +--- b/src/disk.c 2020-09-23 09:33:24.921303235 +0800 ++++ a/src/disk.c 2020-09-23 09:33:24.901302603 +0800 +@@ -288,16 +288,16 @@ + int + seekto(int fd, uint64 off) + { +- // In modern times, lseek() is 64-bit clean. ++ // In modern times, lseek64() is 64-bit clean. + + uint64 here = 0; + +- lseek(fd, 0, 0); ++ lseek64(fd, 0, 0); + while ((uint64)(off - here) > (uint64)BIGSEEK) { +- if (lseek(fd, BIGSEEK, SEEK_CUR) == -1) break; ++ if (lseek64(fd, BIGSEEK, SEEK_CUR) == -1) break; + here += BIGSEEK; + } + assert((uint64)(off - here) <= (uint64)BIGSEEK); +- if (lseek(fd, (int)(off - here), SEEK_CUR) == -1) return (-1); ++ if (lseek64(fd, (int)(off - here), SEEK_CUR) == -1) return (-1); + return (0); + } -- 2.23.0

1 0

[PATCH lkp-tests] lmbench3: fix the lmbench3 adaption the openeuler OS problem
by Bai Jing 13 Oct '20

13 Oct '20

problem: ../scripts/gnu-os: unable to guess system type. This script, last modified 2004-08-18,has failed to recognize the operating system you are using Modification: 1.sed -i 's/llseek/lseek64/g' ./src/disk.c 2.mkdir SCCS && touch ./SCCS/s.ChangeSet 3. sripts/gnu-os update Signed-off-by: Bai Jing <799286817(a)qq.com> --- pkg/lmbench3/lmbench.patch | 2358 ++++++++++++++++++++++++++++++++++++ pkg/lmbench3/test.patch | 1 + 2 files changed, 2359 insertions(+) create mode 100644 pkg/lmbench3/lmbench.patch create mode 100644 pkg/lmbench3/test.patch diff --git a/pkg/lmbench3/lmbench.patch b/pkg/lmbench3/lmbench.patch new file mode 100644 index 00000000..78550d56 --- /dev/null +++ b/pkg/lmbench3/lmbench.patch @@ -0,0 +1,2358 @@ +diff -uNr b/scripts/gnu-os a/scripts/gnu-os +--- b/scripts/gnu-os 2020-09-23 09:33:24.921303235 +0800 ++++ a/scripts/gnu-os 2020-09-23 09:33:24.913302982 +0800 +@@ -1,13 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# Copyright 1992-2020 Free Software Foundation, Inc. + +-timestamp='2004-08-18' ++timestamp='2020-04-26' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -16,24 +15,22 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see <https://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Originally written by Per Bothner <per(a)bothner.com>. +-# Please send patches to <config-patches(a)gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++# ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# You can get the latest version of this script from: ++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gue… + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# Please send patches to <config-patches(a)gnu.org>. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -42,7 +39,7 @@ + + Output the configuration name of the system \`$me' is run on. + +-Operation modes: ++Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit +@@ -53,8 +50,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright 1992-2020 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +62,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -88,15 +84,6 @@ + exit 1 + fi + +-trap 'exit 1' 1 2 15 +- +-for t in /usr/tmp /var/tmp /tmp; do +- if [ -d $t -a -w $t ] +- then TMPDIR=$t +- break +- fi +-done +- + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a + # compiler to aid in system detection is discouraged as it requires + # temporary files to be created and, as you can see below, it is a +@@ -107,34 +94,40 @@ + + # Portable tmp directory creation inspired by the Autoconf team. + +-set_cc_for_build=' +-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +-: ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || +- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +-dummy=$tmp/dummy ; +-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +-case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int x;" > $dummy.c ; +- for c in cc gcc c89 c99 ; do +- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +- CC_FOR_BUILD="$c"; break ; +- fi ; +- done ; +- if test x"$CC_FOR_BUILD" = x ; then +- CC_FOR_BUILD=no_compiler_found ; +- fi +- ;; +- ,,*) CC_FOR_BUILD=$CC ;; +- ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++tmp= ++# shellcheck disable=SC2172 ++trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 ++ ++set_cc_for_build() { ++ # prevent multiple calls if $tmp is already set ++ test "$tmp" && return 0 ++ : "${TMPDIR=/tmp}" ++ # shellcheck disable=SC2039 ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ++ dummy=$tmp/dummy ++ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ++ ,,) echo "int x;" > "$dummy.c" ++ for driver in cc gcc c89 c99 ; do ++ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$driver" ++ break ++ fi ++ done ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++ esac ++} + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi(a)noc.rutgers.edu 1994-08-24) +-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++if test -f /.attbin/uname ; then + PATH=$PATH:/.attbin ; export PATH + fi + +@@ -143,12 +136,40 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "$UNAME_SYSTEM" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ set_cc_for_build ++ cat <<-EOF > "$dummy.c" ++ #include <features.h> ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" ++ ++ # If ldd exists, use it to detect musl libc. ++ if command -v ldd >/dev/null && \ ++ ldd --version 2>&1 | grep -q ^musl ++ then ++ LIBC=musl ++ fi ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -158,22 +179,33 @@ + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" +- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ +- /usr/sbin/$sysctl 2>/dev/null || echo unknown)` +- case "${UNAME_MACHINE_ARCH}" in ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ ++ "/sbin/$sysctl" 2>/dev/null || \ ++ "/usr/sbin/$sysctl" 2>/dev/null || \ ++ echo unknown)` ++ case "$UNAME_MACHINE_ARCH" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; +- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ earmv*) ++ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv[0-9]$.*$,\1,'` ++ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'` ++ machine="${arch}${endian}"-unknown ++ ;; ++ *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + esac + # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. +- case "${UNAME_MACHINE_ARCH}" in ++ # to ELF recently (or will in the future) and ABI. ++ case "$UNAME_MACHINE_ARCH" in ++ earm*) ++ os=netbsdelf ++ ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) +- eval $set_cc_for_build ++ set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -183,7 +215,14 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd ++ ;; ++ esac ++ # Determine ABI tags. ++ case "$UNAME_MACHINE_ARCH" in ++ earm*) ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' ++ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac + # The OS release +@@ -191,65 +230,70 @@ + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. +- case "${UNAME_VERSION}" in ++ case "$UNAME_VERSION" in + Debian*) + release='-gnu' + ;; + *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +- echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo "$machine-${os}${release}${abi-}" ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" ++ exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" ++ exit ;; ++ *:MidnightBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" ++ exit ;; ++ *:SolidBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" ++ exit ;; ++ *:OS108:*:*) ++ echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd"$UNAME_RELEASE" ++ exit ;; ++ *:MirBSD:*:*) ++ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" ++ exit ;; ++ *:Sortix:*:*) ++ echo "$UNAME_MACHINE"-unknown-sortix ++ exit ;; ++ *:Twizzler:*:*) ++ echo "$UNAME_MACHINE"-unknown-twizzler ++ exit ;; ++ *:Redox:*:*) ++ echo "$UNAME_MACHINE"-unknown-redox ++ exit ;; ++ mips:OSF1:*.*) ++ echo mips-dec-osf1 ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -257,75 +301,73 @@ + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") +- UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; +- Alpha\ *:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # Should we change UNAME_MACHINE based on the output of uname instead +- # of the specific Alpha model? +- echo alpha-pc-interix +- exit 0 ;; +- 21064:Windows_NT:50:3) +- echo alpha-dec-winnt3.5 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-amigaos ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-morphos ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit 0 ;; ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +- echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ echo arm-acorn-riscix"$UNAME_RELEASE" ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -333,32 +375,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" ++ exit ;; + sun4H:SunOS:5.*:*) +- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux"$UNAME_RELEASE" ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ set_cc_for_build ++ SUN_ARCH=i386 ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH=x86_64 ++ fi ++ fi ++ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. +- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -366,26 +427,26 @@ + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. +- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" ++ exit ;; + sun3*:SunOS:*:*) +- echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-sun-sunos"$UNAME_RELEASE" ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +- echo m68k-sun-sunos${UNAME_RELEASE} ++ echo m68k-sun-sunos"$UNAME_RELEASE" + ;; + sun4) +- echo sparc-sun-sunos${UNAME_RELEASE} ++ echo sparc-sun-sunos"$UNAME_RELEASE" + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) +- echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-auspex-sunos"$UNAME_RELEASE" ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -395,41 +456,44 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint"$UNAME_RELEASE" ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint"$UNAME_RELEASE" ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint"$UNAME_RELEASE" ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint"$UNAME_RELEASE" ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten"$UNAME_RELEASE" ++ exit ;; + powerpc:machten:*:*) +- echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-apple-machten"$UNAME_RELEASE" ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) +- echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-dec-ultrix"$UNAME_RELEASE" ++ exit ;; + VAX*:ULTRIX*:*:*) +- echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ echo vax-dec-ultrix"$UNAME_RELEASE" ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) +- echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ echo clipper-intergraph-clix"$UNAME_RELEASE" ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #ifdef __cplusplus + #include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +@@ -438,94 +502,95 @@ + #endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) +- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) +- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \ +- && exit 0 +- echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && ++ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$[0-9]*$.*/\1/p'` && ++ SYSTEM_NAME=`"$dummy" "$dummyarg"` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos"$UNAME_RELEASE" ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +- [ ${TARGET_BINARY_INTERFACE}x = x ] ++ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ ++ [ "$TARGET_BINARY_INTERFACE"x = x ] + then +- echo m88k-dg-dgux${UNAME_RELEASE} ++ echo m88k-dg-dgux"$UNAME_RELEASE" + else +- echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ echo m88k-dg-dguxbcs"$UNAME_RELEASE" + fi + else +- echo i586-dg-dgux${UNAME_RELEASE} ++ echo i586-dg-dgux"$UNAME_RELEASE" + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) +- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + fi +- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #include <sys/systemcfg.h> + + main() +@@ -536,128 +601,143 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` +- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + fi +- echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ echo "$IBM_ARCH"-ibm-aix"$IBM_REV" ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; +- ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and +- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; ++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` ++ case "$UNAME_MACHINE" in ++ 9000/31?) HP_ARCH=m68000 ;; ++ 9000/[34]??) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; +- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "$sc_cpu_version" in ++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "$sc_kernel_bits" in ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 ++ esac ;; ++ esac + fi +- if [ "${HP_ARCH}" = "" ]; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ if [ "$HP_ARCH" = "" ]; then ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF +- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac +- if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ "$HP_ARCH" = hppa2.0w ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then +- HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w + else +- HP_ARCH="hppa64" ++ HP_ARCH=hppa64 + fi + fi +- echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ echo "$HP_ARCH"-hp-hpux"$HPUX_REV" ++ exit ;; + ia64:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux"$HPUX_REV" ++ exit ;; + 3050*:HI-UX:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ set_cc_for_build ++ sed 's/^ //' << EOF > "$dummy.c" + #include <unistd.h> + int + main () +@@ -682,357 +762,409 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; +- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; +- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-unknown-osf1mk ++ echo "$UNAME_MACHINE"-unknown-osf1mk + else +- echo ${UNAME_MACHINE}-unknown-osf1 ++ echo "$UNAME_MACHINE"-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*[A-Z]90:*:*:*) +- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ + | sed -e 's/CRAY.*$[A-Z]90$/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*T3E:*:*:*) +- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + CRAY*SV1:*:*:*) +- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) +- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" ++ exit ;; + sparc*:BSD/OS:*:*) +- echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-unknown-bsdi"$UNAME_RELEASE" ++ exit ;; + *:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" ++ exit ;; ++ arm:FreeBSD:*:*) ++ UNAME_PROCESSOR=`uname -p` ++ set_cc_for_build ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi ++ else ++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf ++ fi ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case "$UNAME_PROCESSOR" in ++ amd64) ++ UNAME_PROCESSOR=x86_64 ;; ++ i386) ++ UNAME_PROCESSOR=i586 ;; ++ esac ++ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ exit ;; + i*:CYGWIN*:*) +- echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) +- echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-cygwin ++ exit ;; ++ *:MINGW64*:*) ++ echo "$UNAME_MACHINE"-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) ++ echo "$UNAME_MACHINE"-pc-mingw32 ++ exit ;; ++ *:MSYS*:*) ++ echo "$UNAME_MACHINE"-pc-msys ++ exit ;; + i*:PW*:*) +- echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; +- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) +- echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; +- i*:Windows_NT*:* | Pentium*:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +- # UNAME_MACHINE based on the output of uname instead of i386? +- echo i586-pc-interix +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case "$UNAME_MACHINE" in ++ x86) ++ echo i586-pc-interix"$UNAME_RELEASE" ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix"$UNAME_RELEASE" ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix"$UNAME_RELEASE" ++ exit ;; ++ esac ;; + i*:UWIN*:*) +- echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; +- p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-pc-cygwin ++ exit ;; + prep*:SunOS:5.*:*) +- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" ++ exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; +- i*86:Minix:*:*) +- echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" ++ exit ;; ++ *:Minix:*:*) ++ echo "$UNAME_MACHINE"-unknown-minix ++ exit ;; ++ aarch64:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi ++ else ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC" ++ exit ;; ++ crisv32:Linux:*:*) ++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC" ++ exit ;; ++ e2k:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ frv:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ hexagon:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ i*86:Linux:*:*) ++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC" ++ exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ k1om:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ m32r*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ set_cc_for_build ++ IS_GLIBC=0 ++ test x"${LIBC}" = xgnu && IS_GLIBC=1 ++ sed 's/^ //' << EOF > "$dummy.c" + #undef CPU + #undef mips + #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ #undef mips64 ++ #undef mips64el ++ #if ${IS_GLIBC} && defined(_ABI64) ++ LIBCABI=gnuabi64 + #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ #if ${IS_GLIBC} && defined(_ABIN32) ++ LIBCABI=gnuabin32 + #else +- CPU= ++ LIBCABI=${LIBC} + #endif + #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el ++ ++ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 ++ CPU=mipsisa64r6 ++ #else ++ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 ++ CPU=mipsisa32r6 ++ #else ++ #if defined(__mips64) ++ CPU=mips64 ++ #else ++ CPU=mips ++ #endif ++ #endif ++ #endif ++ + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ MIPS_ENDIAN=el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ MIPS_ENDIAN= + #else +- CPU= ++ MIPS_ENDIAN= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" ++ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ mips64el:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-"$LIBC" ++ exit ;; ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-"$LIBC" ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-"$LIBC" ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; ++ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; ++ *) echo hppa-unknown-linux-"$LIBC" ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-"$LIBC" ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-"$LIBC" ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-"$LIBC" ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-"$LIBC" ++ exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ tile*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; ++ vax:Linux:*:*) ++ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ set_cc_for_build ++ LIBCABI=$LIBC ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_X32 >/dev/null ++ then ++ LIBCABI="$LIBC"x32 ++ fi ++ fi ++ echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. +- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ echo "$UNAME_MACHINE"-pc-os2-emx ++ exit ;; + i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-stop ++ exit ;; + i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) +- echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo "$UNAME_MACHINE"-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; +- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) +- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ echo "$UNAME_MACHINE"-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:*) ++ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac +- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` +- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL ++ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" + elif /bin/uname -X 2>/dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 +@@ -1042,214 +1174,326 @@ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 +- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + else +- echo ${UNAME_MACHINE}-pc-sysv32 ++ echo "$UNAME_MACHINE"-pc-sysv32 + fi +- exit 0 ;; ++ exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configure will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo sparc-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + rs6000:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) +- echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ echo rs6000-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos"$UNAME_RELEASE" ++ exit ;; + SM[BE]S:UNIX_SV:*:*) +- echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-dde-sysv"$UNAME_RELEASE" ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +- echo ${UNAME_MACHINE}-sni-sysv4 ++ echo "$UNAME_MACHINE"-sni-sysv4 + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel(a)ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel(a)ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes(a)openmarket.com>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf(a)swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green(a)stratus.com. ++ echo "$UNAME_MACHINE"-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green(a)stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) +- echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-apple-aux"$UNAME_RELEASE" ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv"$UNAME_RELEASE" + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv"$UNAME_RELEASE" + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx4-nec-superux"$UNAME_RELEASE" ++ exit ;; + SX-5:SUPER-UX:*:*) +- echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx5-nec-superux"$UNAME_RELEASE" ++ exit ;; + SX-6:SUPER-UX:*:*) +- echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ echo sx6-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux"$UNAME_RELEASE" ++ exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux"$UNAME_RELEASE" ++ exit ;; + Power*:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-apple-rhapsody"$UNAME_RELEASE" ++ exit ;; + *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac +- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ if command -v xcode-select > /dev/null 2> /dev/null && \ ++ ! xcode-select --print-path > /dev/null 2> /dev/null ; then ++ # Avoid executing cc if there is no toolchain installed as ++ # cc will be a stub that puts up a graphical alert ++ # prompting the user to install developer tools. ++ CC_FOR_BUILD=no_compiler_found ++ else ++ set_cc_for_build ++ fi ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc ++ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_PPC >/dev/null ++ then ++ UNAME_PROCESSOR=powerpc ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # uname -m returns i386 or x86_64 ++ UNAME_PROCESSOR=$UNAME_MACHINE ++ fi ++ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` +- if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-?:NONSTOP_KERNEL:*:*) +- echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ NEO-*:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSR-*:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSV-*:NONSTOP_KERNEL:*:*) ++ echo nsv-tandem-nsk"$UNAME_RELEASE" ++ exit ;; ++ NSX-*:NONSTOP_KERNEL:*:*) ++ echo nsx-tandem-nsk"$UNAME_RELEASE" ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) +- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. +- if test "$cputype" = "386"; then ++ # shellcheck disable=SC2154 ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi +- echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ echo "$UNAME_MACHINE"-unknown-plan9 ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; +- *:DRAGONFLY:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-sei-seiux"$UNAME_RELEASE" ++ exit ;; ++ *:DragonFly:*:*) ++ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "$UNAME_MACHINE" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" ++ exit ;; ++ i*86:rdos:*:*) ++ echo "$UNAME_MACHINE"-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo "$UNAME_MACHINE"-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo "$UNAME_MACHINE"-unknown-esx ++ exit ;; ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs ++ exit ;; ++ *:Unleashed:*:*) ++ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c <<EOF ++# No uname command or uname output not recognized. ++set_cc_for_build ++cat > "$dummy.c" <<EOF + #ifdef _SEQUENT_ +-# include <sys/types.h> +-# include <sys/utsname.h> ++#include <sys/types.h> ++#include <sys/utsname.h> ++#endif ++#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) ++#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) ++#include <signal.h> ++#if defined(_SIZE_T_) || defined(SIGLOST) ++#include <sys/utsname.h> ++#endif ++#endif + #endif + main () + { +@@ -1262,20 +1506,12 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" +-#endif +- ); exit (0); ++ "" + #endif ++ ); exit (0); + #endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); + #endif + + #if defined (NeXT) +@@ -1317,39 +1553,54 @@ + #endif + + #if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); ++ struct utsname un; + ++ uname(&un); ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); + #endif + + #if defined (vax) +-# if !defined (ultrix) +-# include <sys/param.h> +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif ++#if !defined (ultrix) ++#include <sys/param.h> ++#if defined (BSD) ++#if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++#else ++#if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++#else ++ printf ("vax-dec-bsd\n"); exit (0); ++#endif ++#endif ++#else ++ printf ("vax-dec-bsd\n"); exit (0); ++#endif ++#else ++#if defined(_SIZE_T_) || defined(SIGLOST) ++ struct utsname un; ++ uname (&un); ++ printf ("vax-dec-ultrix%s\n", un.release); exit (0); ++#else ++ printf ("vax-dec-ultrix\n"); exit (0); ++#endif ++#endif ++#endif ++#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) ++#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) ++#if defined(_SIZE_T_) || defined(SIGLOST) ++ struct utsname *un; ++ uname (&un); ++ printf ("mips-dec-ultrix%s\n", un.release); exit (0); ++#else ++ printf ("mips-dec-ultrix\n"); exit (0); ++#endif ++#endif + #endif + + #if defined (alliant) && defined (i860) +@@ -1360,51 +1611,44 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. ++test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++echo "$0: unable to guess system type" >&2 + +-# Convex versions that predate uname can use getsysinfo(1) ++case "$UNAME_MACHINE:$UNAME_SYSTEM" in ++ mips:Linux | mips64:Linux) ++ # If we got here on MIPS GNU/Linux, output extra information. ++ cat >&2 <<EOF + +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit 0 ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- c34*) +- echo c34-convex-bsd +- exit 0 ;; +- c38*) +- echo c38-convex-bsd +- exit 0 ;; +- c4*) +- echo c4-convex-bsd +- exit 0 ;; +- esac +-fi ++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize ++the system type. Please install a C compiler and try again. ++EOF ++ ;; ++esac + + cat >&2 <<EOF +-$0: unable to guess system type + +-This script, last modified $timestamp, has failed to recognize +-the operating system you are using. It is advised that you +-download the most up to date version of the config scripts from +- +- ftp://ftp.gnu.org/pub/gnu/config/ +- +-If the version you run ($0) is already up to date, please +-send the following data and any information you think might be +-pertinent to <config-patches(a)gnu.org> in order to provide the needed +-information to handle your system. ++This script (version $timestamp), has failed to recognize the ++operating system you are using. If your script is old, overwrite *all* ++copies of config.guess and config.sub with the latest versions from: ++ ++ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gue… ++and ++ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub ++EOF ++ ++year=`echo $timestamp | sed 's,-.*,,'` ++# shellcheck disable=SC2003 ++if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then ++ cat >&2 <<EOF ++ ++If $0 has already been updated, send the following data and any ++information you think might be pertinent to config-patches(a)gnu.org to ++provide the necessary information to handle your system. + + config.guess timestamp = $timestamp + +@@ -1423,16 +1667,17 @@ + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +-UNAME_MACHINE = ${UNAME_MACHINE} +-UNAME_RELEASE = ${UNAME_RELEASE} +-UNAME_SYSTEM = ${UNAME_SYSTEM} +-UNAME_VERSION = ${UNAME_VERSION} ++UNAME_MACHINE = "$UNAME_MACHINE" ++UNAME_RELEASE = "$UNAME_RELEASE" ++UNAME_SYSTEM = "$UNAME_SYSTEM" ++UNAME_VERSION = "$UNAME_VERSION" + EOF ++fi + + exit 1 + + # Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) ++# eval: (add-hook 'before-save-hook 'time-stamp) + # time-stamp-start: "timestamp='" + # time-stamp-format: "%:y-%02m-%02d" + # time-stamp-end: "'" +diff -uNr b/src/disk.c a/src/disk.c +--- b/src/disk.c 2020-09-23 09:33:24.921303235 +0800 ++++ a/src/disk.c 2020-09-23 09:33:24.901302603 +0800 +@@ -288,16 +288,16 @@ + int + seekto(int fd, uint64 off) + { +- // In modern times, lseek() is 64-bit clean. ++ // In modern times, lseek64() is 64-bit clean. + + uint64 here = 0; + +- lseek(fd, 0, 0); ++ lseek64(fd, 0, 0); + while ((uint64)(off - here) > (uint64)BIGSEEK) { +- if (lseek(fd, BIGSEEK, SEEK_CUR) == -1) break; ++ if (lseek64(fd, BIGSEEK, SEEK_CUR) == -1) break; + here += BIGSEEK; + } + assert((uint64)(off - here) <= (uint64)BIGSEEK); +- if (lseek(fd, (int)(off - here), SEEK_CUR) == -1) return (-1); ++ if (lseek64(fd, (int)(off - here), SEEK_CUR) == -1) return (-1); + return (0); + } diff --git a/pkg/lmbench3/test.patch b/pkg/lmbench3/test.patch new file mode 100644 index 00000000..79f9ef58 --- /dev/null +++ b/pkg/lmbench3/test.patch @@ -0,0 +1 @@ ++ -- 2.23.0

1 1

[PATCH lkp-tests] tests: lmbench3 need to be adapted aarch64 architecture
by Bai Jing 13 Oct '20

13 Oct '20

problem : cat:results/x86_64-linux-gnu/vm-aarch64-2p8g--baijing-2994780.0: No such file or directory Signed-off-by: Bai Jing <799286817(a)qq.com> --- tests/lmbench3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lmbench3 b/tests/lmbench3 index 8570a35a..f09c49e2 100755 --- a/tests/lmbench3 +++ b/tests/lmbench3 @@ -138,7 +138,7 @@ run_lmbench3_development() eval "$test=yes" - sed -i '/lat_pagefault -P $SYNC_MAX $FILE/i [ -f $FILE ] || dd if=/dev/zero of=$FILE count=1 bs=1G' bin/x86_64-linux-gnu/lmbench + sed -i '/lat_pagefault -P $SYNC_MAX $FILE/i [ -f $FILE ] || dd if=/dev/zero of=$FILE count=1 bs=1G' bin/aarch64-linux-gnu/lmbench log_eval " ( echo $nr_threads @@ -177,7 +177,7 @@ run_lmbench3_development() show_result() { - cat results/x86_64-linux-gnu/$testbox.0 || { + cat results/aarch64-linux-gnu/$testbox.0 || { echo "no test result found" exit -1 } -- 2.23.0

1 0

[PATCH compass-ci] src/lib/job.cr: fix init id syntax
by Lu Kaiyi 13 Oct '20

13 Oct '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index be3446e..907644b 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -50,7 +50,7 @@ class Job @hash = job_content.as_h # init job with "-1", or use the original job_content["id"] - id == "-1" if "#{id}" == "" + id = "-1" if "#{id}" == "" if initialized? return if @hash["id"] == "#{id}" -- 2.23.0

1 0

[PATCH lkp-tests] lmbench3: add lmbench.patch to PKGBUILD
by Bai Jing 13 Oct '20

13 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- pkg/lmbench3/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/lmbench3/PKGBUILD b/pkg/lmbench3/PKGBUILD index 82667fcb..e1c39fcb 100644 --- a/pkg/lmbench3/PKGBUILD +++ b/pkg/lmbench3/PKGBUILD @@ -5,8 +5,10 @@ pkgdesc="A suite of simple, portable, ANSI/C microbenchmarks for UNIX/POSIX, mea arch=('i386' 'x86_64') url="http://www.bitmover.com/lmbench/" license=('GPL') -source=("https://github.com/intel/lmbench.git") -md5sums=('SKIP') +source=("https://github.com/intel/lmbench.git" + "lmbench.patch" +) +md5sums=('SKIP' 'SKIP') build() { cd "$srcdir/$pkgname" -- 2.23.0

1 0

[PATCH compass-ci 2/2] feat: The link for one command to build centos initramfs image
by Wang Chenglong 13 Oct '20

13 Oct '20

This link is used to one command to build centos-$version initramfs image Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- rootfs/initramfs/centos/aarch64/7/build | 1 + rootfs/initramfs/centos/aarch64/8/build | 1 + 2 files changed, 2 insertions(+) create mode 120000 rootfs/initramfs/centos/aarch64/7/build create mode 120000 rootfs/initramfs/centos/aarch64/8/build diff --git a/rootfs/initramfs/centos/aarch64/7/build b/rootfs/initramfs/centos/aarch64/7/build new file mode 120000 index 0000000..2d22759 --- /dev/null +++ b/rootfs/initramfs/centos/aarch64/7/build @@ -0,0 +1 @@ +../../../../../container/osimage/centos/run \ No newline at end of file diff --git a/rootfs/initramfs/centos/aarch64/8/build b/rootfs/initramfs/centos/aarch64/8/build new file mode 120000 index 0000000..2d22759 --- /dev/null +++ b/rootfs/initramfs/centos/aarch64/8/build @@ -0,0 +1 @@ +../../../../../container/osimage/centos/run \ No newline at end of file -- 2.23.0

1 0

[PATCH compass-ci] web-backend: add "/update_repos" api to update repos
by Zhang Yuhang 13 Oct '20

13 Oct '20

This will be called by git mirror service. Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- container/web-backend/web-backend | 8 +++ lib/constants.rb | 3 + src/lib/web_backend.rb | 107 ++++++++++++++++-------------- 3 files changed, 68 insertions(+), 50 deletions(-) diff --git a/container/web-backend/web-backend b/container/web-backend/web-backend index 60c7827..07c2f69 100755 --- a/container/web-backend/web-backend +++ b/container/web-backend/web-backend @@ -62,3 +62,11 @@ end get '/get_repos' do get_repos(params) end + +# POST /update_repos +# Body: repos hash json +# Content-Type: "Application/json" +# Description: update repos by git mirror service +post '/update_repos' do + update_repos(request) +end diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..efecaef 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -10,3 +10,6 @@ ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' MAIL_PORT = config['MAIL_PORT'] || 11_311 + +# web-backend service port that makes git mirror service updates "repos" of web-backend service +WEB_BACKEND_PORT = 32767 diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb index 4544690..6ba18e2 100644 --- a/src/lib/web_backend.rb +++ b/src/lib/web_backend.rb @@ -12,7 +12,6 @@ require "#{CCI_SRC}/lib/es_query.rb" require "#{CCI_SRC}/lib/matrix2.rb" UPSTREAM_REPOS_PATH = ENV['UPSTREAM_REPOS_PATH'] || '/c/upstream-repos' - FIELDS = %w[ upstream_repo os @@ -33,6 +32,48 @@ PREFIX_SEARCH_FIELDS = ['tbox_group'].freeze ES_CLIENT = Elasticsearch::Client.new(url: "http://#{ES_HOST}:#{ES_PORT}") COMPARE_RECORDS_NUMBER = 50 +# Repos operation class +class Repos + attr_reader :repos, :repos_list + + def initialize + @repos = {} + @repos_list = [] + + Dir["#{UPSTREAM_REPOS_PATH}/*/*/*"].sort.each do |repo_file| + git_repo = repo_file[UPSTREAM_REPOS_PATH.size + 1, repo_file.size - 1] + urls = YAML.load_file(repo_file)['url'] if File.file? repo_file + repo = { + git_repo: git_repo, + git_url: get_repo_url(git_repo, urls: urls) + } + @repos_list << repo + end + end + + def get_repo_url(git_repo, urls: nil) + urls ||= @repos[git_repo]['url'] + + return if urls.nil? || urls.empty? + return urls[1] if urls[1] && urls[1][0, 4] == 'http' + + return urls[0] + end + + def repos=(repos) + repos_list = [] + @repos = repos + @repos.keys.sort.each do |git_repo| + repos_list << { + git_repo: git_repo, + git_url: get_repo_url(git_repo) + } + end + @repos_list = repos_list + end +end + +REPOS = Repos.new def es_query(query) ES_CLIENT.search index: 'jobs*', body: query end @@ -95,7 +136,7 @@ def compare_candidates_body OS: [ { os: 'openeuler', os_version: ['1.0', '20.03'] }, { os: 'centos', os_version: ['7.6', '7.8', '8.1', 'sid'] }, - { os: 'debian', os_version: ['10', 'sid'] }, + { os: 'debian', os_version: %w[10 sid] }, { os: 'archlinux', os_version: ['5.5.0-1'] } ], os_arch: %w[aarch64 x86_64], @@ -270,7 +311,7 @@ end def get_banner(git_repo, branches) { repo: git_repo, - git_url: get_repo(git_repo)[:git_url], + git_url: REPOS.get_repo_url(git_repo), upstream_branch: branches } end @@ -317,62 +358,17 @@ def get_jobs(params) [200, headers.merge('Access-Control-Allow-Origin' => '*'), JSON.dump(body)] end -def get_repo_url(repo_file) - return unless File.file? repo_file - - urls = YAML.load_file(repo_file)['url'] - urls.each do |url| - return url if url[0, 4] == 'http' - end - urls[0] -end - -def get_repo(git_repo, repo_file = nil) - repo = { - git_repo: git_repo, - git_url: nil - } - return repo if !git_repo && !repo_file - - if !git_repo - git_repo = repo_file[UPSTREAM_REPOS_PATH.size + 1, repo_file.size - 1] - repo[:git_repo] = git_repo - elsif !repo_file - repo_file = File.join(UPSTREAM_REPOS_PATH, git_repo) - end - - repo[:git_url] = get_repo_url(repo_file) - repo -end - -def repo_files_list - Dir["#{UPSTREAM_REPOS_PATH}/*/*/*"].sort -end - -def get_repos_list(repo_files, from, finish, total) - repos_list = [] - - total.times do |index| - next if index < from - break if index >= finish - - repos_list << get_repo(nil, repo_files[index]) - end - repos_list -end - def get_repos_body(params) - repo_files = repo_files_list page_size = get_positive_number(params[:page_size], 20) page_num = get_positive_number(params[:page_num], 1) - 1 from = page_num * page_size finish = from + page_size - total = repo_files.size + total = REPOS.repos_list.size { total: total, - repos: get_repos_list(repo_files, from, finish, total) + repos: REPOS.repos_list[from, finish] } end @@ -385,3 +381,14 @@ def get_repos(params) end [200, headers.merge('Access-Control-Allow-Origin' => '*'), JSON.dump(body)] end + +def update_repos(request) + begin + request.body.rewind # in case someone already read it + REPOS.repos = JSON.parse(request.body.read) + rescue StandardError => e + warn e.message + return [500, headers, 'error'] + end + [200, headers, 'success'] +end -- 2.23.0

2 2

[PATCH compass-ci] fix rubocop warnings on bisect .rb
by Cao Xueliang 13 Oct '20

13 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 2 +- lib/mail_bisect_result.rb | 4 ++-- sbin/git-bisect | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index b4bbace..d9e5cf4 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -5,7 +5,7 @@ require 'json' require_relative 'es_query' require_relative 'sched_client' -require_relative "../src/delimiter/utils" +require_relative '../src/delimiter/utils' require_relative "#{ENV['LKP_SRC']}/lib/monitor" # find the first bad commit diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 8f1a0c0..1e85824 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -36,9 +36,9 @@ class MailBisectResult https://gitee.com/openeuler/compass-ci BODY - to = "caoxl(a)crystal.ci" + to = 'caoxl(a)crystal.ci' @hash = { 'to' => to, 'body' => body, 'subject' => subject, 'from' => 'compass-ci(a)outlook.com' } - #@hash = { 'to' => @git_commit.author_email, 'body' => body, 'subject' => subject } + # @hash = { 'to' => @git_commit.author_email, 'body' => body, 'subject' => subject } end def send_mail diff --git a/sbin/git-bisect b/sbin/git-bisect index a7f158e..4744a02 100755 --- a/sbin/git-bisect +++ b/sbin/git-bisect @@ -1,6 +1,7 @@ #!/usr/bin/env ruby # SPDX-License-Identifier: MulanPSL-2.0+ # frozen_string_literal: true + require_relative '../container/defconfig.rb' set_local_env require 'optparse' @@ -20,15 +21,13 @@ def parse_argv items end -options = {} - op = OptionParser.new do |opts| opts.banner = 'Usage: git-bisect job_id=$job_id, error_id=$error_id' - opts.separator'' + opts.separator '' opts.separator 'job_id: you submit a job to compass-ci and the job has some errors' opts.separator 'error_id: you want git bisect a error from the errors that you got' - opts.separator'' + opts.separator '' opts.on_tail('-h', '--help', 'show the help message') do puts opts @@ -44,6 +43,6 @@ unless items['job_id'] || items['error_id'] end gb = GitBisect.new(items) -result = gb.find_first_bad_commit() +result = gb.find_first_bad_commit mbr = MailBisectResult.new result mbr.create_send_email -- 2.23.0

1 0

[PATCH lkp-tests] jobs/fio-basic-openeuler.yaml: del unwanted test args
by Wei Jihui 13 Oct '20

13 Oct '20

fio test no need input args: zero_buffers,iodepth_batch, iodepth_batch_complete Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/fio-basic-openeuler.yaml | 3 --- setup/fio-setup-basic | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/jobs/fio-basic-openeuler.yaml b/jobs/fio-basic-openeuler.yaml index 7aae3eb9..3fcdaac8 100644 --- a/jobs/fio-basic-openeuler.yaml +++ b/jobs/fio-basic-openeuler.yaml @@ -8,9 +8,6 @@ fio-setup-basic: iodepth: 1024 nr_task: 2 test_size: 1G - zero_buffers: 1 - iodepth_batch: 2 - iodepth_batch_complete: 4 rwmixread: 70 rw: - write diff --git a/setup/fio-setup-basic b/setup/fio-setup-basic index 157947bb..103f84ab 100755 --- a/setup/fio-setup-basic +++ b/setup/fio-setup-basic @@ -20,11 +20,7 @@ # - numa_cpu_nodes # - pre_read # - rwmixread -# - zero_buffers # - ioscheduler -# - iodepth_batch -# - iodepth_batch_complate -# - partitions . $LKP_SRC/lib/common.sh . $LKP_SRC/lib/unit.sh @@ -50,10 +46,7 @@ size=$((test_size / nr_task)) : ${file_service_type:=roundrobin} : ${random_distribution:=random} : ${pre_read:=0} -: ${zero_buffers:=0} : ${ioscheduler:=none} -: ${iodepth_batch:=0} -: ${iodepth_batch_complete:=0} direct=$(parse_bool $direct) raw_disk=$(parse_bool $raw_disk) @@ -102,15 +95,6 @@ group_reporting create_only=1 pre_read=$pre_read " -params="zero_buffers iodepth_batch iodepth_batch_complete" -for param in $params; do - param_value="$(eval echo '$'$param)" - if [ "$param_value" != 0 ]; then - create_task="\ -$create_task -$param=$param_value" - fi -done if [ "$ioscheduler" != "none" ]; then create_task="\ -- 2.23.0

2 1

2024

2023

2022

2021

2020

Compass-ci October 2020