From 262b824a795366bcc0490f2c35dcec76330027d9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 13 Mar 2012 16:08:14 +0100
Subject: [PATCH] autoport: add -npa option and differentiate it from -np to
 force not-preparing all jobs versus only command line passed jobs Update
 configuration files for arm

---
 autoport                 | 23 +++++++++++++++--------
 etc/autodist/distdb.arm  | 12 ++++++++++++
 etc/autodist/unstage.arm |  2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/autoport b/autoport
index ee0510e..31070b5 100755
--- a/autoport
+++ b/autoport
@@ -27,7 +27,8 @@ ${me[0]} ${me[1]}
    -a                 "$"Automatic mode (use cache)
    -b                 "$"Batch port all packages in port repository to sync with base repository
    -f                 "$"Force operations
-   -np                "$"Don't prepare packages
+   -np                "$"Don't prepare jobs passed to command line unless specfile is not found
+   -npa               "$"Don't prepare any jobs unless specfile is not found
    -nr                "$"Don't recurse build
    --fix              "$"Fix .la files for cross linking and exit
    -r                 "$"Work on given repository (default: $PORT_REPOSITORY)
@@ -181,6 +182,8 @@ for ((i=1; i<=$#; i++)); do
       -b) BATCH_MODE=1 ;;
       -f) FORCE_MODE=1 ;;
       -v) VERBOSE_MODE=1 ;;
+      -npa) DONT_PREPARE_ANY=1
+            DONT_PREPARE=1 ;;
       -np) DONT_PREPARE=1 ;;
       -nr) DONT_RECURSE=1 ;;
       --fix) FIX_MODE=1 ;;
@@ -359,12 +362,16 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             JOB_FAILED=(${JOB_FAILED[*]} $JOB_CURRENT)
             continue
          fi
-         [ ! -e ${SPECDIR}/${JOB_CURRENT}.spec ] && DONT_PREPARE_THIS= || DONT_PREPARE_THIS="$DONT_PREPARE"
+         DONT_PREPARE_THIS=
+         for p in ${JOB_CMDLINE[*]}; do
+            [ "$p" = "${JOB_CURRENT}" -o "$DONT_PREPARE_ANY" ] || continue
+            [ -e ${SPECDIR}/${JOB_CURRENT}.spec ] && DONT_PREPARE_THIS="$DONT_PREPARE"
+         done
          [ ! "$DONT_PREPARE_THIS" -a ! "`grep ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs`" ] && {
             echo -n "prepare"
             [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS"
-            LANG=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS &>>$logfile
+%% COMMAND: LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS"
+            LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS &>>$logfile
             [ $? -gt 0 ] && {
                JOB_CANTPREPARE=(${JOB_CANTPREPARE[*]} $JOB_CURRENT)
                echo "(FAILED) "
@@ -376,8 +383,8 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             if [ "$PORT_REPOSITORY" != "$DEST_REPOSITORY" ]; then
                echo -n "update"
                [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\""
-               LANG=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\" &>>$logfile
+%% COMMAND: LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\""
+               LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\" &>>$logfile
                [ $? -gt 0 ] && {
                   echo "(FAILED) "
                   continue
@@ -397,7 +404,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          }
          [ "$PORT_REPOSITORY" != "$DEST_REPOSITORY" ] && pkg_repository="$DEST_REPOSITORY"
          [ ! "$DONT_PREPARE_THIS" -a "$PORT_REPOSITORY" = "$DEST_REPOSITORY" ] && NOSRPM_OPTS="--nosrpm" || NOSRPM_OPTS="--force"
-         LANG=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $pkg_repository --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS &>$tmpfile
+         LANG=C LC_ALL=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $pkg_repository --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS &>$tmpfile
          [ $? -gt 0 ] && {
             if [ "$VERBOSE_MODE" ]; then
                echo
@@ -421,7 +428,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             echo -n "(OK) "
          }
          echo -n "install"
-         LANG=C autodist -i ${JOB_CURRENT} --arch $TARGET_ARCH --force --severity 2 -- $STAGEOPTS &>>$tmpfile
+         LANG=C LC_ALL=C autodist -i ${JOB_CURRENT} --arch $TARGET_ARCH --force --severity 2 -- $STAGEOPTS &>>$tmpfile
          # --server $DEST_REPOSITORY --repository $PORT_REPOSITORY
          [ $? -gt 0 ] && {
             if [ "$VERBOSE_MODE" ]; then
diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm
index 17e0b7a..88df8c0 100644
--- a/etc/autodist/distdb.arm
+++ b/etc/autodist/distdb.arm
@@ -28,6 +28,12 @@ target,KERNEL_TARGET
 arm,mamba-arm
 )
 
+linux_firmware=(
+linux-firmware
+target,KERNEL_TARGET,KERNEL_VER
+arm,mamba-arm,3.2
+)
+
 pam=(
 pam
 bootstrap
@@ -57,3 +63,9 @@ gcc
 disable_jack,disable_gjdoc,disable_java
 1,1,1
 )
+
+udev=(
+udev
+%build_and_install
+0
+)
diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm
index 4200eb6..1277302 100644
--- a/etc/autodist/unstage.arm
+++ b/etc/autodist/unstage.arm
@@ -8,4 +8,4 @@ python
 glib
 libnfsidmap
 ghostscript
-
+liblcms