Merge "Use tinycore 12 to build tinyipa"

tinyipa/build-tinyipa.sh

@@ -9,7 +9,7 @@ TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
 TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}
 IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-}
 USE_PYTHON3=${USE_PYTHON3:-True}
-TC_RELEASE="11.x"
+TC_RELEASE="12.x"
 
 TGT_RELEASE="v1.0.80"
 QEMU_RELEASE="v4.2.0"
@@ -77,6 +77,8 @@ fi
 if $TINYIPA_REQUIRE_IPMITOOL; then
     wget -N -O - https://github.com/ipmitool/ipmitool/archive/IPMITOOL_${IPMITOOL_RELASE}.tar.gz | tar -xz -C "${BUILDDIR}/tmp" -f -
     patch ${BUILDDIR}/tmp/ipmitool-IPMITOOL_${IPMITOOL_RELASE}/src/plugins/lanplus/lanplus_crypt_impl.c < patches/ipmitool-openssl.patch
+    patch ${BUILDDIR}/tmp/ipmitool-IPMITOOL_${IPMITOOL_RELASE}/include/ipmitool/ipmi_hpmfwupg.h < patches/ipmitool-hpmfwupg_h.patch
+    patch ${BUILDDIR}/tmp/ipmitool-IPMITOOL_${IPMITOOL_RELASE}/lib/ipmi_hpmfwupg.c < patches/ipmitool-hpmfwupg_c.patch
 fi
 
 # Create directory for python local mirror

tinyipa/build_files/buildreqs.lst

@@ -11,15 +11,15 @@ gdisk.tcz
 git.tcz
 glib2-dev.tcz
 hdparm.tcz
-ipv6-netfilter-5.4.3-tinycore64.tcz
+ipv6-netfilter-5.10.3-tinycore64.tcz
 libpci-dev.tcz
 libtool-dev.tcz
 libtool.tcz
 parted.tcz
 pciutils.tcz
 pixman-dev.tcz
-raid-dm-5.4.3-tinycore64.tcz
-scsi-5.4.3-tinycore64.tcz
+raid-dm-5.10.3-tinycore64.tcz
+scsi-5.10.3-tinycore64.tcz
 udev-lib.tcz
 util-linux.tcz
-zlib_base-dev.tcz
+zlib_base-dev.tcz

tinyipa/build_files/fakeuname

@@ -2,7 +2,7 @@
 
 S="Linux"
 N="box"
-R="5.4.3-tinycore64"
+R="5.10.3-tinycore64"
 P="unknown"
 V="#2017 SMP"
 M="x86_64"

tinyipa/build_files/finalreqs.lst

@@ -1,25 +1,25 @@
 bash.tcz
 coreutils.tcz
 dmidecode.tcz
+dosfstools.tcz
 efibootmgr.tcz
 efivar.tcz
+filesystems-5.10.3-tinycore64.tcz
 file.tcz
 gdisk.tcz
 glib2.tcz
 haveged.tcz
 hdparm.tcz
 iproute2.tcz
-ipv6-netfilter-5.4.3-tinycore64.tcz
+ipv6-netfilter-5.10.3-tinycore64.tcz
 libxml2.tcz
 mdadm.tcz
+ntpclient.tcz
 parted.tcz
-popt.tcz
 pciutils.tcz
-raid-dm-5.4.3-tinycore64.tcz
-scsi-5.4.3-tinycore64.tcz
-filesystems-5.4.3-tinycore64.tcz
+popt.tcz
+raid-dm-5.10.3-tinycore64.tcz
+scsi-5.10.3-tinycore64.tcz
 smartmontools.tcz
 udev-lib.tcz
-util-linux.tcz
-ntpclient.tcz
-dosfstools.tcz
+util-linux.tcz

tinyipa/patches/ipmitool-hpmfwupg_c.patch

@@ -0,0 +1,9 @@
+@@ -52,6 +52,8 @@
+ # include <config.h>
+ #endif
+ 
++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ /* From src/plugins/ipmi_intf.c: */
+ uint16_t
+ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);

tinyipa/patches/ipmitool-hpmfwupg_h.patch

@@ -0,0 +1,9 @@
+@@ -800,8 +800,6 @@
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+-
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+ #define IMAGE_VER (0x04)