Merge branch 'rebuild-focal'

* rebuild-focal: MISC: Dockerfile.focal: remove NOTEX argument MISC: mknews.sh: print news in chronological order Signed-off-by: Tim Janik <[email protected]>
tim-janik · Sep 5, 2023 · 2a4c7de · 2a4c7de
2 parents 39ac286 + ec144c5
commit 2a4c7de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/misc/Dockerfile.focal b/misc/Dockerfile.focal
@@ -7,9 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive
 # Use BASH(1) as shell, affects the RUN commands below
 RUN ln -sf bash /bin/sh && ls -al /bin/sh
 
-# Save +615MB by skipping TeX
-ARG NOTEX
-
 # Upgrade packages, install dependencies, clean up to shrink Docker image
 # Add libXss.so, libgtk-3-0 for Electron
 RUN apt-get update \
@@ -24,10 +21,9 @@ RUN apt-get update \
 	     gettext libgconf-2-4 libgtk2.0-dev libgtk-3-dev squashfs-tools zstd \
 	     libgtk-3-0 libxss1 libgbm1 libnss3 \
 	     xvfb twm ffmpeg doxygen \
+  && apt-get install -y \
+	     texlive-xetex fonts-sil-charis texlive-binaries texlive-fonts-extra \
   && pip install poxy \
-  && (test "${NOTEX:-false}" = true \
-	|| apt-get install -y \
-		   texlive-xetex fonts-sil-charis texlive-binaries texlive-fonts-extra ) \
   && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
   && apt-get install -y nodejs \
   && apt-get clean

diff --git a/misc/mknews.sh b/misc/mknews.sh
@@ -32,6 +32,7 @@ echo 'Development version - may contain bugs or compatibility issues.'
 echo
 echo '``````````````````````````````````````````````````````````````````````````````````````'
 git log --pretty='%s    # %cd %an %h%n%w(0,4,4)%b' \
+    --reverse \
     --first-parent --date=short "$NEWS_TAG..HEAD" |
   sed -e '/^\s*Signed-off-by:.*<.*@.*>/d' |
   sed '/^\s*$/{ N; /^\s*\n\s*$/D }'