From 531167c2d5cce2bc27d753a08fd12daa9b7db1c8 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Tue, 4 Feb 2020 16:06:47 +0100
Subject: [PATCH] Upgrade to tinycore 10.x

Upgrading tinycore from version 9.x to 10.x
This change was merged [1] and reverted [2], let's give it another
try and eventually discuss about possible issues.

[1] https://review.opendev.org/688411
[2] https://review.opendev.org/698098

Change-Id: I831b414461f77c65e34b0f357763e38e74e65e29
---
 tinyipa/build-tinyipa.sh          | 2 +-
 tinyipa/build_files/bootlocal.sh  | 2 +-
 tinyipa/build_files/buildreqs.lst | 6 +++---
 tinyipa/build_files/fakeuname     | 2 +-
 tinyipa/build_files/finalreqs.lst | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh
index 20daa17..de3e223 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="9.x"
+TC_RELEASE="10.x"
 
 TGT_RELEASE="v1.0.79"
 QEMU_RELEASE="v3.1.1"
diff --git a/tinyipa/build_files/bootlocal.sh b/tinyipa/build_files/bootlocal.sh
index 4e5b1e7..56c3a62 100755
--- a/tinyipa/build_files/bootlocal.sh
+++ b/tinyipa/build_files/bootlocal.sh
@@ -57,7 +57,7 @@ create_rescue_user() {
 
 # Setup DHCP network
 configure_dhcp_network() {
-    for pidfile in `ls /var/run/udhcpc/*.pid`; do
+    for pidfile in `ls /var/run/udhcpc*.pid`; do
         kill `cat $pidfile`
     done
 
diff --git a/tinyipa/build_files/buildreqs.lst b/tinyipa/build_files/buildreqs.lst
index 9a08d9d..f68e36e 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.14.10-tinycore64.tcz
+ipv6-4.19.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.14.10-tinycore64.tcz
-scsi-4.14.10-tinycore64.tcz
+raid-dm-4.19.10-tinycore64.tcz
+scsi-4.19.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 ab8e004..615363f 100755
--- a/tinyipa/build_files/fakeuname
+++ b/tinyipa/build_files/fakeuname
@@ -2,7 +2,7 @@
 
 S="Linux"
 N="box"
-R="4.14.10-tinycore64"
+R="4.19.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 71fa7ac..930174f 100644
--- a/tinyipa/build_files/finalreqs.lst
+++ b/tinyipa/build_files/finalreqs.lst
@@ -9,15 +9,15 @@ glib2.tcz
 haveged.tcz
 hdparm.tcz
 iproute2.tcz
-ipv6-4.14.10-tinycore64.tcz
+ipv6-4.19.10-tinycore64.tcz
 libxml2.tcz
 mdadm.tcz
 parted.tcz
 popt.tcz
 pciutils.tcz
-raid-dm-4.14.10-tinycore64.tcz
-scsi-4.14.10-tinycore64.tcz
-filesystems-4.14.10-tinycore64.tcz
+raid-dm-4.19.10-tinycore64.tcz
+scsi-4.19.10-tinycore64.tcz
+filesystems-4.19.10-tinycore64.tcz
 smartmontools.tcz
 udev-lib.tcz
 util-linux.tcz