From e8c8a9f76b81081cd366ac872a400fc8f934ef0c Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 20 Jun 2019 07:22:13 -0700
Subject: [PATCH] Update tinycore from 9.x to 10.x
Change-Id: I14a44700df8c7acc524bd4c410d60b56cc79f67e
Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com>
---
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 6438ac0..35d8c9d 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"
# PYTHON_EXTRA_SOURCES_DIR_LIST is a csv list of python package dirs to include
PYTHON_EXTRA_SOURCES_DIR_LIST=${PYTHON_EXTRA_SOURCES_DIR_LIST:-}
diff --git a/tinyipa/build_files/bootlocal.sh b/tinyipa/build_files/bootlocal.sh
index 0fcf0b4..6a60576 100755
--- a/tinyipa/build_files/bootlocal.sh
+++ b/tinyipa/build_files/bootlocal.sh
@@ -51,7 +51,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 d5f9a72..972ec92 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.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
+raid-dm-4.19.10-tinycore64.tcz
+scsi-4.19.10-tinycore64.tcz
smartmontools.tcz
udev-lib.tcz
-util-linux.tcz
\ No newline at end of file
+util-linux.tcz