misc updates

README.md

@@ -18,6 +18,11 @@ The vars file - `trusty-3.7.3.sh` above - contains information about what python
 `src/bionic-3.7.3.sh` for an annotated example.
 
 
+Tips:
+
+- Python >=3.8 won't build on trusty because Openssl is too old
+
+
 TODO:
 
 - Parameter for pre-loaded pip modules

images.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-RELEASES="trusty xenial bionic disco"
+RELEASES="trusty xenial bionic" # disco"
 
 for release in $RELEASES ; do
     docker build -t extbuilder-${release} -f Dockerfile.${release} .

scripts/build.sh

@@ -15,9 +15,7 @@ cd work
 mkdir cpython
 wget -qO- cpython.tar.gz $PYTHON_TARBALL | tar zxf - -C cpython/ --strip-components=1
 
-# get debian metadata
-# todo generate the metadata here
-# cp -r /src/debian /src/Makefile ./
+# generate debian metadata
 mkdir debian
 export BUILD_DATE=$(date -R)
 template /src/debian/changelog | tee debian/changelog
@@ -32,6 +30,6 @@ time dpkg-buildpackage -us -uc -b
 
 cd ..
 mkdir out
-mv *.buildinfo *.changes *.deb out/
+mv *.deb out/
 cd out
 sha256sum *

src/Makefile

@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 
 PY3_SRC=./cpython/
-PY3_CONFFLAGS=--prefix=$(DESTDIR)/opt/extpython/_OPT_DIR_ --with-ensurepip=install
-#--enable-optimizations
+PY3_CONFFLAGS=--prefix=$(DESTDIR)/opt/extpython/_OPT_DIR_ --with-ensurepip=install --enable-optimizations
 
 all:
 	cd $(PY3_SRC) && \

src/trusty-3.6.8.sh

@@ -2,9 +2,9 @@
 
 export EXTPYTHON_DIST=trusty
 # Release is used to select which tarball to download
-export PYTHON_RELEASE=3.7.3
+export PYTHON_RELEASE=3.6.8
 # Major version no is used in paths and labels (extpython-python${}, /opt/extpython/${}/...)
-export PYTHON_MAJOR=3.7
+export PYTHON_MAJOR=3.6
 # Tarball download URL
 export PYTHON_TARBALL="http://artifact.scc.net.davepedu.com/repo/tar/cpython/cpython/cpython-${PYTHON_RELEASE}.tar.gz"
 # Deps needed to build this package