Commit 31a272ad authored by intrigeri's avatar intrigeri

Switch to the Debian-packaged aufs kernel module (refs: #11829).

parent 0163bafe
......@@ -11,9 +11,6 @@
[submodule "submodules/mirror-pool-dispatcher"]
path = submodules/mirror-pool-dispatcher
url = https://git-tails.immerda.ch/mirror-pool-dispatcher
[submodule "submodules/aufs4-standalone"]
path = submodules/aufs4-standalone
url = https://github.com/sfjro/aufs4-standalone.git
[submodule "submodules/gnome-shell-extension-florence-indicator"]
path = submodules/gnome-shell-extension-florence-indicator
url = https://github.com/UshakovVasilii/gnome-shell-extension-florence-indicator.git
......@@ -133,10 +133,6 @@ install -m 0755 \
submodules/mirror-pool-dispatcher/lib/js/mirror-dispatcher.js \
config/chroot_local-includes/usr/local/lib/nodejs/
# aufs4-standalone
rm -rf config/chroot_local-includes/usr/src/aufs4-standalone
cp -a submodules/aufs4-standalone config/chroot_local-includes/usr/src/
# gnome-shell-extension-florence-indicator
rm -rf \
config/chroot_local-includes/usr/share/gnome-shell/extensions/florenceIndicator@UshakovVasilii_Github.yahoo.com
......
#! /bin/sh
set -e
set -u
echo "Building the aufs module"
. /usr/share/amnesia/build/variables
apt-get install --yes \
build-essential \
"linux-source-${KERNEL_SOURCE_VERSION}"
# aufs build needs fs/mount.h, which is in linux-source-* but not
# in linux-headers-*, so we'll symlink it.
tar --directory=/usr/src \
-xf "/usr/src/linux-source-${KERNEL_SOURCE_VERSION}.tar."*
arch=amd64
linux_headers_arch_pkg="linux-headers-${KERNEL_VERSION}-amd64"
linux_headers_common_pkg="linux-headers-${KERNEL_VERSION}-common"
apt-get install --yes "$linux_headers_arch_pkg" "$linux_headers_common_pkg"
ln -s \
"/usr/src/linux-source-${KERNEL_SOURCE_VERSION}/fs" \
"/usr/src/linux-headers-${KERNEL_VERSION}-${arch}/fs"
(
cd /usr/src/aufs4-standalone
perl -pi -E \
's{\A CONFIG_AUFS_DEBUG \s* = \s* y $}{CONFIG_AUFS_DEBUG =}xms' \
config.mk
KDIR="/usr/src/linux-headers-${KERNEL_VERSION}-${arch}"
make clean KDIR="$KDIR"
make install KDIR="$KDIR"
)
depmod "${KERNEL_VERSION}-${arch}"
apt-get remove --yes "$linux_headers_arch_pkg" "$linux_headers_common_pkg"
rm -r /usr/src/aufs4-standalone
rm -r "/usr/src/linux-source-${KERNEL_SOURCE_VERSION}"
......@@ -3,7 +3,7 @@
set -e
set -u
echo "Building VirtualBox guest modules"
echo "Building dkms modules"
. /usr/share/amnesia/build/variables
......@@ -13,6 +13,7 @@ apt-get install --yes build-essential dkms
# Installing the headers triggers the building of the modules for that kernel
apt-get install --yes \
"linux-headers-${KERNEL_VERSION}-amd64" \
aufs-dkms \
virtualbox-guest-dkms
# clean the build directory
......@@ -20,6 +21,7 @@ apt-get install --yes \
# virtualbox-guest-dkms's postrm script deletes any previously
# built binary module; let's delete it before the package gets purged.
rm /var/lib/dpkg/info/aufs-dkms.prerm
rm /var/lib/dpkg/info/virtualbox-guest-dkms.prerm
# Also copy the udev rules installed by virtualbox-guest-dkms to enable guest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment