diff --git a/debian/changelog b/debian/changelog index 840ce810..76c9a4d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.587) eoan; urgency=medium + + * Strip translation files out of the minimal images, another thing that + goes unused when there is no human console user (and we already don't + have the locales themselves present on a minimal image). LP: #1829333. + + -- Steve Langasek Tue, 28 May 2019 08:40:42 -0700 + livecd-rootfs (2.586) eoan; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index c036cbf0..4f7393af 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -131,6 +131,9 @@ Expire-Date: 0 # Drop all man pages path-exclude=/usr/share/man/* +# Drop all translations +path-exclude=/usr/share/locale/*/LC_MESSAGES/*.mo + # Drop all documentation ... path-exclude=/usr/share/doc/* @@ -191,6 +194,10 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp # This step processes the packages which still have missing documentation dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \ | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y + echo "Restoring system translations..." + # This step processes the packages which still have missing translations + dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \ + | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y if dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {exit 1}'; then echo "Documentation has been restored successfully." rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp diff --git a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary index 4bf42800..05f51e30 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary @@ -45,6 +45,10 @@ if [ -d $rootfs_dir/var/log/journal ]; then setfattr -x system.posix_acl_default $rootfs_dir/var/log/journal fi +# The reason not using just tar .. -C $rootfs_dir . is that using '.' was found +# not working once and checking if using the simpler command is safe needs +# verification of the app installation on all Windows 10 builds we support +# with WSL. cd $rootfs_dir tar --xattrs --sort=name -czf ../livecd.ubuntu-cpc.wsl.rootfs.tar.gz * cd ..