Changeset 12882 in hybrid for branches/releng-10/nanobsd

Timestamp:

Aug 24, 2014, 10:18:42 PM (10 years ago)

Author:

rick

Message:

Get rid of the broken update thingy (which is not used BTW) and make package building rather static

File:

• branches/releng-10/nanobsd/tools/package-build.sh (modified) (1 diff)

branches/releng-10/nanobsd/tools/package-build.sh

@@ -94 +94 @@
   fi
 
-  # Check if package is already installed
-  VERSION=`${MAKE} clean generate-plist check-already-installed | awk '/is already/ {print $2}'`
-   if [ -n "$FORCE_REBUILD" ]; then
-     p_warn "${PACKAGE} forcefullly rebuilding..."
-     MAKE_OPTION='deinstall reinstall'
-   elif [ "${VERSION}" = "An" ]; then
-     p_warn "${PACKAGE} outdated, please update"
-     #XXX: Better way to detect whether a package needs updating
-     # An older version of lang/python26 is already installed (python26-2.6.2)
-     #XXX: Broken updatin, please fix
-     #p_warn "re-run package-build.sh to check for unmet ones done using:"
-     #p_warn "$0"
-     #MAKE_OPTION='deinstall reinstall'
-     MAKE_OPTION=''
-   elif [ -n "${VERSION}" ]; then
-     VERSION=`echo ${VERSION} | sed 's/^.*-//g'`
-     p_info ${PACKAGE} already installed at ${VERSION}
-     MAKE_OPTION=''
-   else
-     p_info ${PACKAGE} not installed, installing...
-     MAKE_OPTION='install'
-   fi
-
-  if [ -n "${MAKE_OPTION}" ]; then
-    p_info Buildlog: $LOGFILE
-    ${MAKE} ${MAKE_OPTION} 2>>$LOGFILE 1>> $LOGFILE
-    if [ $? -ne 0 ]; then
-       p_err building ${PACKAGE} FAILED, logging at $LOGFILE
-       exit 1
-    fi
-  fi
-  ${MAKE} package-links
   PKGNAME=`${MAKE} extract-message | awk '{print $NF}'`
-  ${MAKE} package-recursive PACKAGES=/root/nanobsd/pkg  || exit 1
+  ${MAKE} PACKAGES=/root/nanobsd/pkg package do-package package-links || exit 1
 
   p_info Checking dependencies