-Removed all ipkg_* functions and replaced them with a single ipkg function accepting...

[hvlinux.git] / stage2 / install-2

diff --git a/stage2/install-2 b/stage2/install-2
index 14ab663..34c3d45 100755 (executable)
--- a/stage2/install-2
+++ b/stage2/install-2
@@ -17,57 +17,49 @@ init_log_file
 # Scripts directory
 export SCRDIR=$(pwd)
 
-ipkg_cust  ${GDBM} cis-gdbm
-ipkg_cust  ${INETUTILS} cis-inetutils \
-    --libexecdir=/usr/sbin \
-    --localstatedir=/var \
-    --disable-ifconfig \
-    --disable-logger \
-    --disable-syslogd \
-    --disable-whois \
-    --disable-servers
-ipkg_cust  ${BZIP2} cis-bzip2
-ipkg_cust  ${DIFFUTILS} cis-diffutils
-ipkg_ac    ${FILE_PKG}
-ipkg_ac    ${GAWK} "--libexecdir=/usr/lib"
-ipkg_cust  ${FINDUTILS} cis-findutils
-ipkg_ac    ${GETTEXT}
-ipkg_ac ${GREP} "--bindir=/bin --without-included-regex"
-ipkg_cust  ${GROFF} cis-groff
-ipkg_cust  ${GZIP} cis-gzip
-
-ipkg_cust  ${KBD} cis-kbd
-ipkg_ac    ${LESS}
-ipkg_ac    ${MAKE_PACKAGE}
-ipkg_ac    ${MAN_DB} \
+ipkg ${GDBM}
+ipkg ${INETUTILS}
+ipkg -m noac ${BZIP2}
+ipkg ${DIFFUTILS}
+ipkg ${FILE_PKG}
+ipkg ${GAWK} "--libexecdir=/usr/lib"
+ipkg ${FINDUTILS}
+ipkg ${GETTEXT}
+ipkg ${GREP} "--bindir=/bin --without-included-regex"
+ipkg ${GROFF}
+ipkg ${GZIP}
+ipkg ${KBD}
+ipkg ${LESS}
+ipkg ${MAKE_PACKAGE}
+ipkg ${MAN_DB} "\
     --libexecdir=/usr/lib \
     --disable-setuid \
     --with-browser=/usr/bin/lynx \
     --with-vgrind=/usr/bin/vgrind \
-    --with-grap=/usr/bin/grap
-ipkg_cust  ${MODULE_INIT_TOOLS} cis-module-init-tools
-ipkg_ac    ${PATCH_PACKAGE}
-ipkg_cust  ${PSMISC} cis-psmisc
-ipkg_cust  ${SHADOW} cis-shadow
-ipkg_cust  ${SYSKLOGD} cis-sysklogd
-ipkg_cust  ${SYSVINIT} cis-sysvinit
-ipkg_ac    ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
-ipkg_cust  ${TEXINFO} cis-texinfo
-ipkg_cust  ${UDEV} cis-udev
-ipkg_cust  ${UDEV_CONFIG} cis-udev-config
-#ipkg_cust  ${GRUB} cis-grub
+    --with-grap=/usr/bin/grap"
+ipkg ${MODULE_INIT_TOOLS}
+ipkg ${PATCH_PACKAGE}
+ipkg ${PSMISC}
+ipkg -m noac ${SHADOW}
+ipkg ${SYSKLOGD}
+ipkg ${SYSVINIT}
+ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
+ipkg ${TEXINFO}
+ipkg ${UDEV}
+ipkg -m noac ${UDEV_CONFIG}
+ipkg ${GRUB}
 
-rscr once  "Installing HV-utilities" cis-hv-utilities
-rscr mult  "Compressing man pages"   cis-compressdoc
-rscr once  "Installing bootscripts"  cis-bootscripts
-#rscr mult "Stripping" cis-stripping
+rscr once  "Installing HV-utilities" install-hv-utilities
+rscr mult  "Compressing man pages"   compressdoc
+rscr once  "Installing bootscripts"  install-bootscripts
+#rscr mult "Stripping" stripping
 
 echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
 
 # Creating root password
 passwd root || exit 1
 
-rscr mult  "Performing post-install" cis-post-install
+rscr mult  "Performing post-install" post-install
 ldconfig
 
 lasterror=$?