Correction erreurs de noms de fonctions

[hvlinux.git] / stage5 / pkg / pulseaudio

diff --git a/stage5/pkg/pulseaudio b/stage5/pkg/pulseaudio
index 2dd8a07..25be81c 100644 (file)
--- a/stage5/pkg/pulseaudio
+++ b/stage5/pkg/pulseaudio
@@ -1,39 +1,31 @@
-#!/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}
-
-groupadd -f pulse
-groupadd -f pulse-access
-hv_useradd -g pulse -d /var/run/pulse pulse
-
-gpasswd -a hugo pulse-access
-
-# Il faut ajouter l'usager pulse au groupe audio.
-gpasswd -a pulse audio
-
-cd ${LFS_TMP}/${1}-build
-../${1}/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-# Workaround pour éliminer les messages de warning
-# reliés à SHM...
-sed -i -e "s!\(#define HAVE_SHM_OPEN 1\)!/* \1 */!g" config.h
-
-make
-make install
-ldconfig
-
-cat > /etc/pulse/daemon.conf << "EOF"
+#!/bin/bash
+
+hvconfig_pre()
+{
+    groupadd -f pulse
+    groupadd -f pulse-access
+    hv_useradd -g pulse -d /var/run/pulse pulse
+
+    gpasswd -a ${REGUSER} pulse-access
+
+    # Il faut ajouter l'usager pulse au groupe audio.
+    gpasswd -a pulse audio
+
+    CONFIGURE_OPTS=" \
+        ${CONFIGURE_OPTS} \
+        --localstatedir=/var"
+}
+
+hvconfig_post()
+{
+    # Workaround pour éliminer les messages de warning
+    # reliés à SHM...
+    sed -i -e "s!\(#define HAVE_SHM_OPEN 1\)!/* \1 */!g" config.h
+}
+
+hvbuild_post()
+{
+    cat > /etc/pulse/daemon.conf << "EOF"
 ## Extra verbositiy
 verbose = debug
 
@@ -78,7 +70,7 @@ system-instance = 1
 disable-shm = 1
 EOF
 
-cat > /etc/pulse/default.pa << "EOF"
+    cat > /etc/pulse/default.pa << "EOF"
 #!/usr/bin/pulseaudio -nF 
 
 #            ----------------
@@ -109,9 +101,8 @@ load-module module-volume-restore
 load-module module-rescue-streams
 EOF
 
-install -v -m740 ${SCRDIR}/bootscripts/pulseaudio /etc/rc.d/init.d
-
-# script-name start stop
-bootscript_add_rc3 pulseaudio 95 16
+    install -v -m740 ${SCRDIR}/bootscripts/pulseaudio /etc/rc.d/init.d
 
-exit $?
+    # script-name start stop
+    bootscript_add_rc3 pulseaudio 95 16
+}