Revert "Remove the insecure protocols from the cipher List"
This patch breaks the Witherspoon build:
cp: cannot stat ‘.../downloads/cipher_list.json’:
No such file or directory
Fixes: a9123ace91413e2b6d2b3213ee9c2dde4061e94f
Change-Id: Id055e511cebe46ae61a6684cea7f6a2dfb211dd8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb
index 2737a04..8ab47c6 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb
+++ b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb
@@ -4,15 +4,12 @@
inherit obmc-phosphor-license
inherit allarch
-FILESEXTRAPATHS_prepend := \
-"${THISDIR}/../../../../../../meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/:"
-
SRC_URI = " \
file://cipher_list.json \
- file://witherspoon/dcmi_cap.json \
- file://witherspoon/dcmi_sensors.json \
- file://witherspoon/dev_id.json \
- file://witherspoon/power_reading.json \
+ file://dcmi_cap.json \
+ file://dcmi_sensors.json \
+ file://dev_id.json \
+ file://power_reading.json \
"
FILES_${PN} = " \
@@ -59,7 +56,7 @@
auxVer = count[0] + "0000"
workdir = d.getVar('WORKDIR', True)
- file = os.path.join(workdir, 'witherspoon/', 'dev_id.json')
+ file = os.path.join(workdir, 'dev_id.json')
# Update dev_id.json with the auxiliary firmware revision
with open(file, "r+") as jsonFile:
@@ -74,12 +71,12 @@
install -d ${D}${datadir}/ipmi-providers
install -m 0644 -D ${WORKDIR}/cipher_list.json \
${D}${datadir}/ipmi-providers/cipher_list.json
- install -m 0644 -D ${WORKDIR}/witherspoon/dcmi_cap.json \
+ install -m 0644 -D ${WORKDIR}/dcmi_cap.json \
${D}${datadir}/ipmi-providers/dcmi_cap.json
- install -m 0644 -D ${WORKDIR}/witherspoon/dcmi_sensors.json \
+ install -m 0644 -D ${WORKDIR}/dcmi_sensors.json \
${D}${datadir}/ipmi-providers/dcmi_sensors.json
- install -m 0644 -D ${WORKDIR}/witherspoon/dev_id.json \
+ install -m 0644 -D ${WORKDIR}/dev_id.json \
${D}${datadir}/ipmi-providers/dev_id.json
- install -m 0644 -D ${WORKDIR}/witherspoon/power_reading.json \
+ install -m 0644 -D ${WORKDIR}/power_reading.json \
${D}${datadir}/ipmi-providers/power_reading.json
}
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json
new file mode 100644
index 0000000..0f13b1e
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json
@@ -0,0 +1,38 @@
+{
+ "a":{
+ "cipher":1,
+ "authentication":1,
+ "integrity":0,
+ "confidentiality":0
+ },
+ "b":{
+ "cipher":2,
+ "authentication":1,
+ "integrity":1,
+ "confidentiality":0
+ },
+ "c":{
+ "cipher":3,
+ "authentication":1,
+ "integrity":1,
+ "confidentiality":1
+ },
+ "d":{
+ "cipher":15,
+ "authentication":3,
+ "integrity":0,
+ "confidentiality":0
+ },
+ "e":{
+ "cipher":16,
+ "authentication":3,
+ "integrity":4,
+ "confidentiality":0
+ },
+ "f":{
+ "cipher":17,
+ "authentication":3,
+ "integrity":4,
+ "confidentiality":1
+ }
+}
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dcmi_cap.json b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_cap.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dcmi_cap.json
rename to meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_cap.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dcmi_sensors.json b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_sensors.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dcmi_sensors.json
rename to meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_sensors.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dev_id.json b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dev_id.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/dev_id.json
rename to meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dev_id.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/power_reading.json b/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/power_reading.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/witherspoon/power_reading.json
rename to meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/power_reading.json