Changeset 10612 in hybrid for branches/releng-9.0/nanobsd/tools/package-build.sh

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/package-build.sh (modified) (7 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/package-build.sh

@@ -1 +1 @@
 #!/bin/sh
 # Install all required packages
+#
 # XXX: Welcome to port hell, if /usr/ports has been updated, you actually want
 # to delete all installed packages and start over again, hence why people used
 # to run this stuff in jails, etc.
+#
+# Rick van der Zwet <rick@wirelessleiden.nl>
+#
 
-. $(dirname $0)/package-build.inc.sh
+. `dirname $0`/package-build.inc.sh
 
-DEBUG=${DEBUG:-0}
-DEP_CHECK_ONLY=${DEP_CHECK_ONLY:-0}
+DEBUG=${DEBUG:-'0'}
+DEP_CHECK_ONLY=${DEP_CHECK_ONLY:-'0'}
 
 # make options, for package building
-LOGDIR=`mktemp -d "/tmp/$(basename $0 .sh)-$(date +%Y%m%d-%H:%M:%S).X"`
+LOGDIR=`mktemp -d /tmp/$(basename $0 .sh)-$(date '+%Y%m%d-%H:%M:%S')X`
 
 p_info Log directory ${LOGDIR}
 p_info Make options are:
-p_info $(p_list ${PKG_MAKE_ARGS})
+p_info `p_list ${PKG_MAKE_ARGS}`
 
+# HACK: install our own ports _inside_ the normal ports dir
+cp -fR $WL_PORTSDIR/* $PORTSDIR
+
+# Pre-req dependency fixing
 p_info Checking whether there are currently unmet dependencies
 RETVAL=0
@@ -30 +38 @@
   if [ -n "${PKG_DEP_FAIL}" ]; then
       p_err Unmet dependencies found at $PKG, please fix manually:
-      p_err $(p_list ${PKG_DEP_FAIL})
+      p_err `p_list ${PKG_DEP_FAIL}`
       RETVAL=1
   fi
@@ -45 +53 @@
 
 
+# Cleanup of old packages
 if [ -d "${NANO_PACKAGE_DIR}" ]; then
         p_warn "Deleted all (old) packages at ${NANO_PACKAGE_DIR}"
@@ -52 +61 @@
 mkdir -p ${NANO_PACKAGE_DIR}
 
+
+# Build required packages
 MAKE="make ${PKG_MAKE_ARGS}"
-
 BUILD_LIST=''
-# Build required packages
 set ${PACKAGE_LIST}
 while [ "$1" ]; do
@@ -62 +71 @@
 
   # Build new one
-  LOGFILE="$LOGDIR/build$(echo $PACKAGE | tr '/' '_').log"
+  LOGFILE="$LOGDIR/build_`echo $PACKAGE | tr '/' '_'`.log"
   echo ""
   p_info Packaging $PACKAGE
-  cd ${PACKAGE}
+  cd $PORTSDIR/$PACKAGE
 
-  
   # Check for build dependencies
   BUILDDEP_PKG=`${MAKE} build-depends-list | awk -F: '{print $2}'`
   if [ -n "${BUILDDEP_PKG}" ]; then
           p_info Build dependencies needed are:
-          p_info $(p_list ${BUILDDEP_PKG})
+          p_info `p_list ${BUILDDEP_PKG}`
   fi
 
@@ -79 +87 @@
   if [ -n "${PKGDEP_PKGS}" ]; then
           p_info Package dependencies also packaged are:
-          p_info $(p_list ${PKGDEP_PKGS})
+          p_info `p_list ${PKGDEP_PKGS}`
   fi
 
   # Check if package is already installed
   VERSION=`${MAKE} clean generate-plist check-already-installed | awk '/is already/ {print $2}'`
-   if [ -n "${VERSION}" ]; then
+   if [ -n "$FORCE_REBUILD" ]; then
+     p_warn "${PACKAGE} forcefullly rebuilding..."
+     MAKE_OPTION='deinstall reinstall'
+   elif [ "${VERSION}" = "An" ]; then
+     #XXX: Better way to detect whether a package needs updating
+     # An older version of lang/python26 is already installed (python26-2.6.2)
+     p_warn "${PACKAGE} outdated, updating..."
+     p_warn "re-run package-build.sh to check for unmet ones done using:"
+     p_warn "$0"
+     MAKE_OPTION='deinstall reinstall'
+   elif [ -n "${VERSION}" ]; then
      VERSION=`echo ${VERSION} | sed 's/^.*-//g'`
      p_info ${PACKAGE} already installed at ${VERSION}
      MAKE_OPTION=''
-   elif [ "${VERSION}" = "An" ]; then
-     #XXX: Better way to detect whether a package needs updating
-     # An older version of lang/python26 is already installed (python26-2.6.2)
-     p_warn ${PACKAGE} outdated, updating...
-     p_warn re-run package-build.sh to check for unmet ones done using:
-     p_warn $0
-     MAKE_OPTION='deinstall reinstall'
    else
      p_info ${PACKAGE} not installed, installing...
@@ -130 +141 @@
 done
   
-p_info $(echo ${BUILD_LIST} | wc -w) packages build succesfully
+p_info `echo ${BUILD_LIST} | wc -w` packages build succesfully
 
 if [ ${DEBUG} -eq 0 ]; then

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