diff options
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | 2 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/qdbd.bb | 2 | ||||
-rw-r--r-- | recipes/adbd/adbd.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend index 9a50c92..981a692 100644 --- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend | |||
@@ -31,7 +31,7 @@ | |||
31 | RDEPENDS_kernel-base = "" | 31 | RDEPENDS_kernel-base = "" |
32 | 32 | ||
33 | do_preconfigure_prepend() { | 33 | do_preconfigure_prepend() { |
34 | # FunctionFS for adb | 34 | # FunctionFS for qdbd |
35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig | 35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig |
36 | 36 | ||
37 | # Enable USB serial support | 37 | # Enable USB serial support |
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend index 208ec74..47fd1bf 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend | |||
@@ -31,7 +31,7 @@ | |||
31 | RDEPENDS_kernel-base = "" | 31 | RDEPENDS_kernel-base = "" |
32 | 32 | ||
33 | do_preconfigure_prepend() { | 33 | do_preconfigure_prepend() { |
34 | # FunctionFS for adb | 34 | # FunctionFS for qdbd |
35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig | 35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig |
36 | 36 | ||
37 | # Enable USB serial support | 37 | # Enable USB serial support |
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend index 58c64de..492bea8 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend | |||
@@ -31,6 +31,6 @@ | |||
31 | RDEPENDS_kernel-base = "" | 31 | RDEPENDS_kernel-base = "" |
32 | 32 | ||
33 | do_preconfigure_prepend () { | 33 | do_preconfigure_prepend () { |
34 | # FunctionFS for adb | 34 | # FunctionFS for qdbd |
35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig | 35 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig |
36 | } | 36 | } |
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend index 431005b..0bc8dd6 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | |||
@@ -30,7 +30,7 @@ | |||
30 | RDEPENDS_kernel-base = "kernel-image kernel-devicetree" | 30 | RDEPENDS_kernel-base = "kernel-image kernel-devicetree" |
31 | 31 | ||
32 | do_preconfigure_prepend () { | 32 | do_preconfigure_prepend () { |
33 | # FunctionFS for adb | 33 | # FunctionFS for qdbd |
34 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig | 34 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig |
35 | echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig | 35 | echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig |
36 | } | 36 | } |
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb index 925b41c..963d22d 100644 --- a/recipes-qt/b2qt-addons/qdbd.bb +++ b/recipes-qt/b2qt-addons/qdbd.bb | |||
@@ -67,7 +67,5 @@ do_install_append() { | |||
67 | } | 67 | } |
68 | 68 | ||
69 | SYSTEMD_SERVICE_${PN} = "qdbd.service" | 69 | SYSTEMD_SERVICE_${PN} = "qdbd.service" |
70 | # adbd is started by default instead of qdbd | ||
71 | SYSTEMD_AUTO_ENABLE = "disable" | ||
72 | 70 | ||
73 | inherit systemd | 71 | inherit systemd |
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 6e6fa1b..7bada5d 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb | |||
@@ -81,5 +81,7 @@ INITSCRIPT_NAME = "adb-init" | |||
81 | INITSCRIPT_PARAMS = "defaults 96" | 81 | INITSCRIPT_PARAMS = "defaults 96" |
82 | 82 | ||
83 | SYSTEMD_SERVICE_${PN} = "adbd.service" | 83 | SYSTEMD_SERVICE_${PN} = "adbd.service" |
84 | # qdbd is started by default instead of adbd | ||
85 | SYSTEMD_AUTO_ENABLE = "disable" | ||
84 | 86 | ||
85 | inherit update-rc.d systemd | 87 | inherit update-rc.d systemd |