| Message ID | 20260126082356.3462355-1-shoudil@qti.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,PATCHv2] android-tools-conf-configfs: remove this recipe without selinux dependency | expand |
On Mon, Jan 26, 2026 at 4:39 PM Shoudi Li via lists.openembedded.org <shoudil=qti.qualcomm.com@lists.openembedded.org> wrote: > > For the boards with multiple UDC ports, adb funtion will be impacted > when compiling with meta-selinux layer due to below error. > > ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC > ls: write error: Device or resource busy Did you forget to update the commit message? > > Signed-off-by: Shoudi Li <shoudil@qti.qualcomm.com> > --- > .../10-adbd-configfs.conf | 4 -- > .../android-gadget-cleanup | 24 ------------ > .../android-gadget-setup | 35 ------------------ > .../android-gadget-start | 7 ---- > .../android-tools-conf-configfs_1.0.bb | 37 ------------------- > 5 files changed, 107 deletions(-) > delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf > delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup > delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup > delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start > delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb > > diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf > deleted file mode 100644 > index ddf155a907..0000000000 > --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf > +++ /dev/null > @@ -1,4 +0,0 @@ > -[Service] > -ExecStartPre=/usr/bin/android-gadget-setup > -ExecStartPost=/usr/bin/android-gadget-start > -ExecStopPost=/usr/bin/android-gadget-cleanup > diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup > deleted file mode 100644 > index 517227d4a6..0000000000 > --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup > +++ /dev/null > @@ -1,24 +0,0 @@ > -#!/bin/sh > - > -[ -d /sys/kernel/config/usb_gadget ] || exit 0 > - > -cd /sys/kernel/config/usb_gadget > - > -cd adb > - > -echo "" > UDC || true > - > -killall adbd || true > - > -umount /dev/usb-ffs/adb > - > -rm configs/c.1/ffs.usb0 > - > -rmdir configs/c.1/strings/0x409 > -rmdir configs/c.1 > - > -rmdir functions/ffs.usb0 > -rmdir strings/0x409 > - > -cd .. > -rmdir adb > diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup > deleted file mode 100644 > index e44d1bacbe..0000000000 > --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup > +++ /dev/null > @@ -1,35 +0,0 @@ > -#!/bin/sh > - > -set -e > - > -manufacturer=RPB > -model="Android device" > -serial=0123456789ABCDEF > - > -if [ -r /etc/android-gadget-setup.machine ] ; then > - . /etc/android-gadget-setup.machine > -fi > - > -[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite > - > -cd /sys/kernel/config/usb_gadget > - > -[ -d adb ] && /usr/bin/android-gadget-cleanup || true > - > -mkdir adb > -cd adb > - > -mkdir configs/c.1 > -mkdir functions/ffs.usb0 > -mkdir strings/0x409 > -mkdir configs/c.1/strings/0x409 > -echo 0x18d1 > idVendor > -echo 0xd002 > idProduct > -echo "$serial" > strings/0x409/serialnumber > -echo "$manufacturer" > strings/0x409/manufacturer > -echo "$model" > strings/0x409/product > -echo "Conf 1" > configs/c.1/strings/0x409/configuration > -ln -s functions/ffs.usb0 configs/c.1 > - > -mkdir -p /dev/usb-ffs/adb > -mount -t functionfs usb0 /dev/usb-ffs/adb > diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start > deleted file mode 100644 > index ca6c3df275..0000000000 > --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start > +++ /dev/null > @@ -1,7 +0,0 @@ > -#!/bin/sh > - > -set -e > - > -sleep 3 > - > -ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC > diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb > deleted file mode 100644 > index 4d30327372..0000000000 > --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb > +++ /dev/null > @@ -1,37 +0,0 @@ > -DESCRIPTION = "Various utilities from Android - corresponding configuration files for using ConfigFS" > -SECTION = "console/utils" > -LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" > - > -S = "${UNPACKDIR}" > - > -SRC_URI = " \ > - file://android-gadget-setup \ > - file://android-gadget-start \ > - file://android-gadget-cleanup \ > - file://10-adbd-configfs.conf \ > -" > - > -PACKAGE_ARCH = "${MACHINE_ARCH}" > - > -do_install() { > - install -d ${D}${bindir} > - install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} > - install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} > - install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} > - > - if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then > - install -d ${D}${sysconfdir} > - install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} > - fi > - > - install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d > - install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d > -} > - > -FILES:${PN} += " \ > - ${systemd_unitdir}/system/ \ > -" > - > -PROVIDES += "android-tools-conf" > -RPROVIDES:${PN} = "android-tools-conf" > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#123865): https://lists.openembedded.org/g/openembedded-devel/message/123865 > Mute This Topic: https://lists.openembedded.org/mt/117465276/3616702 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [anuj.mittal@oss.qualcomm.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf deleted file mode 100644 index ddf155a907..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Service] -ExecStartPre=/usr/bin/android-gadget-setup -ExecStartPost=/usr/bin/android-gadget-start -ExecStopPost=/usr/bin/android-gadget-cleanup diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup deleted file mode 100644 index 517227d4a6..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -[ -d /sys/kernel/config/usb_gadget ] || exit 0 - -cd /sys/kernel/config/usb_gadget - -cd adb - -echo "" > UDC || true - -killall adbd || true - -umount /dev/usb-ffs/adb - -rm configs/c.1/ffs.usb0 - -rmdir configs/c.1/strings/0x409 -rmdir configs/c.1 - -rmdir functions/ffs.usb0 -rmdir strings/0x409 - -cd .. -rmdir adb diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup deleted file mode 100644 index e44d1bacbe..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -manufacturer=RPB -model="Android device" -serial=0123456789ABCDEF - -if [ -r /etc/android-gadget-setup.machine ] ; then - . /etc/android-gadget-setup.machine -fi - -[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite - -cd /sys/kernel/config/usb_gadget - -[ -d adb ] && /usr/bin/android-gadget-cleanup || true - -mkdir adb -cd adb - -mkdir configs/c.1 -mkdir functions/ffs.usb0 -mkdir strings/0x409 -mkdir configs/c.1/strings/0x409 -echo 0x18d1 > idVendor -echo 0xd002 > idProduct -echo "$serial" > strings/0x409/serialnumber -echo "$manufacturer" > strings/0x409/manufacturer -echo "$model" > strings/0x409/product -echo "Conf 1" > configs/c.1/strings/0x409/configuration -ln -s functions/ffs.usb0 configs/c.1 - -mkdir -p /dev/usb-ffs/adb -mount -t functionfs usb0 /dev/usb-ffs/adb diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start deleted file mode 100644 index ca6c3df275..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -sleep 3 - -ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb deleted file mode 100644 index 4d30327372..0000000000 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Various utilities from Android - corresponding configuration files for using ConfigFS" -SECTION = "console/utils" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -S = "${UNPACKDIR}" - -SRC_URI = " \ - file://android-gadget-setup \ - file://android-gadget-start \ - file://android-gadget-cleanup \ - file://10-adbd-configfs.conf \ -" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} - install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} - install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} - - if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then - install -d ${D}${sysconfdir} - install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} - fi - - install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d - install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d -} - -FILES:${PN} += " \ - ${systemd_unitdir}/system/ \ -" - -PROVIDES += "android-tools-conf" -RPROVIDES:${PN} = "android-tools-conf"
For the boards with multiple UDC ports, adb funtion will be impacted when compiling with meta-selinux layer due to below error. ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC ls: write error: Device or resource busy Signed-off-by: Shoudi Li <shoudil@qti.qualcomm.com> --- .../10-adbd-configfs.conf | 4 -- .../android-gadget-cleanup | 24 ------------ .../android-gadget-setup | 35 ------------------ .../android-gadget-start | 7 ---- .../android-tools-conf-configfs_1.0.bb | 37 ------------------- 5 files changed, 107 deletions(-) delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb