#9 Fixed info-command, install.sh supports loopback devices on linux

Merged
wbx merged 2 commits from ableton-dir/master into oss/master 6 years ago
4 changed files with 26 additions and 7 deletions
  1. 1 1
      Makefile
  2. 4 0
      Makefile.adk
  3. 9 0
      mk/build.mk
  4. 12 6
      scripts/install.sh

+ 1 - 1
Makefile

@@ -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}

+ 4 - 0
Makefile.adk

@@ -180,5 +180,9 @@ dep:
 world:
 	@${GMAKE_INV} world
 
+
+info:
+	@${GMAKE_INV} info
+
 endif
 # DO NOT DELETE

+ 9 - 0
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"

+ 12 - 6
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"
 	}