From 637523b8cf39a4b191eabc109dd40e7ac3091b22 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Sun, 4 Dec 2016 17:20:21 +0100 Subject: [PATCH] Drop scripts we don't need anymore --- create-click.sh | 27 ----------------- scripts/container-shell.sh | 11 ------- scripts/iptables-wrapper | 2 -- scripts/launch-abox.sh | 60 -------------------------------------- scripts/setup-rootfs.sh | 16 ---------- scripts/shell.sh | 3 -- 6 files changed, 119 deletions(-) delete mode 100755 create-click.sh delete mode 100755 scripts/container-shell.sh delete mode 100755 scripts/iptables-wrapper delete mode 100755 scripts/launch-abox.sh delete mode 100755 scripts/setup-rootfs.sh delete mode 100755 scripts/shell.sh diff --git a/create-click.sh b/create-click.sh deleted file mode 100755 index 3e11618..0000000 --- a/create-click.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e -set -x - -if [ ! -e android-rootfs.tar ] ; then - echo "ERROR: Missing Android rootfs package!" - exit 1 -fi - -./cross-compile-chroot.sh -a armhf -d vivid - -if [ -e click ] ; then - rm -rf click -fi - -mkdir click -cp data/manifest.json click/ -cp data/apparmor.json click/ -cp data/anbox.desktop click/ - -(cd click ; tar xf ../android-rootfs.tar ; mv rootfs android-rootfs) - -cp build-armhf-vivid/src/anbox click/ -cp build-armhf-vivid/src/anbox-container click/ - -(cd click ; click build .) diff --git a/scripts/container-shell.sh b/scripts/container-shell.sh deleted file mode 100755 index 2f94bb9..0000000 --- a/scripts/container-shell.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -$SNAP/bin/lxc-attach \ - --lxcpath=$SNAP_COMMON/var/lib/anbox/containers \ - --name default \ - --clear-env \ - --set-var PATH=/system/bin:/system/sbin:/system/xbin \ - --set-var ANDROID_DATA=/data \ - --set-var ANDROID_ROOT=/system \ - -- \ - /system/bin/sh diff --git a/scripts/iptables-wrapper b/scripts/iptables-wrapper deleted file mode 100755 index 73e9421..0000000 --- a/scripts/iptables-wrapper +++ /dev/null @@ -1,2 +0,0 @@ -#!/system/bin/sh -echo "Dummy iptables wrapper" diff --git a/scripts/launch-abox.sh b/scripts/launch-abox.sh deleted file mode 100755 index b37cdf5..0000000 --- a/scripts/launch-abox.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -set -e -set -x - -basepath=/home/phablet/android-box -rootfs=$basepath/rootfs -rootfs_overrides=$basepath/overrides -ramdisk=$basepath/ramdisk.img -systemdisk=$basepath/system.img -init_cmd="/init" - -if [ "$1" = "shell" ] ; then - init_cmd=/system/bin/sh -fi - -if [ -d $rootfs ] ; then - sudo umount --recursive $rootfs || true - rm -rf $rootfs -fi - -mkdir -p $rootfs -sudo mount -t tmpfs none $rootfs -(cd $rootfs ; cat $ramdisk | gzip -d | cpio -i) - -mkdir -p $rootfs/dev/pts -sudo mount -o ro,loop $systemdisk $rootfs/system - -if [ -d "$rootfs_overrides" ] ; then - for f in `ls $rootfs_overrides` ; do - if [ "$f" = "system" ] ; then - for f2 in `find $rootfs_overrides/system -type f` ; do - real_path=`echo $f2 | sed -e s:$rootfs_overrides::g` - sudo mount -o bind $f2 $rootfs/$real_path - done - else - cp $rootfs_overrides/$f $rootfs - fi - done -fi - -/home/phablet/bwrap \ - --ro-bind $rootfs / \ - --bind /home/phablet/android-box/iptables-wrapper /system/bin/iptables \ - --bind /home/phablet/android-box/iptables-wrapper /system/bin/ip6tables \ - --dev /dev \ - --proc /proc \ - --tmpfs /data \ - --unshare-user \ - --unshare-ipc \ - --unshare-pid \ - --unshare-net \ - --unshare-uts \ - --uid 0 \ - --gid 0 \ - --setenv PATH /system/bin:/system/sbin:/system/xbin \ - --chdir / \ - $init_cmd - -sudo umount --recursive $rootfs -rm -rf $rootfs diff --git a/scripts/setup-rootfs.sh b/scripts/setup-rootfs.sh deleted file mode 100755 index f83b6e6..0000000 --- a/scripts/setup-rootfs.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# We need to put the rootfs somewhere where we can modify some -# parts of the content on first boot (namely file permissions). -# Other than that nothing should ever modify the content of the -# rootfs. - -ROOTFS_PATH=$SNAP_COMMON/var/lib/anbox/rootfs - -if [ -d $ROOTFS_PATH ] ; then - rm -rf $ROOTFS_PATH -fi - -echo "Copying rootfs into $ROOTFS_PATH .." -mkdir -p $ROOTFS_PATH -tar xf $SNAP/android-rootfs.tar -C $ROOTFS_PATH/ --strip-components=1 diff --git a/scripts/shell.sh b/scripts/shell.sh deleted file mode 100755 index 89d1294..0000000 --- a/scripts/shell.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec /bin/bash $@