diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh index 3860a3f..2b7d2f2 100755 --- a/tinyipa/build-tinyipa.sh +++ b/tinyipa/build-tinyipa.sh @@ -10,6 +10,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="9.x" CHROOT_PATH="/tmp/overides:/usr/local/sbin:/usr/local/bin:/apps/bin:/usr/sbin:/usr/bin:/sbin:/bin" CHROOT_CMD="sudo chroot $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy" @@ -41,8 +42,8 @@ fi choose_tc_mirror cd $WORKDIR/build_files -wget -N $TINYCORE_MIRROR_URL/8.x/x86_64/release/distribution_files/corepure64.gz -wget -N $TINYCORE_MIRROR_URL/8.x/x86_64/release/distribution_files/vmlinuz64 +wget -N $TINYCORE_MIRROR_URL/$TC_RELEASE/x86_64/release/distribution_files/corepure64.gz +wget -N $TINYCORE_MIRROR_URL/$TC_RELEASE/x86_64/release/distribution_files/vmlinuz64 cd $WORKDIR ######################################################## @@ -168,7 +169,7 @@ cd $WORKDIR/build_files && mksquashfs $BUILDDIR/tmp/tgt-installed tgt.tcz && md5 # Build qemu-utils rm -rf $WORKDIR/build_files/qemu-utils.tcz -$CHROOT_CMD /bin/sh -c "cd /tmp/qemu && ./configure --disable-system --disable-user --disable-linux-user --disable-bsd-user --disable-guest-agent --disable-blobs && make && make install DESTDIR=/tmp/qemu-utils" +$CHROOT_CMD /bin/sh -c "cd /tmp/qemu && ./configure --disable-system --disable-user --disable-linux-user --disable-bsd-user --disable-guest-agent --disable-blobs --python=/usr/local/bin/$TINYIPA_PYTHON_EXE && make && make install DESTDIR=/tmp/qemu-utils" find $BUILDDIR/tmp/qemu-utils/ -type f -executable | xargs file | awk -F ':' '/ELF/ {print $1}' | sudo xargs strip cd $WORKDIR/build_files && mksquashfs $BUILDDIR/tmp/qemu-utils qemu-utils.tcz && md5sum qemu-utils.tcz > qemu-utils.tcz.md5.txt # Create qemu-utils.tcz.dep diff --git a/tinyipa/build_files/buildreqs.lst b/tinyipa/build_files/buildreqs.lst index cb98fca..9a08d9d 100644 --- a/tinyipa/build_files/buildreqs.lst +++ b/tinyipa/build_files/buildreqs.lst @@ -11,7 +11,7 @@ gdisk.tcz git.tcz glib2-dev.tcz hdparm.tcz -ipv6-4.8.17-tinycore64.tcz +ipv6-4.14.10-tinycore64.tcz libpci-dev.tcz libtool-dev.tcz libtool.tcz @@ -19,8 +19,8 @@ parted.tcz pciutils.tcz pixman-dev.tcz pkg-config.tcz -raid-dm-4.8.17-tinycore64.tcz -scsi-4.8.17-tinycore64.tcz +raid-dm-4.14.10-tinycore64.tcz +scsi-4.14.10-tinycore64.tcz udev-lib.tcz util-linux.tcz zlib_base-dev.tcz diff --git a/tinyipa/build_files/fakeuname b/tinyipa/build_files/fakeuname index 96405e3..ab8e004 100755 --- a/tinyipa/build_files/fakeuname +++ b/tinyipa/build_files/fakeuname @@ -2,7 +2,7 @@ S="Linux" N="box" -R="4.8.17-tinycore64" +R="4.14.10-tinycore64" P="unknown" V="#2017 SMP" M="x86_64" diff --git a/tinyipa/build_files/finalreqs.lst b/tinyipa/build_files/finalreqs.lst index 569be73..d5f9a72 100644 --- a/tinyipa/build_files/finalreqs.lst +++ b/tinyipa/build_files/finalreqs.lst @@ -6,14 +6,14 @@ glib2.tcz file.tcz hdparm.tcz iproute2.tcz -ipv6-4.8.17-tinycore64.tcz +ipv6-4.14.10-tinycore64.tcz libxml2.tcz mdadm.tcz parted.tcz popt.tcz pciutils.tcz -raid-dm-4.8.17-tinycore64.tcz -scsi-4.8.17-tinycore64.tcz +raid-dm-4.14.10-tinycore64.tcz +scsi-4.14.10-tinycore64.tcz smartmontools.tcz udev-lib.tcz util-linux.tcz \ No newline at end of file