aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <ndechesne@users.noreply.github.com>2021-02-02 17:45:50 +0100
committerGitHub <noreply@github.com>2021-02-02 17:45:50 +0100
commit2d776710ea99ed0206e7d8d08ccd8278aeac6a74 (patch)
tree726dd4c1233ddd083b1e16782ae3496c5d8eb585
parentd97a0bc715b78d6c590bb0d52a0ae53b1aab9fb2 (diff)
parent2ee92fab15c6ad1832f569f32c888ac89e0d3a87 (diff)
downloadmeta-qcom-2d776710ea99ed0206e7d8d08ccd8278aeac6a74.tar.gz
meta-qcom-2d776710ea99ed0206e7d8d08ccd8278aeac6a74.tar.bz2
meta-qcom-2d776710ea99ed0206e7d8d08ccd8278aeac6a74.zip
Merge pull request #256 from lumag/adbd-dunfell
Adbd dunfell support
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/include/qcom-common.inc2
-rw-r--r--dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs/qcom/android-gadget-setup.machine4
-rw-r--r--dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs_%.bbappend5
4 files changed, 13 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 5f3db02..821a90a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,4 +15,6 @@ BBFILES_DYNAMIC += " \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
+ backports:${LAYERDIR}/dynamic-layers/backports-layer/*/*/*.bb \
+ backports:${LAYERDIR}/dynamic-layers/backports-layer/*/*/*.bbappend \
"
diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
index 272ab6a..d2434f9 100644
--- a/conf/machine/include/qcom-common.inc
+++ b/conf/machine/include/qcom-common.inc
@@ -22,6 +22,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
+PREFERRED_PROVIDER_android-tools-conf = "android-tools-conf-configfs"
+
# Fastboot expects an ext4 image, which needs to be 4096 aligned
IMAGE_FSTYPES ?= "ext4.gz"
IMAGE_ROOTFS_ALIGNMENT ?= "4096"
diff --git a/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs/qcom/android-gadget-setup.machine b/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs/qcom/android-gadget-setup.machine
new file mode 100644
index 0000000..37f26bb
--- /dev/null
+++ b/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs/qcom/android-gadget-setup.machine
@@ -0,0 +1,4 @@
+manufacturer=Qualcomm
+model=`hostname`
+androidserial="$(sed -n -e '/androidboot.serialno/ s/.*androidboot.serialno=\([^ ]*\).*/\1/gp ' /proc/cmdline)"
+[ -n "$androidserial" ] && serial="$androidserial"
diff --git a/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs_%.bbappend b/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs_%.bbappend
new file mode 100644
index 0000000..1e314d8
--- /dev/null
+++ b/dynamic-layers/backports-layer/recipes-devtools/android-tools/android-tools-conf-configfs_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI_append_qcom = " \
+ file://android-gadget-setup.machine \
+"