diff -Nru freeipmi-1.6.9/debian/changelog freeipmi-1.6.9/debian/changelog --- freeipmi-1.6.9/debian/changelog 2023-05-30 10:11:32.000000000 +0200 +++ freeipmi-1.6.9/debian/changelog 2023-06-28 15:31:40.000000000 +0200 @@ -1,3 +1,10 @@ +freeipmi (1.6.9-2ubuntu0.22.04.2) jammy; urgency=medium + + * d/p/add-initial-support-for-xilinx.patch + - Fix missing header file in libfreeipmi-dev package + + -- Talha Can Havadar Wed, 28 Jun 2023 15:31:40 +0200 + freeipmi (1.6.9-2ubuntu0.22.04.1) jammy; urgency=medium * d/p/add-initial-support-for-xilinx.patch diff -Nru freeipmi-1.6.9/debian/patches/add-initial-support-for-xilinx.patch freeipmi-1.6.9/debian/patches/add-initial-support-for-xilinx.patch --- freeipmi-1.6.9/debian/patches/add-initial-support-for-xilinx.patch 2023-05-30 10:11:32.000000000 +0200 +++ freeipmi-1.6.9/debian/patches/add-initial-support-for-xilinx.patch 2023-06-28 15:28:44.000000000 +0200 @@ -24,11 +24,9 @@ Last-Update: 2023-05-30 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/ipmi-fru/Makefile.am b/ipmi-fru/Makefile.am -index d0a0a39..57c8592 100644 --- a/ipmi-fru/Makefile.am +++ b/ipmi-fru/Makefile.am -@@ -24,6 +24,8 @@ ipmi_fru_SOURCES = \ +@@ -25,6 +25,8 @@ ipmi-fru-argp.h \ ipmi-fru-oem-wistron.c \ ipmi-fru-oem-wistron.h \ @@ -36,10 +34,7 @@ + ipmi-fru-oem-xilinx.h \ ipmi-fru-output.c \ ipmi-fru-output.h - -diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.c b/ipmi-fru/ipmi-fru-oem-xilinx.c -new file mode 100644 -index 0000000..87bb18f + --- /dev/null +++ b/ipmi-fru/ipmi-fru-oem-xilinx.c @@ -0,0 +1,171 @@ @@ -214,9 +209,6 @@ + + return (0); +} -diff --git a/ipmi-fru/ipmi-fru-oem-xilinx.h b/ipmi-fru/ipmi-fru-oem-xilinx.h -new file mode 100644 -index 0000000..2484cd5 --- /dev/null +++ b/ipmi-fru/ipmi-fru-oem-xilinx.h @@ -0,0 +1,33 @@ @@ -253,8 +245,6 @@ + unsigned int oem_data_len); + +#endif /* IPMI_FRU_OEM_XILINX_H */ -diff --git a/ipmi-fru/ipmi-fru-output.c b/ipmi-fru/ipmi-fru-output.c -index 065efa8..e696e18 100644 --- a/ipmi-fru/ipmi-fru-output.c +++ b/ipmi-fru/ipmi-fru-output.c @@ -51,6 +51,7 @@ @@ -263,12 +253,14 @@ #include "ipmi-fru-oem-wistron.h" +#include "ipmi-fru-oem-xilinx.h" #include "tool-util-common.h" - + #include "freeipmi-portability.h" -@@ -1204,6 +1205,19 @@ ipmi_fru_output_oem_record (ipmi_fru_state_data_t *state_data, +@@ -1202,6 +1203,19 @@ + return (-1); + if (ret) - return (0); - } ++ return (0); ++ } + + if (manufacturer_id == IPMI_IANA_ENTERPRISE_ID_XILINX) + { @@ -280,16 +272,12 @@ + return (-1); + + if (ret) -+ return (0); -+ } + return (0); + } } - - if (oem_data_len) -diff --git a/libfreeipmi/include/freeipmi/freeipmi.h.in b/libfreeipmi/include/freeipmi/freeipmi.h.in -index a03178e..fbd6749 100644 --- a/libfreeipmi/include/freeipmi/freeipmi.h.in +++ b/libfreeipmi/include/freeipmi/freeipmi.h.in -@@ -82,6 +82,7 @@ extern "C" { +@@ -82,6 +82,7 @@ #include #include #include @@ -297,9 +285,6 @@ #include #include #include -diff --git a/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h -new file mode 100644 -index 0000000..434e203 --- /dev/null +++ b/libfreeipmi/include/freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h @@ -0,0 +1,45 @@ @@ -348,11 +333,9 @@ +#endif + +#endif /* IPMI_FRU_OEM_XILINX_RECORD_FORMAT_H */ -diff --git a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h -index d411169..746bc85 100644 --- a/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h +++ b/libfreeipmi/include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h -@@ -29,6 +29,7 @@ extern "C" { +@@ -29,6 +29,7 @@ #define IPMI_IANA_ENTERPRISE_ID_SUN_MICROSYSTEMS 42 #define IPMI_IANA_ENTERPRISE_ID_INTEL 343 #define IPMI_IANA_ENTERPRISE_ID_DELL 674 @@ -360,3 +343,54 @@ #define IPMI_IANA_ENTERPRISE_ID_MAGNUM_TECHNOLOGIES 5593 #define IPMI_IANA_ENTERPRISE_ID_QUANTA 7244 #define IPMI_IANA_ENTERPRISE_ID_FUJITSU 10368 +--- a/libfreeipmi/include/Makefile.am ++++ b/libfreeipmi/include/Makefile.am +@@ -69,6 +69,7 @@ + freeipmi/record-format/ipmi-sel-record-format.h \ + freeipmi/record-format/ipmi-sel-oem-record-format.h \ + freeipmi/record-format/oem/ipmi-fru-wistron-oem-record-format.h \ ++ freeipmi/record-format/oem/ipmi-fru-xilinx-oem-record-format.h \ + freeipmi/record-format/oem/ipmi-sdr-oem-intel-node-manager-record-format.h \ + freeipmi/record-format/oem/ipmi-sdr-oem-intel-record-format.h \ + freeipmi/record-format/oem/ipmi-sel-oem-intel-record-format.h \ +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2023-06-07 Albert Chu ++ ++ * libfreeipmi/include: Add missing xilinx header to dist. ++ + 2022-01-18 Fabrice Fontaine + + * configure.ac: use pkg-config to find gcrypt +@@ -69,7 +73,7 @@ + + * man/manpage-common-workaround-extra-text.man: Document that + Supermicro boards don't work with IPMI 1.5. +- ++ + 2020-09-21 Albert Chu + + * man/ipmi-sel.8.pre.in: Fix typo +@@ -262,14 +266,14 @@ + + * ipmi-config/: Simplify legacy command scripts to not mangle + shell parameters. +- ++ + 2018-02-16 GIRARD, MARC + + * libfreeipmi/api/ipmi-kcs-driver-api.c, + libfreeipmi/api/ipmi-lan-session-common.c, + libfreeipmi/api/ipmi-ssif-driver-api.c: When bridging, target the + BMC LUN not the SMS LUN. +- ++ + 2018-01-18 Albert Chu + + * common/toolcommon/tool-common.c (ipmi_open): Fix error output +@@ -22882,4 +22886,3 @@ + libfreeipmi/src/rmcp.h, libfreeipmi/src/smbios.c, + libfreeipmi/src/smbios.h, libfreeipmi/src/xmalloc.c, + libfreeipmi/src/xmalloc.h: First merged tree. +-