summaryrefslogtreecommitdiffstats
path: root/auto
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-09-06 10:02:49 +0000
committersajolida <sajolida@pimienta.org>2018-09-06 10:02:49 +0000
commit7d452d39998b5543bacc53696a0897dd2906da4f (patch)
treea51c412b3dbd9b5f3a2100619d8b61d4eebcc78a /auto
parentbda974fa5d21c9cb2ba54611687d78a1eb11a23f (diff)
parent3629361577a8af12247ec95a151ad3922cc2ecc5 (diff)
Merge remote-tracking branch 'origin/devel' into feature/15291-remove-softwarewip/feature/15291-remove-software-sajolida-experiment
Diffstat (limited to 'auto')
-rwxr-xr-xauto/build10
-rwxr-xr-xauto/clean2
-rwxr-xr-xauto/config4
3 files changed, 8 insertions, 8 deletions
diff --git a/auto/build b/auto/build
index 8e2223d..b1da886 100755
--- a/auto/build
+++ b/auto/build
@@ -50,15 +50,15 @@ rm -rf cache/stages_rootfs
# save variables that are needed by chroot_local-hooks
echo "KERNEL_VERSION=${KERNEL_VERSION}" \
- >> config/chroot_local-includes/usr/share/amnesia/build/variables
+ >> config/chroot_local-includes/usr/share/tails/build/variables
echo "KERNEL_SOURCE_VERSION=${KERNEL_SOURCE_VERSION}" \
- >> config/chroot_local-includes/usr/share/amnesia/build/variables
-echo "LB_DISTRIBUTION=${LB_DISTRIBUTION}" >> config/chroot_local-includes/usr/share/amnesia/build/variables
+ >> config/chroot_local-includes/usr/share/tails/build/variables
+echo "LB_DISTRIBUTION=${LB_DISTRIBUTION}" >> config/chroot_local-includes/usr/share/tails/build/variables
echo "POTFILES_DOT_IN='$(
/bin/grep -E --no-filename '[^ #]*\.in$' po/POTFILES.in \
| sed -e 's,^config/chroot_local-includes,,' | tr "\n" ' '
)'" \
- >> config/chroot_local-includes/usr/share/amnesia/build/variables
+ >> config/chroot_local-includes/usr/share/tails/build/variables
# fix permissions on some source files that will be copied as is to the chroot.
# they may be wrong, e.g. if the Git repository was cloned with a strict umask.
@@ -111,7 +111,7 @@ DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --keyring=$DEBOOTSTRAP_GNUPG_KEYRING"
export DEBOOTSTRAP_OPTIONS
: ${MKSQUASHFS_OPTIONS:='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K -no-exports'}
-MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesia/build/mksquashfs-excludes"
+MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/tails/build/mksquashfs-excludes"
export MKSQUASHFS_OPTIONS
# build the doc wiki
diff --git a/auto/clean b/auto/clean
index c0a4d82..55607bd 100755
--- a/auto/clean
+++ b/auto/clean
@@ -33,7 +33,7 @@ for list in config/chroot_local-packageslists/*.list ; do
done
# files copied or created in the build stage
-rm -f config/chroot_local-includes/usr/share/amnesia/build/variables
+rm -f config/chroot_local-includes/usr/share/tails/build/variables
# static wiki
rm -rf config/chroot_local-includes/usr/share/doc/tails/website wiki/src/.ikiwiki
diff --git a/auto/config b/auto/config
index 0fff3d8..6fc4cf3 100755
--- a/auto/config
+++ b/auto/config
@@ -184,11 +184,11 @@ cp debian/changelog config/chroot_local-includes/usr/share/doc/amnesia/Changelog
# create readahead-list from squashfs.sort
if [ -e config/binary_rootfs/squashfs.sort ]; then
- mkdir -p config/chroot_local-includes/usr/share/amnesia
+ mkdir -p config/chroot_local-includes/usr/share/tails
sort -k2 -n -r config/binary_rootfs/squashfs.sort | \
cut -d' ' -f1 | \
grep --invert-match --extended-regexp "$READAHEAD_EXCLUDE_PATTERN" \
- > config/chroot_local-includes/usr/share/amnesia/readahead-list
+ > config/chroot_local-includes/usr/share/tails/readahead-list
fi
# custom APT sources