Merge branch 'master' of https://github.com/ayufan-pine64/build-pine64-image

ayufan · ayufan · commit 9e206220a7ac · 2017-10-08T10:39:41.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 export RELEASE_NAME ?= 0.1~dev
 export RELEASE ?= 1
-export LINUX_BRANCH ?= my-hacks-1.2-with-mmc3
-export BOOT_TOOLS_BRANCH ?= with-drm-mmc3
+export LINUX_BRANCH ?= my-hacks-1.2
+export BOOT_TOOLS_BRANCH ?= with-drm
 LINUX_LOCALVERSION ?= -ayufan-$(RELEASE)
 
 all: linux-pinebook linux-pine64 linux-sopine
diff --git a/package/root/usr/local/sbin/pine64_model.sh b/package/root/usr/local/sbin/pine64_model.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-cat /etc/pine64-model
+cat /etc/pine64_model
