mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-16 03:04:07 +00:00
Imported 2.578.5
No reason for CPC update specified.
This commit is contained in:
parent
fd2a234f5b
commit
7c79311c4f
12
debian/changelog
vendored
12
debian/changelog
vendored
@ -1,3 +1,15 @@
|
|||||||
|
livecd-rootfs (2.578.5) disco; urgency=medium
|
||||||
|
|
||||||
|
[ Balint Reczey ]
|
||||||
|
* Build WSL rootfs tarball (LP: #1827930)
|
||||||
|
|
||||||
|
[ Steve Langasek ]
|
||||||
|
* 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 <steve.langasek@ubuntu.com> Thu, 30 May 2019 12:13:55 -0700
|
||||||
|
|
||||||
livecd-rootfs (2.578.4) disco; urgency=medium
|
livecd-rootfs (2.578.4) disco; urgency=medium
|
||||||
|
|
||||||
[ Robert C Jennings ]
|
[ Robert C Jennings ]
|
||||||
|
1
debian/control
vendored
1
debian/control
vendored
@ -10,6 +10,7 @@ Package: livecd-rootfs
|
|||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${misc:Depends},
|
Depends: ${misc:Depends},
|
||||||
apt-utils,
|
apt-utils,
|
||||||
|
attr,
|
||||||
debootstrap,
|
debootstrap,
|
||||||
distro-info,
|
distro-info,
|
||||||
dosfstools,
|
dosfstools,
|
||||||
|
@ -131,6 +131,9 @@ Expire-Date: 0
|
|||||||
# Drop all man pages
|
# Drop all man pages
|
||||||
path-exclude=/usr/share/man/*
|
path-exclude=/usr/share/man/*
|
||||||
|
|
||||||
|
# Drop all translations
|
||||||
|
path-exclude=/usr/share/locale/*/LC_MESSAGES/*.mo
|
||||||
|
|
||||||
# Drop all documentation ...
|
# Drop all documentation ...
|
||||||
path-exclude=/usr/share/doc/*
|
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
|
# 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 \
|
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
|
| 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
|
if dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {exit 1}'; then
|
||||||
echo "Documentation has been restored successfully."
|
echo "Documentation has been restored successfully."
|
||||||
rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
|
rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
|
||||||
|
@ -5,3 +5,4 @@ depends disk-image
|
|||||||
depends qcow2
|
depends qcow2
|
||||||
depends vmdk
|
depends vmdk
|
||||||
depends vagrant
|
depends vagrant
|
||||||
|
depends wsl
|
||||||
|
2
live-build/ubuntu-cpc/hooks.d/base/series/wsl
Normal file
2
live-build/ubuntu-cpc/hooks.d/base/series/wsl
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
depends root-dir
|
||||||
|
base/wsl.binary
|
56
live-build/ubuntu-cpc/hooks.d/base/wsl.binary
Executable file
56
live-build/ubuntu-cpc/hooks.d/base/wsl.binary
Executable file
@ -0,0 +1,56 @@
|
|||||||
|
#!/bin/bash -eux
|
||||||
|
# vi: ts=4 expandtab
|
||||||
|
#
|
||||||
|
# Generate the compressed root directory for WSL
|
||||||
|
|
||||||
|
case ${SUBPROJECT:-} in
|
||||||
|
minimized)
|
||||||
|
echo "Skipping minimized $0 build as WSL systems are designed to be interactive"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case $ARCH in
|
||||||
|
amd64|arm64)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "WSL root tarballs are not generated for $ARCH."
|
||||||
|
exit 0;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -n "${SUBARCH:-}" ]; then
|
||||||
|
echo "Skipping rootfs build for subarch flavor build"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
. config/functions
|
||||||
|
|
||||||
|
rootfs_dir=wslroot.dir
|
||||||
|
|
||||||
|
# This is the directory created by create-root-dir.binary
|
||||||
|
cp -a rootfs.dir $rootfs_dir
|
||||||
|
|
||||||
|
setup_mountpoint $rootfs_dir
|
||||||
|
|
||||||
|
env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
|
||||||
|
|
||||||
|
create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
|
||||||
|
teardown_mountpoint $rootfs_dir
|
||||||
|
|
||||||
|
# remove attributes not supported by WSL's tar
|
||||||
|
if [ -d $rootfs_dir/var/log/journal ]; then
|
||||||
|
setfattr -x system.posix_acl_access $rootfs_dir/var/log/journal
|
||||||
|
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 ..
|
||||||
|
|
||||||
|
rm -rf $rootfs_dir
|
Loading…
x
Reference in New Issue
Block a user