Merge commit '9bcf478f7ecc4942334d1fc5126f9c536abd1636' into dora
This commit is contained in:
commit
3f132fd793
|
@ -18,8 +18,8 @@ KERNEL_IMAGETYPE = "bzImage"
|
||||||
|
|
||||||
IMAGE_FSTYPES ?= "tar.gz ext4"
|
IMAGE_FSTYPES ?= "tar.gz ext4"
|
||||||
|
|
||||||
SERIAL_CONSOLE = "38400 ttyS0"
|
SERIAL_CONSOLE = "115200 ttyS0"
|
||||||
MACHINE_CONSOLE = "console=ttyS0,38400n8"
|
MACHINE_CONSOLE = "console=ttyS0,115200n8"
|
||||||
|
|
||||||
# We bypass swrast but we need it to be present for X to load correctly
|
# We bypass swrast but we need it to be present for X to load correctly
|
||||||
XSERVER ?= "xserver-xf86-dri-lite \
|
XSERVER ?= "xserver-xf86-dri-lite \
|
||||||
|
|
|
@ -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 \
|
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_${PN} = "brctl"
|
||||||
ALTERNATIVE_PRIORITY[brctl] = "100"
|
ALTERNATIVE_PRIORITY[brctl] = "100"
|
||||||
|
|
Loading…
Reference in New Issue