live-build extensions for armhf and arm64

auto/config

@@ -29,6 +29,11 @@ if grep -qs -E '^Pin:\s+release\s+.*o=Debian Backports' \
     exit 1
 fi
 
+###if [ $(dpkg --print-architecture) != amd64 ] ; then
+###    echo "Only amd64 build systems are supported"
+###    exit 1
+###fi
+
 # init variables
 RUN_LB_CONFIG="lb config noauto"
 
@@ -53,12 +58,41 @@ perl -pi \
     config/chroot_sources/*.chroot \
     || exit 1
 
+# Workaround: Missing dynamic architecture detection; Was hard coded ... 
+if [ -z "${LB_ARCHITECTURE}" ]; then
+	LB_ARCHITECTURE="${AMNESIA_CROSS_ARCHITECTURE}"
+fi
+if [ "${LB_ARCHITECTURE}" = amd64 ]; then
+	LB_LINUX_FLAVOURS="amd64-unsigned"
+fi
+
+if [ -z "${LB_BINARY_IMAGES}" ]; then
+	LB_BINARY_IMAGES=iso
+fi 
+
+# Woraround: Possible pitfalls in debian's live-builder due to missing dir/files
+mkdir -p -m 777 chroot/etc
+mkdir -p -m 777 chroot/sbin
+if [ -f chroot/sbin/start-stop-daemon ]; then
+	cat > chroot/sbin/start-stop-daemon<<EOF
+#! /bin/sh
+exit 0
+EOF
+fi	
+mkdir -p -m 777 chroot/usr/sbin
+mkdir -p -m 777 chroot/bin
+if [ ! -f chroot/bin/hostname ]; then
+	echo "null" > chroot/bin/hostname
+fi
+mkdir -p -m 777 chroot/etc/apt/sources.list.d
+
 # set Amnesia's general options
 $RUN_LB_CONFIG \
    --verbose \
    --apt-recommends false \
+   --architecture ${LB_ARCHITECTURE} \
    --backports false \
-   --binary-images iso \
+   --binary-images ${LB_BINARY_IMAGES} \
    --binary-indices false \
    --checksums none \
    --bootappend-live "${AMNESIA_APPEND}" \
@@ -69,6 +103,7 @@ $RUN_LB_CONFIG \
    --iso-application="The Amnesic Incognito Live System" \
    --iso-publisher="https://tails.boum.org/" \
    --iso-volume="TAILS ${AMNESIA_FULL_VERSION}" \
+   --linux-flavours ${LB_LINUX_FLAVOURS} \
    --memtest none \
    --mirror-binary              "$DEBIAN_MIRROR" \
    --mirror-bootstrap           "$DEBIAN_MIRROR" \
@@ -145,6 +180,13 @@ install -m 0755 \
 # 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
+if [ -e "submodules/gnome-shell-extension-florence-indicator/florenceIndicator@UshakovVasilii_Github.yahoo.com" ]; then 
+   cp -a submodules/gnome-shell-extension-florence-indicator/florenceIndicator@UshakovVasilii_Github.yahoo.com/ \
+      config/chroot_local-includes/usr/share/gnome-shell/extensions/
+fi
 
 # custom debootstrap script, setting some APT magic to log downloads:
 patch \

config/amnesia

@@ -46,3 +46,27 @@ AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${AMNESIA_TODAY}"
 AMNESIA_DEV_FULLNAME='Tails developers'
 AMNESIA_DEV_EMAIL="tails@boum.org"
 AMNESIA_DEV_KEYID="A490 D0F4 D311 A415 3E2B  B7CA DBB8 02B2 58AC D84F"
+
+if [ -x /usr/bin/dpkg ]
+then
+	AMNESIA_HOST_ARCHITECTURE="$(dpkg --print-architecture)"
+else
+	AMNESIA_HOST_ARCHITECTURE="$(uname -m)"
+	if [ "${AMNESIA_HOST_ARCHITECTURE:0:5}" == "armv7" ]; then
+		AMNESIA_HOST_ARCHITECTURE="armhf"
+	elif [ "${AMNESIA_HOST_ARCHITECTURE:0:5}" == "armv8" ]; then
+		AMNESIA_HOST_ARCHITECTURE="arm64"
+	fi
+fi
+
+case "${AMNESIA_HOST_ARCHITECTURE}" in
+	amd64|i386|x86_64)
+		AMNESIA_CROSS_ARCHITECTURE="amd64 i386"
+		;;
+	powerpc|ppc64)
+		AMNESIA_CROSS_ARCHITECTURE="powerpc ppc64"
+		;;
+	*)
+		AMNESIA_CROSS_ARCHITECTURE="${AMNESIA_HOST_ARCHITECTURE}"
+		;;
+esac