epm repack: move root files to /opt/productdir

repack.d/common.sh

@@ -304,6 +304,13 @@ move_to_opt()
         sdir="$BUILDROOT$from"
     elif has_space "$1" ; then
         sdir="$BUILDROOT$1"
+    elif [ "$1" = "/" ] ; then
+        local sfiles
+        sfiles="$(echo $BUILDROOT/*)"
+        sdir="$BUILDROOT/tmp"
+        mkdir $sdir
+        mv $sfiles $sdir
+
     else
         sdir=''
         for i in "$@" ; do
@@ -326,6 +333,13 @@ move_to_opt()
     echo "Moving $rdir to $PRODUCTDIR ..."
     mkdir -p "$BUILDROOT$(dirname "$PRODUCTDIR")/"
     mv "$BUILDROOT$rdir" "$BUILDROOT$PRODUCTDIR/"
+    if [ "$1" = "/" ] ; then
+        rdir="/"
+        subst "s|^$rdir|$PRODUCTDIR/|" $SPEC
+        subst "s|^\"$rdir|\"$PRODUCTDIR/|" $SPEC
+        pack_dir "$PRODUCTDIR"
+        return
+    fi
     subst "s|%dir $rdir|%dir $PRODUCTDIR|" $SPEC
     subst "s|%dir \"$rdir|%dir \"$PRODUCTDIR|" $SPEC
     subst "s|\(%config.*\) $rdir|\1 $PRODUCTDIR|" $SPEC

repack.d/generic-default.sh

@@ -21,6 +21,15 @@ if [ -d "$pd" ] ; then
     if [ "$bn" != "usr" ] && [ "$bn" != "opt" ] ; then
         move_to_opt "/$bn"
     fi
+else
+    flag_dir=
+    for i in $pd ; do
+        [ -d "$i" ] && flag_dir=1 && break
+    done
+    if [ -z "$flag_dir" ] ; then
+        # only a few files in the root
+        move_to_opt "/"
+    fi
 fi
 
 # FIXME: hack for nonstandart name