From 7006b41ab2c65b074af7b4644d2fe70296399454 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sat, 17 May 2014 14:22:41 -0400
Subject: [PATCH] Move lzo and lzop from stage3 to stage2

---
 stage2/hv-install-2    | 3 +++
 stage2/packages-update | 3 +++
 stage3/hv-install-1    | 3 ---
 stage3/packages-update | 2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 1a820b8..71ca365 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -58,6 +58,9 @@ ipkg ${NANO}
 ipkg -m noac ${ACPID}
 ipkg ${HV_UTILITIES} "--prefix=/usr/local"
 
+ipkg ${LZO} "--enable-shared --disable-static"
+ipkg ${LZOP}
+
 ipkg -c -m noac -l "kernel" -s "kernel" ${KERNEL}
 
 rscr once "Installing bootscripts"  install-bootscripts
diff --git a/stage2/packages-update b/stage2/packages-update
index 65ded1f..b960070 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -98,4 +98,7 @@ fpkg -m hv ${HV_UTILITIES}
 fpkg -e "tgz" ${ICU} "http://download.icu-project.org/files/icu4c/49.1.2"
 fpkg -m sf ${GPTFDISK}
 
+fpkg -e "tar.gz" ${LZO}  "http://www.oberhumer.com/opensource/lzo/download"
+fpkg -e "tar.gz" ${LZOP} "http://www.lzop.org/download"
+
 exit $?
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 7454907..4b19c44 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -6,9 +6,6 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
-ipkg ${LZO} "--enable-shared --disable-static"
-ipkg ${LZOP}
-
 ipkg -m noac ${BASHCOMPLETION}
 ipkg ${WHICH}
 ipkg -m acnb ${REISERFSPROGS}
diff --git a/stage3/packages-update b/stage3/packages-update
index 8b68bc5..43780e8 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -13,8 +13,6 @@ lpkg 2 ${SHADOW}
 
 # These packages are only for stage3
 
-fpkg -e "tar.gz" ${LZO}  "http://www.oberhumer.com/opensource/lzo/download"
-fpkg -e "tar.gz" ${LZOP} "http://www.lzop.org/download"
 fpkg -m gnu ${WHICH}
 fpkg -e "tar.gz" ${BASHCOMPLETION} "http://www.caliban.org/files/bash"
 fpkg -s "software/utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
-- 
2.20.1