--- builds_bin/build_installer	2014/12/31 16:43:42	1.29
+++ builds_bin/build_installer	2020/06/14 05:54:37	1.30
@@ -13,6 +13,11 @@ then
     echo "No $distarch directory?"
     exit 1
 fi
+if [ "$distrel" == "10" ]
+then
+    echo "do not run for $distrel"
+    exit 1
+fi
 
 rm -rf $(pwd)/$distarch/{images,isolinux} $(pwd)/$distarch/SME/base/{hdlist*,*.img}
 
@@ -81,6 +86,7 @@ then
     chmod 755 upd-instroot
     sudo chown root:root upd-instroot
 
+    echo "delete repodata repoview and rebuild"
     rm -rf $(pwd)/$distarch/{repodata,repoview}/
     mkdir -p $(pwd)/$distarch/repodata/
     /bin/cp -af $(pwd)/$distarch/Packages/base/comps.xml $(pwd)/$distarch/repodata/
@@ -89,18 +95,31 @@ then
     sync; rm -rf $(pwd)/$distarch/.olddata
 
     # add --final when we have final product
+    #PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
+    #    --product "$distname" \
+   #     --version "${distvers/[^0-9.]*/}" \
+   #     --release "$distname" \
+   #     #--brand "centos" \
+   #     --final \
+   #     --bugurl http://bugs.contribs.org/ \
+   #     --output $(pwd)/$distarch/ \
+   #     /build/smeserver/repo/testing/$distrel/smeextras/$distarch/ \
+   #     $(pwd)/$distarch/
+    echo "Anaconda buildinstall...."
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
-        --product "$distname" \
-        --version "${distvers/[^0-9.]*/}" \
-        --release "$distname" \
-        --brand "centos" \
-        --final \
-        --bugurl http://bugs.contribs.org/ \
-        --output $(pwd)/$distarch/ \
-        /build/smeserver/repo/$distrel/smeextras/$distarch/ \
-        $(pwd)/$distarch/
+         --product "$distname" \
+         --version "${distvers/[^0-9.]*/}" \
+         --release "$distname" \
+         --final \
+         --bugurl http://bugs.contribs.org/ \
+         --output $(pwd)/$distarch/ \
+         /build/smeserver/repo/$distrel/smeextras/$distarch/ \
+         $(pwd)/$distarch/
+
+    echo "sed treeinfo"
     /bin/sed -i -e "s|packagedir =.*|packagedir = Packages|" $(pwd)/$distarch/.treeinfo
 
+    echo "upd-instroot"
     sudo rm -f awk ../pci.ids *-logos-*.rpm grub-*.rpm upd-instroot
 fi
 
@@ -110,7 +129,7 @@ find $(pwd)/$distarch/SME/ -type l | xar
 # Copy updated isolinux files
 sudo cp -f /build/smeserver/stage/extra/isolinux/$distrel/* $(pwd)/$distarch/isolinux/
 
-find $(pwd)/$distarch -\( -not -user 10020 -o -not -group 10020 -\) -print0 | sudo xargs -r0 chown 10020:10020
+find $(pwd)/$distarch -\( -not -user 10007 -o -not -group 10018 -\) -print0 | sudo xargs -r0 chown 10007:10018
 find $(pwd)/$distarch -\( -type f -not -perm -0664 -o -type d -not -perm -0775 -\) -print0 | sudo xargs -r0 chmod u+rwX,g+rwX,o+rX,o-w
 
 echo "You now need to run /build/smeserver/stage/bin/build_ISO as non-root"