Update samba for new ipkg() -d option

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 2f006e4..e236cf1 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -289,7 +289,11 @@ ipkg -m noac ${MERCURIAL}
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
-    ipkg ${SAMBA}
+    ipkg -d source ${SAMBA} "\
+        --localstatedir=/var \
+        --with-piddir=/var/run \
+        --with-fhs \
+        --with-smbmount"
 fi
 
 if [ "x${INST_TYPE}" = "xltsp-server" ]; then

diff --git a/stage5/pkg/samba b/stage5/pkg/samba
index 7c6be69..3926f0d 100644 (file)
--- a/stage5/pkg/samba
+++ b/stage5/pkg/samba
@@ -3,14 +3,6 @@
 hvconfig_pre()
 {
     install -d /var/cache/samba
-
-    cd ${LFS_TMP}/${PACKAGE}/source
-    ./configure \
-        ${CONFIGURE_OPTS} \
-        --localstatedir=/var \
-        --with-piddir=/var/run \
-        --with-fhs \
-        --with-smbmount
 }
 
 hvbuild_post()