From 7274e2ee81e28c36988873f77f0da30b06e072e1 Mon Sep 17 00:00:00 2001
From: Mathieu Mitchell <mmitchell@iweb.com>
Date: Wed, 11 May 2016 08:18:17 -0400
Subject: [PATCH] Use TinyCore Linux 7.x for TinyIPA

Bump to the latest version mainly to get the slimmed down gdisk [1].

Additionally, ensure /dev/pts is mounted in the chroot to avoid make
from segfaulting when ttyname fails [2]. This only affects interactive
mode.

[1]: http://forum.tinycorelinux.net/index.php/topic,19951.0.html
[2]: http://patches.openembedded.org/patch/117921/

Change-Id: If752cd9ed561a571c9690eb7390c3ee3910b09e0
---
 imagebuild/tinyipa/build-tinyipa.sh          | 10 ++++++----
 imagebuild/tinyipa/build_files/buildreqs.lst |  4 ++--
 imagebuild/tinyipa/build_files/fakeuname     |  2 +-
 imagebuild/tinyipa/build_files/finalreqs.lst |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/imagebuild/tinyipa/build-tinyipa.sh b/imagebuild/tinyipa/build-tinyipa.sh
index b3e8c45ab..cf48c6f35 100755
--- a/imagebuild/tinyipa/build-tinyipa.sh
+++ b/imagebuild/tinyipa/build-tinyipa.sh
@@ -27,8 +27,8 @@ fi
 ##############################################
 
 cd $WORKDIR/build_files
-wget -N http://distro.ibiblio.org/tinycorelinux/6.x/x86_64/release/distribution_files/corepure64.gz
-wget -N http://distro.ibiblio.org/tinycorelinux/6.x/x86_64/release/distribution_files/vmlinuz64
+wget -N http://distro.ibiblio.org/tinycorelinux/7.x/x86_64/release/distribution_files/corepure64.gz
+wget -N http://distro.ibiblio.org/tinycorelinux/7.x/x86_64/release/distribution_files/vmlinuz64
 cd $WORKDIR
 
 ########################################################
@@ -59,7 +59,11 @@ cp requirements.txt $BUILDDIR/tmp/ipa-requirements.txt
 cd $WORKDIR
 
 sudo cp /etc/resolv.conf $BUILDDIR/etc/resolv.conf
+
+trap "sudo umount $BUILDDIR/proc; sudo umount $BUILDDIR/dev/pts" EXIT
 sudo mount --bind /proc $BUILDDIR/proc
+sudo mount --bind /dev/pts $BUILDDIR/dev/pts
+
 $CHROOT_CMD mkdir /etc/sysconfig/tcedir
 $CHROOT_CMD chmod a+rwx /etc/sysconfig/tcedir
 $CHROOT_CMD touch /etc/sysconfig/tcuser
@@ -72,8 +76,6 @@ while read line; do
     sudo chroot --userspec=$TC:$STAFF $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy tce-load -wci $line
 done < $WORKDIR/build_files/buildreqs.lst
 
-sudo umount $BUILDDIR/proc
-
 # Build python wheels
 $CHROOT_CMD python /tmp/get-pip.py
 $CHROOT_CMD pip install pbr
diff --git a/imagebuild/tinyipa/build_files/buildreqs.lst b/imagebuild/tinyipa/build_files/buildreqs.lst
index eabd129ce..2b5c216df 100644
--- a/imagebuild/tinyipa/build_files/buildreqs.lst
+++ b/imagebuild/tinyipa/build_files/buildreqs.lst
@@ -7,8 +7,8 @@ hdparm.tcz
 parted.tcz
 python.tcz
 python-dev.tcz
-raid-dm-3.16.6-tinycore64.tcz
-scsi-3.16.6-tinycore64.tcz
+raid-dm-4.2.9-tinycore64.tcz
+scsi-4.2.9-tinycore64.tcz
 udev-lib.tcz
 util-linux.tcz
 pkg-config.tcz
diff --git a/imagebuild/tinyipa/build_files/fakeuname b/imagebuild/tinyipa/build_files/fakeuname
index a6e31fdd0..28cf1f2cd 100755
--- a/imagebuild/tinyipa/build_files/fakeuname
+++ b/imagebuild/tinyipa/build_files/fakeuname
@@ -1,7 +1,7 @@
 #!/bin/sh
 S="Linux"
 N="box"
-R="3.16.6-tinycore64"
+R="4.2.9-tinycore64"
 P="unknown"
 V="#777 SMP (2016-02-29)"
 M="x86_64"
diff --git a/imagebuild/tinyipa/build_files/finalreqs.lst b/imagebuild/tinyipa/build_files/finalreqs.lst
index 677bd084a..72d2cd567 100644
--- a/imagebuild/tinyipa/build_files/finalreqs.lst
+++ b/imagebuild/tinyipa/build_files/finalreqs.lst
@@ -6,8 +6,8 @@ hdparm.tcz
 iproute2.tcz
 parted.tcz
 python.tcz
-raid-dm-3.16.6-tinycore64.tcz
-scsi-3.16.6-tinycore64.tcz
+raid-dm-4.2.9-tinycore64.tcz
+scsi-4.2.9-tinycore64.tcz
 udev-lib.tcz
 util-linux.tcz
 glib2.tcz