Changeset 14128 in hybrid for branches/releng-11

Timestamp:

Apr 11, 2018, 6:14:10 PM (7 years ago)

Author:

rick

Message:

Fix pkg creation symlinks from image scipt

Using the old 'hackish' method, call package-build.sh instead.

Location:

branches/releng-11/nanobsd

Files:

• cfg/nanobsd.wleiden (modified) (1 diff)
• tools/image (modified) (1 diff)

branches/releng-11/nanobsd/cfg/nanobsd.wleiden

@@ -75 +75 @@
 net/lvrouted
 `
-# Package target
-PKG_MAKE_ARGS="PACKAGES=$(dirname $NANO_PACKAGE_DIR) BATCH=yes PACKAGE_BUILDING=yes"
-
 PKG_MAKE_CONF="
 # www/py-cherrypy         - include apache templating

branches/releng-11/nanobsd/tools/image

@@ -272 +272 @@
 elif [ "$1" = "ports" ]; then
   if [ "$2" = "update" ]; then
-    # Fetch the latest details and provide listing of packages to be updated
-    portsnap fetch update || exit 1
-
-    # HACK: install our own ports _inside_ the normal ports dir
-    cp -fR $WL_PORTSDIR/* $PORTSDIR || exit 1
-
-    # Make sure portmaster is present to update all ports
-    portmaster --version 1>/dev/null 2>/dev/null || make -C /usr/ports/ports-mgmt/portmaster BATCH=yes install clean || exit 1
-
-    # Update via portmaster
-    CMD="env `echo $PKG_MAKE_ARGS` portmaster --no-confirm --update-if-newer -t -y -d -G  `echo $PACKAGE_LIST`"
-    echo "# Going to run port upgrade cycle: $CMD"; $CMD || exit 1
-
-    . ${BASEDIR}/package-build.sh
+    ${BASEDIR}/package-build.sh update
   elif [ "$2" = "force" -a "$3" = "rebuild" ]; then
-    export FORCE_REBUILD=1
-    . ${BASEDIR}/package-build.sh
+    ${BASEDIR}/package-build.sh rebuild
   else
     shift 1