mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-21 05:57:05 +00:00
android-tools-conf-configfs: remove this recipe without selinux dependency
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/ as it's not required anymore, and ensure adb work normally on the boards with multiple UDC ports. 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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-4
@@ -1,4 +0,0 @@
|
|||||||
[Service]
|
|
||||||
ExecStartPre=/usr/bin/android-gadget-setup
|
|
||||||
ExecStartPost=/usr/bin/android-gadget-start
|
|
||||||
ExecStopPost=/usr/bin/android-gadget-cleanup
|
|
||||||
-24
@@ -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
|
|
||||||
-35
@@ -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
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
sleep 3
|
|
||||||
|
|
||||||
ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC
|
|
||||||
-37
@@ -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"
|
|
||||||
Reference in New Issue
Block a user