android-tools-conf: replace sysfs implementation with configfs
PATCH 1/1 android-tools-conf: replace sysfs implementation with configfs
From: Etienne Cordonnier <[email protected]>
The android-tools-conf recipe used /sys/class/android_usb/android0/, an interface exported by the out-of-tree android.c USB gadget driver that Google carried in Android kernels but never submitted to mainline Linux. It was never part of any upstream kernel release.
The configfs-based USB gadget framework (CONFIG_USB_CONFIGFS) was merged into mainline Linux with kernel 3.10 (June 2013) and is the correct interface for all upstream kernels since then. Additionally, Google's Generic Kernel Image (GKI) initiative dropped android.c from Android common kernels starting with kernel 5.10 (Android 12, 2021), so even custom BSPs targeting modern Android cannot use this interface.
Remove android-tools-conf and rename android-tools-conf-configfs to android-tools-conf, since the configfs-based implementation is the only correct one for any modern kernel. Backward compatibility is preserved via PROVIDES/RPROVIDES retaining the old android-tools-conf-configfs name.
AI-Generated: Uses GitHub Copilot (Claude Sonnet 4.6)
---
meta-oe/conf/layer.conf | 1 -
.../android-gadget-setup | 40 ------------
.../android-tools-conf-configfs_1.0.bb | 38 -----------
.../10-adbd-configfs.conf | 0
.../android-gadget-cleanup | 0
.../android-tools-conf/android-gadget-setup | 63 ++++++++++---------
.../android-gadget-start | 0
.../android-tools/android-tools-conf_1.0.bb | 38 ++++++++---
8 files changed, 62 insertions(+), 118 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
rename meta-oe/recipes-devtools/android-tools/{android-tools-conf-configfs => android-tools-conf}/10-adbd-configfs.conf (100%)
rename meta-oe/recipes-devtools/android-tools/{android-tools-conf-configfs => android-tools-conf}/android-gadget-cleanup (100%)
rename meta-oe/recipes-devtools/android-tools/{android-tools-conf-configfs => android-tools-conf}/android-gadget-start (100%)meta-oe/conf/layer.conf +0 -1
@@ -53,7 +53,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2" -PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" # Those lines configure whether coreutils or uutils-coreutils is used. PREFERRED_PROVIDER_coreutils = "coreutils" PREFERRED_PROVIDER_coreutils-native = "coreutils-native"
meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup deleted +0 -40
@@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -conf="Conf 1" -manufacturer=RPB -model="Android device" -product=0xd002 -serial=0123456789ABCDEF -vendor=0x18d1 - -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 -n "$vendor" > idVendor -echo -n "$product" > idProduct -echo "$serial" > strings/0x409/serialnumber -echo "$manufacturer" > strings/0x409/manufacturer -echo "$model" > strings/0x409/product -echo "$conf" > configs/c.1/strings/0x409/configuration -ln -s functions/ffs.usb0 configs/c.1 - -mkdir -p /dev/usb-ffs/adb -ADB_UID=$(id -u adb) -ADB_GID=$(id -g adb) -mount -t functionfs usb0 /dev/usb-ffs/adb -o "uid=$ADB_UID,gid=$ADB_GID"
meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb deleted +0 -38
@@ -1,38 +0,0 @@ -DESCRIPTION = "Different utilities from Android - corressponding 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" -BBCLASSEXTEND = "native"
meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf renamed from meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf +0 -0
meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup renamed from meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup +0 -0
meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup +33 -30
70 lines not on this page · raw message
meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start renamed from meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start +0 -0
meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +29 -9
@@ -1,20 +1,40 @@ -DESCRIPTION = "Different utilities from Android - corresponding configuration files" +DESCRIPTION = "Different utilities from Android - corresponding configuration files for using ConfigFS" SECTION = "console/utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "file://android-gadget-setup" - 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} -python () { - pn = d.getVar('PN') - profprov = d.getVar("PREFERRED_PROVIDER_" + pn) - if profprov and pn != profprov: - raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (pn, profprov, pn)) + 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-configfs" +RPROVIDES:${PN} = "android-tools-conf-configfs" +RREPLACES:${PN} = "android-tools-conf-configfs" +RCONFLICTS:${PN} = "android-tools-conf-configfs" +BBCLASSEXTEND = "native"
Signature · 1 line
2.43.0