summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-06-30 09:19:22 (GMT)
committer Jaromil <jaromil@dyne.org>2014-06-30 09:20:50 (GMT)
commit6a82346e36d2cab88cf338b66e4a44100e6cfa68 (patch)
treeb7a76c0596093dcbd85e818dfe246a64f264d3e6
parent5b3472b41b21ff02226f637c25aaecf2f6c1c89d (diff)
packing fixes and updatesv0.9
-rw-r--r--VERSION2
-rw-r--r--pack/conf.zsh9
-rw-r--r--pack/dojos/mid/opkg.tree20
-rw-r--r--pack/dojos/mid/system.aliases4
-rw-r--r--pack/dojos/mid/system.tree1
5 files changed, 8 insertions, 28 deletions
diff --git a/VERSION b/VERSION
index 39e898a..b63ba69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.1
+0.9
diff --git a/pack/conf.zsh b/pack/conf.zsh
index 42c3046..95ae408 100644
--- a/pack/conf.zsh
+++ b/pack/conf.zsh
@@ -7,6 +7,11 @@
ver=`cat ${ZHOME}/VERSION`
+# android toolchain strip
+export TOOLCHAIN=$ZHOME/toolchains/arm-linux-androideabi-4.6
+export TARGET=arm-linux-androideabi
+export STRIP=${TOOLCHAIN}/bin/${TARGET}-strip
+
streamline_zshaolin() {
act "including core scripts in dojo"
@@ -18,8 +23,6 @@ streamline_zshaolin() {
./var/log
./etc/grmlrc
./etc/zlogin
-./etc/zinit
-./etc/init.d
./etc/skel
EOF
# do the copy
@@ -93,7 +96,7 @@ strip_floor() {
file $i | grep -e 'ELF.*executable' > /dev/null
if [ $? = 0 ]; then
act "strip executable $i"
- $TOOLCHAIN/bin/$TARGET-strip $i
+ ${STRIP} $i
fi
done
}
diff --git a/pack/dojos/mid/opkg.tree b/pack/dojos/mid/opkg.tree
deleted file mode 100644
index 8179f4d..0000000
--- a/pack/dojos/mid/opkg.tree
+++ /dev/null
@@ -1,20 +0,0 @@
-./share/ncat
-./share/opkg
-./share/git-core
-./bin/xxd
-./bin/ndiff
-./bin/scp ./bin/scp.bin
-./bin/scp.wrap ./bin/scp
-./bin/rsync
-./bin/opkg-key
-./bin/dropbearkey
-./bin/dbclient
-./bin/opkg
-./bin/sqlite3
-./bin/dropbear
-./bin/dropbearconvert
-./bin/git
-./etc/opkg.conf
-./etc/service
-./libexec
-
diff --git a/pack/dojos/mid/system.aliases b/pack/dojos/mid/system.aliases
index 1f160d7..74a7cd2 100644
--- a/pack/dojos/mid/system.aliases
+++ b/pack/dojos/mid/system.aliases
@@ -1,9 +1,5 @@
-sbin/dropbear sshd
-bin/dbclient ssh
-bin/dropbearkey ssh-keygen
bin/htop top
bin/zsh sh
bin/zsh ash
bin/zsh bash
bin/gawk awk
-
diff --git a/pack/dojos/mid/system.tree b/pack/dojos/mid/system.tree
index 94bc5af..6e8a634 100644
--- a/pack/dojos/mid/system.tree
+++ b/pack/dojos/mid/system.tree
@@ -18,6 +18,7 @@
./bin/grep
./bin/mandoc
./bin/demandoc
+./bin/file
./libexec
./libexec/awk
./libexec/awk/grcat