diff --git a/README.md b/README.md index f4603a4..c61548d 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,9 @@ 2. Make sure you have write permission to the installation directory. -3. Make sure the native OS compiler tools are installed. +3. Make sure the native OS compiler tools are installed. *Do not + include the tools directories in your `${PATH}` at this time.* We + want this phase of the build to be done entirely with system tools. 4. Get the linuxbrew image: @@ -41,6 +43,11 @@ `make bootstrap-build` + NOTE: As of this writing, `make` will report an `Error 1` at + completion. We have not quite chased this down yet, but suspect it + to be a failing test case for one of the subcomponents of the + build. So far, this does not seem to be pathological. + 6. Build a release tarball and export it: `make bootstrap-release` @@ -75,7 +82,8 @@ `. brewenv` -4. Make sure `${MYTOOLS}` has all the packages you want listed. +4. Make sure `${MYTOOLS}` and `${PIPMODULES}` include all the + packages you want. 5. Build the full tool set using the bootstrapped compiler we just built: @@ -128,7 +136,7 @@ The `brewenv` file documents the environment variables that need to be set in order to access your installed binaries and support files. You -may find this useful when doing the builds. You certainly will want +may find this useful when doing the full build. You certainly will want these variables set when running a final installation of your tools. Just be sure to edit it and change `TOOLSDIR="/opt/TundraWare/tools"` diff --git a/makefile b/makefile index 36d2910..32f33d1 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,8 @@ EXPORTDIR = /shared INSTALLDIR = /opt/TundraWare TOOLS = tools -MYTOOLS = emacs joe htop nload nmap perl screen the_silver_searcher tree vim +MYTOOLS = perl python emacs joe htop nload nmap screen the_silver_searcher tree vim +PIPMODULES = ansible pew pew[pythonz] # Nothing below here should need changing @@ -31,6 +32,9 @@ echo "Make sure your OS autoconf, automake, and perl are installed!" echo 'Make sure the bootstrap is installed at $TOOLSDIR' ${BREW} install ${MYTOOLS} + ln -nfs ${INSTALLDIR}/${TOOLS}/bin/python2 ${INSTALLDIR}/${TOOLS}/bin/python + ln -nfs ${INSTALLDIR}/${TOOLS}/bin/pip2 ${INSTALLDIR}/${TOOLS}/bin/pip + pip install $PIPMODULES -U --ignore-installed full-release: tidyup cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-${DATESTAMP}