Changeset 10612 in hybrid for branches/releng-9.0/nanobsd/tools/image

Timestamp:

Apr 29, 2012, 6:02:29 PM (13 years ago)

Author:

rick

Message:

Make port building whole bunch more stupid:

1) Bundle ports in the tree itself, instead of global shared banch.
2) Copy the local ports just in the /usr/ports tree to allow playing around

with just the ordenary tools.

Location:

branches/releng-9.0/nanobsd

Files:

• . (modified) (1 prop)
• tools/image (modified) (3 diffs)

branches/releng-9.0/nanobsd

@@ -1 @@
-ports http://svn.wirelessleiden.nl/svn/code/ports
+

@@ -1 @@
-ports http://svn.wirelessleiden.nl/svn/code/ports
+

branches/releng-9.0/nanobsd/tools/image

@@ -22 +22 @@
 # rebuild                       - Rebuild NanoBSD (aka force rebuilding all)
 # deploy on <node> [and reboot] - Deploy the image on node and reboot if needed
+# ports update                  - Update the packages from ports 
+# ports force rebuild           - Forcefully rebuilding all required packages
 EOF
 }
@@ -110 +112 @@
 }
 
-
 #
 # Argument parsing
@@ -150 +151 @@
   fi
   deploy_image
+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
+
+    # 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
+    portmaster --no-confirm --update-if-newer -y -d -G  `echo $PKG_MAKE_ARGS | xargs -n1 echo -m `  $PACKAGE_LIST || exit 1
+
+    . ${BASEDIR}/package-build.sh
+  elif [ "$2" = "force" -a "$3" = "rebuild" ]; then
+    export FORCE_REBUILD=1
+    . ${BASEDIR}/package-build.sh
+  else
+    shift 1
+    echo "Arguments Error - '$*'"; exit 128
+  fi
 else
   echo "Argument Error - '$1'"; exit 128

@@ -1 @@
-ports http://svn.wirelessleiden.nl/svn/code/ports
+