Move gperf from stage4 to stage 2 for eudev

diff --git a/config/dependencies b/config/dependencies
index 8f4cfe3..daf1efb 100644 (file)
--- a/config/dependencies
+++ b/config/dependencies
@@ -23,6 +23,8 @@ ${GSTREAMER}:
 
 ${ECRYPTFS_UTILS}: ${KEYUTILS} ${NSPR} ${NSS}
 
+${EUDEV}: ${GPERF}
+
 ${GNASH}: ${AGG} ${CAIRO} ${GSTREAMER} ${FFMPEG} ${SDL} ${FIREFOX}
 
 ${FIREFOX}: ${SQLITE} ${LIBNOTIFY} ${YASM} ${NSPR} ${NSS}

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index e0a0bd2..8a57fa7 100755 (executable)
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -13,6 +13,7 @@ ipkg ${FILE_PKG}
 ipkg ${GAWK} "--libexecdir=/usr/lib"
 ipkg ${FINDUTILS}
 ipkg ${GETTEXT}
+ipkg ${GPERF}
 ipkg ${GREP} "--bindir=/bin --without-included-regex"
 ipkg ${GROFF}
 ipkg ${GZIP}

diff --git a/stage2/packages-update b/stage2/packages-update
index a2582fb..e2c27f2 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -55,7 +55,7 @@ lpkg 1 ${XZ_UTILS}
 fpkg -e "tar.bz2" ${BC} "http://alpha.gnu.org/gnu/bc"
 fpkg -e "tar.gz" ${PERL} "http://www.cpan.org/src/5.0"
 fpkg -s "manpages" ${MANPAGES} "http://tldp.org"
-
+fpkg -m gnu -e "tar.gz" ${GPERF}
 fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
 fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
 fpkg -m gnome ${GLIB}

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 60b91d7..4be71f0 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -57,7 +57,6 @@ ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
 ipkg ${LIBXCB} ${XORG_CONFIG}
 install_xorg_modules ${XORG_LIB}
-ipkg ${GPERF}
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
 ipkg -m acnb ${LESSTIF}
 ipkg_xorg ${XBITMAPS} "data"

diff --git a/stage4/packages-update b/stage4/packages-update
index 1b164cf..d88a1de 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -81,7 +81,6 @@ fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
 fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
 fpkg -m fd -o "xcb" -s "dist" ${LIBXCB}
 fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
-fpkg -m gnu ${GPERF}
 
 fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
 fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"