Merge commit '9bcf478f7ecc4942334d1fc5126f9c536abd1636' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-02-13 11:25:25 +01:00
commit 3f132fd793
2 changed files with 4 additions and 3 deletions

View File

@ -18,8 +18,8 @@ KERNEL_IMAGETYPE = "bzImage"
IMAGE_FSTYPES ?= "tar.gz ext4"
SERIAL_CONSOLE = "38400 ttyS0"
MACHINE_CONSOLE = "console=ttyS0,38400n8"
SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_CONSOLE = "console=ttyS0,115200n8"
# We bypass swrast but we need it to be present for X to load correctly
XSERVER ?= "xserver-xf86-dri-lite \

View File

@ -11,7 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \
file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \
"
inherit autotools-brokensep update-alternatives
inherit autotools update-alternatives
B = "${S}"
ALTERNATIVE_${PN} = "brctl"
ALTERNATIVE_PRIORITY[brctl] = "100"