Move icu from stage5 to stage2

diff --git a/config/dependencies b/config/dependencies
index 6704680..375ff52 100644 (file)
--- a/config/dependencies
+++ b/config/dependencies
@@ -179,3 +179,5 @@ ${GST_FFMPEG}: ${YASM}
 ${MERCURIAL}: ${PYTHON}
 
 ${STELLARIUM}: ${QT}
+
+${GPTFDISK}: ${ICU}

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 1a00431..d16ed7a 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -45,6 +45,7 @@ ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
 ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
+ipkg -s "icu" ${ICU}
 ipkg -m noac ${GPTFDISK}
 
 FORCE_UNSAFE_CONFIGURE=1 ipkg  -m acnb ${COREUTILS}

diff --git a/stage2/packages-update b/stage2/packages-update
index f08cc2e..65ded1f 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -95,6 +95,7 @@ fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/$(get_pkg_ver ${DHCP})"
 
 fpkg -e "tar.gz" ${ACPID} "http://www.tedfelix.com/linux"
 fpkg -m hv ${HV_UTILITIES}
+fpkg -e "tgz" ${ICU} "http://download.icu-project.org/files/icu4c/49.1.2"
 fpkg -m sf ${GPTFDISK}
 
 exit $?

diff --git a/stage2/pkg/icu b/stage2/pkg/icu
new file mode 100644 (file)
index 0000000..de2fa60
--- /dev/null
+++ b/stage2/pkg/icu
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+hvconfig()
+{
+    cd ${LFS_TMP}/${PACKAGE}/source
+
+    ./configure ${CONFIGURE_OPTS}
+}

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index be896c0..452fcc5 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -21,7 +21,6 @@ ipkg ${GLIB_NETWORKING} "\
     --libexecdir=/usr/lib/glib-networking \
     --with-ca-certificates=/etc/ssl/ca-bundle.crt \
     --disable-static"
-ipkg -s "icu" ${ICU}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then

diff --git a/stage5/packages-update b/stage5/packages-update
index c36b265..67e90fe 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -22,7 +22,6 @@ fpkg -e "tar.gz" ${FOOMATIC_FILTERS} "http://www.openprinting.org/download/fooma
 fpkg -e "tar.gz" ${FOO2ZJS} "http://foo2zjs.rkkda.com"
 
 fpkg -m gnome ${GLIB_NETWORKING}
-fpkg -e "tgz" ${ICU} "http://download.icu-project.org/files/icu4c/49.1.2"
 
 fpkg -m gnome ${LIBSIGCPP}
 fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"

diff --git a/stage5/pkg/icu b/stage5/pkg/icu
deleted file mode 100644 (file)
index de2fa60..0000000
--- a/stage5/pkg/icu
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}/source
-
-    ./configure ${CONFIGURE_OPTS}
-}