diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2017-06-30 00:58:08 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2017-06-30 00:58:08 +0200 |
| commit | 6df169714d0266269b24036e12d8841419da7b79 (patch) | |
| tree | 9bb5b6efd60b6e8ea2852afe34d5a8e41e162115 | |
| parent | 0bbfb75bb621678c2657a1bdae4f7bed8839d6b7 (diff) | |
| parent | b6f35aea5a1cf351fc78b0a1f679c44c379d901a (diff) | |
Merge branch 'master' of ableton-dir/openadk into master
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.adk | 4 | ||||
| -rw-r--r-- | mk/build.mk | 9 | ||||
| -rwxr-xr-x | scripts/install.sh | 18 |
4 files changed, 26 insertions, 7 deletions
@@ -4,5 +4,5 @@ # GNU make and BSD make compatible make file wrapper MAKECMDGOALS+= ${.TARGETS} -all v allmodconfig allnoconfig allyesconfig help pkg-help dev-help targethelp kernelconfig savekconfig image menuconfig defconfig oldconfig download clean cleankernel cleansystem cleandir distclean hostclean hostpackage fetch package extract patch dep menu newpackage host-update-patches update-patches: +all v allmodconfig allnoconfig allyesconfig help pkg-help dev-help targethelp kernelconfig savekconfig image menuconfig defconfig oldconfig download clean cleankernel cleansystem cleandir distclean hostclean hostpackage fetch package extract patch dep menu newpackage host-update-patches update-patches info: @./scripts/prereq.sh ${MAKECMDGOALS} diff --git a/Makefile.adk b/Makefile.adk index 0938316ba..df0d98d4c 100644 --- a/Makefile.adk +++ b/Makefile.adk @@ -180,5 +180,9 @@ dep: world: @${GMAKE_INV} world + +info: + @${GMAKE_INV} info + endif # DO NOT DELETE diff --git a/mk/build.mk b/mk/build.mk index 3bbcc220d..de911508c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -652,3 +652,12 @@ check-g++: check-dejagnu $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc -k check-c++ check: check-gcc check-g++ + +info: + @printf -- "---OPENADK-INFO---\n" + @printf "ADK_TOPDIR=$(ADK_TOPDIR)\n" + @printf "TARGET_COMPILER_PREFIX=${TARGET_COMPILER_PREFIX}\n" + @printf "TOOLCHAIN_DIR=$(TOOLCHAIN_DIR)\n" + @printf "TARGET_PATH=$(TARGET_PATH)\n" + @printf "LINUX_DIR=$(LINUX_DIR)\n" + @printf -- "---OPENADK-INFO---\n" diff --git a/scripts/install.sh b/scripts/install.sh index dbdcfa6ad..04ae46989 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -192,15 +192,21 @@ case $ostype { ;; (Linux) basedev=$tgt - rootpart=${basedev}1 - datapart=${basedev}2 + partitionsep="" + if [[ $basedev = /dev/loop* ]]; then + (( quiet )) || print "${tgt} is a loop device" + partitionsep=p + fi + + rootpart=${basedev}${partitionsep}1 + datapart=${basedev}${partitionsep}2 if [[ $target = raspberry-pi || $target = raspberry-pi2 || $target = raspberry-pi3 || $target = raspberry-pi3-64 ]]; then - bootpart=${basedev}1 - rootpart=${basedev}2 - datapart=${basedev}3 + bootpart=${basedev}${partitionsep}1 + rootpart=${basedev}${partitionsep}2 + datapart=${basedev}${partitionsep}3 fi - match=\'${basedev}\''+([0-9])' + match=\'${basedev}${partitionsep}\''+([0-9])' function mount_fs { mount -t "$3" "$1" "$2" } |