X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Fsamba;h=a37bce83dab5ab8590c83a0f73841eb1aabe7759;hb=f3c8db3027d5dc530e1f30c88e0235975211582e;hp=24ab9e9e97f58bfe25ec1139cf80782fbf22ef59;hpb=0fb786eca497edb316e1dfaa4a4ccec2d6b3f694;p=hvlinux.git

diff --git a/stage5/pkg/samba b/stage5/pkg/samba
index 24ab9e9..a37bce8 100644
--- a/stage5/pkg/samba
+++ b/stage5/pkg/samba
@@ -1,58 +1,48 @@
-#!/bin/sh
-set -o errexit
-
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-install -d /var/cache/samba
-
-cd ${LFS_TMP}/${1}/source
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-piddir=/var/run \
-    --with-fhs \
-    --with-smbmount
-make
-make install
-mv /usr/lib/samba/libsmbclient.so /usr/lib
-ln -sf ../libsmbclient.so /usr/lib/samba
-
-mkdir -p /var/log/samba
-
-# libsmbclient.a doesn't seem to be installed...
-#chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a
-chmod 644 /usr/include/libsmbclient.h
-
-install -m755 nsswitch/libnss_win{s,bind}.so /lib
-ln -sf libnss_winbind.so /lib/libnss_winbind.so.2
-ln -sf libnss_wins.so /lib/libnss_wins.so.2
-cp ../examples/smb.conf.default /etc/samba
-install -m644 ../docs/*.pdf /usr/share/samba
-
-if [ -f nsswitch/pam_winbind.so ]; then 
-    install -m755 nsswitch/pam_winbind.so /lib/security
-fi
-
-ldconfig
-
-# Configuring SWAT
-string_add "swat            901/tcp" /etc/services
-string_add "swat_tunnel     902/tcp" /etc/services
-string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" /etc/inetd.conf
-
-# Bootscript
-install -v -m740 ${SCRDIR}/bootscripts/samba /etc/rc.d/init.d
-
-# script-name start stop
-bootscript_add_rc3 samba 85 10
-
-exit $?
+#!/bin/bash
+
+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()
+{
+    mv /usr/lib/samba/libsmbclient.so /usr/lib
+    ln -sf ../libsmbclient.so /usr/lib/samba
+
+    mkdir -p /var/log/samba
+
+    # libsmbclient.a doesn't seem to be installed...
+    #chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a
+    chmod 644 /usr/include/libsmbclient.h
+
+    install -m755 nsswitch/libnss_win{s,bind}.so /lib
+    ln -sf libnss_winbind.so /lib/libnss_winbind.so.2
+    ln -sf libnss_wins.so /lib/libnss_wins.so.2
+    cp ../examples/smb.conf.default /etc/samba
+    install -m644 ../docs/*.pdf /usr/share/samba
+
+    if [ -f nsswitch/pam_winbind.so ]; then 
+        install -m755 nsswitch/pam_winbind.so /lib/security
+    fi
+
+    # Configuring SWAT
+    string_add "swat            901/tcp" /etc/services
+    string_add "swat_tunnel     902/tcp" /etc/services
+    string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
+        /etc/inetd.conf
+
+    # Bootscript
+    install -v -m740 ${SCRDIR}/bootscripts/samba /etc/rc.d/init.d
+
+    # script-name start stop
+    bootscript_add_rc3 samba 85 10
+}