upgrade builders

package-builder/builder.sh

@@ -2,6 +2,7 @@
 
 PATH_SRC=/src
 PATH_FEEDS=/feeds
+PATH_OUTPUT=/output
 CUSTOM_FEEDS=$(ls $PATH_FEEDS)
 CPUS=${CPUS:-2}
 CLEAN=${CLEAN:-0}
@@ -15,33 +16,47 @@ CLEAN=${CLEAN:-0}
 ## HANDLE FEEDS
 cp $PATH_SRC/feeds.conf.default $PATH_SRC/feeds.conf
 for CUSTOM_FEED in $CUSTOM_FEEDS; do
-    echo "src-link ${CUSTOM_FEED} file://${PATH_FEEDS}/${CUSTOM_FEED}" >> $PATH_SRC/feeds.conf
+    echo "src-link ${CUSTOM_FEED} ${PATH_FEEDS}/${CUSTOM_FEED}" >> $PATH_SRC/feeds.conf
 done;
 
 ./scripts/feeds update -a
 for CUSTOM_FEED in $CUSTOM_FEEDS; do
-    ./scripts/feeds install -a -p $CUSTOM_FEED
+  ./scripts/feeds install -a -p $CUSTOM_FEED
+done;
+
+for PACKAGE in $PACKAGES; do
+  ./scripts/feeds install "$PACKAGE"
 done;
 
 make defconfig
-echo "- Building packages $PACKAGES..."
+echo "- Building packages: $PACKAGES"
 
-COMMANDS=""
-[ "$CLEAN" != "0" ] && {
-  for PACKAGE in $PACKAGES; do
-    COMMANDS="$COMMANDS package/${PACKAGE}/clean"
-  done
-}
-for PACKAGE in $PACKAGES; do
-  COMMANDS="$COMMANDS package/${PACKAGE}/download"
-}
-for PACKAGE in $PACKAGES; do
-  COMMANDS="$COMMANDS package/${PACKAGE}/compile"
+MAKE="make"
+
+[ ! -z $DEBUG ] && {
+  MAKE="$MAKE V=s"
 }
 
-make -j ${CPUS} ${COMMANDS} \
-  BIN_DIR="$PATH_OUTPUT"
+# Add CPUs
+MAKE="$MAKE -j${CPUS}"
+
+for PACKAGE in $PACKAGES; do
+  $MAKE package/${PACKAGE}/compile
+done;
+
+echo "Building repository Packages"
+$MAKE package/index
+cp -vfR $PATH_SRC/bin/* /output
 
 # Move bin/packages contents to the PATH_OUTPUT
-echo "- Moving built packages to output dir..."
-mv -v bin/packages/* $PATH_OUTPUT
+# for package in $(find $PATH_SRC/bin | grep ".ipk$"); do
+#   cp "$package" /output;
+# done;
+
+# Build packages.gz
+# export PATH="$PATH:$PATH_SRC/staging_dir/host/bin/"
+# cd $PATH_OUTPUT
+# $PATH_SRC/scripts/ipkg-make-index.sh . > Packages
+# gzip --keep Packages
+
+echo "Finished!"