diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-raspberrypi/recipes-connectivity/bluez5 | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-raspberrypi/recipes-connectivity/bluez5')
-rw-r--r-- | meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service | 14 | ||||
-rw-r--r-- | meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend | 35 |
2 files changed, 3 insertions, 46 deletions
diff --git a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service deleted file mode 100644 index a51f6bcbc6..0000000000 --- a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Broadcom BCM43438 bluetooth HCI -ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins -Before=bluetooth.service -BindsTo=dev-serial1.device -After=dev-serial1.device - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/btuart - -[Install] -WantedBy=multi-user.target diff --git a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend index d1b84df434..6651fb8d33 100644 --- a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -5,41 +5,12 @@ BCM_BT_SOURCES = " \ file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \ file://0003-Increase-firmware-load-timeout-to-30s.patch \ file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \ - file://brcm43438.service \ - " - -BCM_BT_SERVICE = "brcm43438.service" - -enable_bcm_bluetooth() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${BCM_BT_SERVICE} ${D}${systemd_unitdir}/system - fi -} - -BCM_BT_RDEPENDS = "\ - udev-rules-rpi \ - pi-bluetooth \ " -# for raspberrypi3 -SRC_URI_append_raspberrypi3 = " ${BCM_BT_SOURCES}" - -do_install_append_raspberrypi3() { - enable_bcm_bluetooth -} - -SYSTEMD_SERVICE_${PN}_append_raspberrypi3 = " ${BCM_BT_SERVICE}" +BCM_BT_RDEPENDS = "pi-bluetooth" -RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}" - -# for raspberrypi0-wifi SRC_URI_append_raspberrypi0-wifi = " ${BCM_BT_SOURCES}" - -do_install_append_raspberrypi0-wifi() { - enable_bcm_bluetooth -} - -SYSTEMD_SERVICE_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_SERVICE}" +SRC_URI_append_raspberrypi3 = " ${BCM_BT_SOURCES}" RDEPENDS_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_RDEPENDS}" +RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}" |