openstack
/
ironic-python-agent
Code Issues Proposed changes

Switch from sourceforge to github for ipmitool 

Currently CI fails on build ipa image on xenial, because downloading
with wget from sourceforce is giving SSL error. Start using the
github mirror, that is not having this problem.

Additionally added autoconf, autogen, automake, and libtool
to the build requirements as the new ipmitool package is based
off of repository commit history tags and did not contain
a pregenerated configure file.

Change-Id: I139679db835b7a87c55f69a4d807ff8ec9099e3a
(cherry picked from commit 80be07ae79)
This commit is contained in:
Yolanda Robla 2018-06-26 12:00:44 +02:00 committed by Julia Kreger
parent 0e64316282
commit aa48141706
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imagebuild/tinyipa/build-tinyipa.sh
View File

@ -62,7 +62,7 @@ sudo sh -c "echo $TINYCORE_MIRROR_URL > $BUILDDIR/opt/tcemirror"
clone_and_checkout "https://github.com/fujita/tgt.git" "${BUILDDIR}/tmp/tgt" "v1.0.62" clone_and_checkout "https://github.com/fujita/tgt.git" "${BUILDDIR}/tmp/tgt" "v1.0.62"
clone_and_checkout "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "v2.5.0" clone_and_checkout "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "v2.5.0"
if $TINYIPA_REQUIRE_IPMITOOL; then if $TINYIPA_REQUIRE_IPMITOOL; then
wget -N -O - https://sourceforge.net/projects/ipmitool/files/ipmitool/1.8.18/ipmitool-1.8.18.tar.gz/download | tar -xz -C "${BUILDDIR}/tmp" -f - wget -N -O - https://github.com/ipmitool/ipmitool/archive/IPMITOOL_1_8_18.tar.gz | tar -xz -C "${BUILDDIR}/tmp" -f -
fi fi
# Create directory for python local mirror # Create directory for python local mirror
@ -135,7 +135,8 @@ echo "glib2.tcz" > qemu-utils.tcz.dep
if $TINYIPA_REQUIRE_IPMITOOL; then if $TINYIPA_REQUIRE_IPMITOOL; then
rm -rf $WORKDIR/build_files/ipmitool.tcz rm -rf $WORKDIR/build_files/ipmitool.tcz
$CHROOT_CMD /bin/sh -c "cd /tmp/ipmitool-* && ./configure && make && make install DESTDIR=/tmp/ipmitool" # NOTE(TheJulia): Explicitly add the libtool path since /usr/local/ is not in path from the chroot.
$CHROOT_CMD /bin/sh -c "cd /tmp/ipmitool-* && env LIBTOOL='/usr/local/bin/libtool' ./bootstrap && ./configure && make && make install DESTDIR=/tmp/ipmitool"
find $BUILDDIR/tmp/ipmitool/ -type f -executable | xargs file | awk -F ':' '/ELF/ {print $1}' | sudo xargs strip find $BUILDDIR/tmp/ipmitool/ -type f -executable | xargs file | awk -F ':' '/ELF/ {print $1}' | sudo xargs strip
cd $WORKDIR/build_files && mksquashfs $BUILDDIR/tmp/ipmitool ipmitool.tcz && md5sum ipmitool.tcz > ipmitool.tcz.md5.txt cd $WORKDIR/build_files && mksquashfs $BUILDDIR/tmp/ipmitool ipmitool.tcz && md5sum ipmitool.tcz > ipmitool.tcz.md5.txt
fi fi

6
imagebuild/tinyipa/build_files/buildreqs.lst
View File

@ -17,3 +17,9 @@ glib2-dev.tcz
pixman-dev.tcz pixman-dev.tcz
binutils.tcz binutils.tcz
git.tcz git.tcz
autoconf.tcz
autogen.tcz
autogen-dev.tcz
automake.tcz
libtool.tcz
libtool-dev.tcz