From 6dc4f687b51f775088fc749694fdb7eb8211d4f7 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 19 Dec 2016 15:01:19 +0200 Subject: Change USB vendor ID used by qdbd Rather than using Google's ID, let's pick an unused one. We are not reserving an official USB vendor ID, since this is only used for development and Qt for Device Creation users will use their own USB IDs in the final devices. Also always use a fixed product ID, since ADB_PRODUCTID value will make no sense with the changed vendor ID. Change-Id: I69ed1bcfbe3e17b5faebf4b3b71f691778776da7 Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/b2qt-addons/qdbd.bb | 6 ------ recipes-qt/b2qt-addons/qdbd/defaults | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb index b1c9a0d..e47e92b 100644 --- a/recipes-qt/b2qt-addons/qdbd.bb +++ b/recipes-qt/b2qt-addons/qdbd.bb @@ -51,12 +51,6 @@ S = "${WORKDIR}/git" EXTRA_QMAKEVARS_PRE = "CONFIG+=daemon_only" -do_configure_append() { - if [ -n "${ADB_PRODUCTID}" ]; then - sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/defaults - fi -} - do_install_append() { install -m 0755 ${WORKDIR}/qdbd-init.sh ${D}${bindir}/ install -m 0755 -d ${D}${sysconfdir}/init.d diff --git a/recipes-qt/b2qt-addons/qdbd/defaults b/recipes-qt/b2qt-addons/qdbd/defaults index 1ff78fb..edefcd2 100644 --- a/recipes-qt/b2qt-addons/qdbd/defaults +++ b/recipes-qt/b2qt-addons/qdbd/defaults @@ -1,3 +1,3 @@ -VENDOR=0x18d1 -PRODUCT=0x0000 +VENDOR=0xdbdb +PRODUCT=0x0001 SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) -- cgit v1.2.3-54-g00ecf