Replaced complicated preprunitservice file and directory generation with simpler getopts

bldpkg

@@ -313,47 +313,25 @@ runtime() {
   return 0
 }
 
-# Function to prepare runit service directories for a particular daemon
-# To be invoked inside a package build file.
 preprunitservice() {
-              	
-  # usage: $ preprunitservice <chrony> <down> <finish>
-  # Will create the chrony service directories with a down and a finish file to prevent auto-execution
-  # at next boot and to provide a clean exit respectively. Use the first argument to define the service name
-  rsname="$1"
-  # Use the second argument to add the down file
-  down="$2"
-  # Use the third argument to add the finish file
-  finish="$3"
-   
-  # Enter the staging directory
-  cd "$pkg"
+  # Usage: preprunitservice -s chrony -d -f 
+  while getopts ':dfs:' option; do
+    case "$option" in
+      d) downfile=1 ;; # Add a 'down' file 
+      f) finishfile=1 ;; # Add a 'finish' file
+      s) servicefile="$OPTARG" ;; # Add main runit service file
+    esac
+  done
 
-  # Create the service directories
-  mkdir -p "etc/service/$rsname" var/service 
-
-  # Copy the service run file from the source directory into etc/service/$1
-  if [[ -f $srcdir/$rsname.run ]] ; then
-    cp "$srcdir/$rsname.run" "etc/service/$rsname/run"
-  else
-    err "Runit service file '$rsname.run' does not exist!"
-  fi
-
-  # If the second argument is "down", or if the second argument is "finish", create that file inside etc/service/$1/
-  if [[ $2 = down ]]; then
-    touch "etc/service/$rsname/down"
-  elif [[ $2 = finish ]]; then
-    cp "$srcdir/$1.$2" "etc/service/$1/finish"
-  fi
-
-  # If the third argument is "finish", copy that file from the source directory into etc/service/$1/
-  [[ -n $3 ]] && cp "$srcdir/$1.$3" "etc/service/$1/finish"
-
-  # Create the symlinks between etc/service and var/service
-  ln -s "../../etc/service/$1" "var/service/$1"
-
-  # Finally set the executable permissions on the run file
-  chmod 0755 "$pkg/etc/service/$1/run"
+  mkdir -p $pkg/var/service
+  install -Dm 755 "$srcdir/$servicefile.run" "$pkg/etc/service/$servicefile/run"
+  (
+    cd $pkg
+    ln -s "../../etc/service/$servicefile" "var/service/$service"
+  )
+  
+  [[ -n $downfile ]] && touch "$pkg/etc/service/$servicefile/down"
+  [[ -n $finishfile ]] && touch "$pkg/etc/service/$servicefile/finish"
 }
 
 # Function to validate symlinks. 
@@ -743,7 +721,6 @@ prepbuildoutput() {
       bldtype="General build, no debug symbols"
     fi
 
-
     # Determine whether tmpfs was used
     if [[ $tmpfs = 1 ]] && [[ $tmpfsenabledforthispackage = 1 ]] ; then
       tmpfsstate="Yes"
@@ -1196,19 +1173,8 @@ done
 
 if [[ $arch = noarch ]]; then
   CFLAGS=""
-
-elif [[ $arch = aarch64 ]]; then  
-  if [[ -n $debug ]]; then
-    CFLAGS="$gccdebug $CFLAGS"
-  fi
-
-elif [[ $arch = x86_64 ]]; then
-  if [[ -n $debug ]]; then
-    CFLAGS="$gccdebug $CFLAGS"
-  fi
-
-else
-  err "Sorry! '$arch' CPU architecture not supported by SMLinux!"
+elif [[ -n $debug ]]; then
+  CFLAGS="$gccdebug $CFLAGS"
 fi
 
 CXXFLAGS="$CFLAGS"

bldpkg.conf

@@ -85,7 +85,7 @@ DISTCC_IO_TIMEOUT="1800"
 # distcc manual for complete info. Must be defined in /etc/hosts unless they
 # are an IP. Tip: Distcc by default will use only 2 cores on the local 
 # machine.
-DISTCC_HOSTS="localhost/2 mx/2,lzo"
+DISTCC_HOSTS="localhost/2 host/2,lzo"
 
 # Add sum total of the above CPU cores/threads or add your own count 
 # prepended with "-j".