diff mbox series

[meta-oe,v3] android-tools-conf-configfs: remove this recipe without selinux dependency

Message ID 20260127055329.3727567-1-shoudil@qti.qualcomm.com
State Accepted
Headers show
Series [meta-oe,v3] android-tools-conf-configfs: remove this recipe without selinux dependency | expand

Commit Message

Shoudi Li Jan. 27, 2026, 5:53 a.m. UTC
For the boards with multiple UDC ports, when compiling with meta-selinux
layer adb funtion will be impacted due to below error. Remove the recipe
under dynamic-layers/selinux/ to avoid it.

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

Comments

Anuj Mittal Jan. 27, 2026, 5:57 a.m. UTC | #1
On Tue, Jan 27, 2026 at 1:54 PM Shoudi Li via lists.openembedded.org
<shoudil=qti.qualcomm.com@lists.openembedded.org> wrote:
>
> For the boards with multiple UDC ports, when compiling with meta-selinux
> layer adb funtion will be impacted due to below error. Remove the recipe
> under dynamic-layers/selinux/ to avoid it.
>
> ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC
> ls: write error: Device or resource busy

What changed in v3? The commit message doesn't explain why the recipe
is being removed.

>
> 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 (#123899): https://lists.openembedded.org/g/openembedded-devel/message/123899
> Mute This Topic: https://lists.openembedded.org/mt/117484385/3616702
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [anuj.mittal@oss.qualcomm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Anuj Mittal Jan. 27, 2026, 6:05 a.m. UTC | #2
On Tue, Jan 27, 2026 at 1:57 PM Anuj Mittal via lists.openembedded.org
<anuj.mittal=oss.qualcomm.com@lists.openembedded.org> wrote:
>
> On Tue, Jan 27, 2026 at 1:54 PM Shoudi Li via lists.openembedded.org
> <shoudil=qti.qualcomm.com@lists.openembedded.org> wrote:
> >
> > For the boards with multiple UDC ports, when compiling with meta-selinux
> > layer adb funtion will be impacted due to below error. Remove the recipe
> > under dynamic-layers/selinux/ to avoid it.
> >
> > ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC
> > ls: write error: Device or resource busy
>
> What changed in v3? The commit message doesn't explain why the recipe
> is being removed.

Please ignore my comment. I read the wrong message.

Thanks,

Anuj

>
> >
> > 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 (#123900): https://lists.openembedded.org/g/openembedded-devel/message/123900
> Mute This Topic: https://lists.openembedded.org/mt/117484385/3616702
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [anuj.mittal@oss.qualcomm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ricardo de Araujo (Salveti) Jan. 28, 2026, 2:08 a.m. UTC | #3
On Tue, Jan 27, 2026 at 2:54 AM Shoudi Li via lists.openembedded.org
<shoudil=qti.qualcomm.com@lists.openembedded.org> wrote:
>
> For the boards with multiple UDC ports, when compiling with meta-selinux
> layer adb funtion will be impacted due to below error. Remove the recipe
> under dynamic-layers/selinux/ to avoid it.
>
> ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC
> ls: write error: Device or resource busy

You are removing it because it is not really required anymore, so add
that to your commit message.

The consequence of the removal is that boards with multiple UDC ports
will be functional with adb.

Thanks,

Ricardo
diff mbox series

Patch

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"