From 011131ab05dd90ed1579d83e45940630e76ebadc Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 18 Feb 2021 18:07:57 +0100 Subject: [PATCH] Use tinycore 12 to build tinyipa Tinycore 12.x is out, let's use it to build tinyipa. - Adapt packages installation lists. - Use 5.10.3 instead of 5.4.3 in fakeuname to sync with the new kernel. - Patch ipmitool to fix issue when compiling with gcc version 10.x or higher. Depends-On: https://review.opendev.org/c/openstack/ironic/+/777342 Depends-On: https://review.opendev.org/c/openstack/ironic-python-agent/+/778658 Change-Id: I5a213d8409b1288af282dc3110e6e77c89317f31 --- tinyipa/build-tinyipa.sh | 4 +++- tinyipa/build_files/buildreqs.lst | 8 ++++---- tinyipa/build_files/fakeuname | 2 +- tinyipa/build_files/finalreqs.lst | 16 ++++++++-------- tinyipa/patches/ipmitool-hpmfwupg_c.patch | 9 +++++++++ tinyipa/patches/ipmitool-hpmfwupg_h.patch | 9 +++++++++ 6 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 tinyipa/patches/ipmitool-hpmfwupg_c.patch create mode 100644 tinyipa/patches/ipmitool-hpmfwupg_h.patch diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh index 38e63e3..506887f 100755 --- a/tinyipa/build-tinyipa.sh +++ b/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 diff --git a/tinyipa/build_files/buildreqs.lst b/tinyipa/build_files/buildreqs.lst index 09b960a..b85323a 100644 --- a/tinyipa/build_files/buildreqs.lst +++ b/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 \ No newline at end of file diff --git a/tinyipa/build_files/fakeuname b/tinyipa/build_files/fakeuname index 34dfac9..93c0932 100755 --- a/tinyipa/build_files/fakeuname +++ b/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" diff --git a/tinyipa/build_files/finalreqs.lst b/tinyipa/build_files/finalreqs.lst index 8d2fe75..4ce9b23 100644 --- a/tinyipa/build_files/finalreqs.lst +++ b/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 \ No newline at end of file diff --git a/tinyipa/patches/ipmitool-hpmfwupg_c.patch b/tinyipa/patches/ipmitool-hpmfwupg_c.patch new file mode 100644 index 0000000..4253d4a --- /dev/null +++ b/tinyipa/patches/ipmitool-hpmfwupg_c.patch @@ -0,0 +1,9 @@ +@@ -52,6 +52,8 @@ + # include + #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); diff --git a/tinyipa/patches/ipmitool-hpmfwupg_h.patch b/tinyipa/patches/ipmitool-hpmfwupg_h.patch new file mode 100644 index 0000000..c06b4da --- /dev/null +++ b/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)