conf: machine: refactor sysmocom-{bsc,alix,apu2}.conf
According to MACHINEOVERRIDES, alix and apu2 are subclass machines of sysmocom-bsc (abstract superclass). However, only alix requires sysmocom-bsc.conf. Make both alix and apu2 requires sysmocom-bsc.conf, and move alix specific stuff to sysmocom-alix.conf. In the process, linux-firmware-rtl-nic is removed from RDEPENDS for apu2, since it doesn't use RTL nic but e100e/igb ones. As a result of these movements, osmo-bsc.conf is actually empty, but it's left there for future additions which have to affect both machines: ie. adding stuff which is expected for "bsc" role on machines containing no BTS.
This commit is contained in:
parent
e4e0793cb5
commit
b5343fa75a
|
@ -3,4 +3,39 @@
|
||||||
#@DESCRIPTION: Machine configuration for sysmocom alix2d based hardware
|
#@DESCRIPTION: Machine configuration for sysmocom alix2d based hardware
|
||||||
|
|
||||||
require sysmocom-bsc.conf
|
require sysmocom-bsc.conf
|
||||||
MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
|
|
||||||
|
TARGET_ARCH = "i586"
|
||||||
|
|
||||||
|
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
|
||||||
|
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
|
||||||
|
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
|
||||||
|
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
|
||||||
|
PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
|
||||||
|
PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.59+git%')}"
|
||||||
|
|
||||||
|
require conf/machine/include/tune-geode.inc
|
||||||
|
|
||||||
|
MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
|
||||||
|
|
||||||
|
KERNEL_IMAGETYPE = "bzImage"
|
||||||
|
|
||||||
|
IMAGE_FSTYPES ?= "tar.gz ext4"
|
||||||
|
|
||||||
|
SERIAL_CONSOLE = "38400 ttyS0"
|
||||||
|
MACHINE_CONSOLE = "console=ttyS0,38400n8"
|
||||||
|
|
||||||
|
# We bypass swrast but we need it to be present for X to load correctly
|
||||||
|
XSERVER ?= "xserver-xf86-dri-lite \
|
||||||
|
mesa-dri-driver-swrast \
|
||||||
|
xf86-input-vmmouse \
|
||||||
|
xf86-input-keyboard \
|
||||||
|
xf86-input-evdev \
|
||||||
|
xf86-video-vmware"
|
||||||
|
|
||||||
|
GLIBC_ADDONS = "nptl"
|
||||||
|
GLIBC_EXTRA_OECONF = "--with-tls"
|
||||||
|
|
||||||
|
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
||||||
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
|
||||||
|
${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
|
||||||
|
linux-firmware-rtl-nic "
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
require conf/machine/include/tune-core2.inc
|
require conf/machine/include/tune-core2.inc
|
||||||
require conf/machine/include/genericx86-common.inc
|
require conf/machine/include/genericx86-common.inc
|
||||||
|
|
||||||
|
require sysmocom-bsc.conf
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
|
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
|
||||||
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
|
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
|
||||||
|
@ -36,8 +37,3 @@ XSERVER ?= "xserver-xf86-dri-lite \
|
||||||
|
|
||||||
GLIBC_ADDONS = "nptl"
|
GLIBC_ADDONS = "nptl"
|
||||||
GLIBC_EXTRA_OECONF = "--with-tls"
|
GLIBC_EXTRA_OECONF = "--with-tls"
|
||||||
|
|
||||||
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
|
||||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "linux-firmware-rtl-nic"
|
|
||||||
|
|
||||||
MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
|
|
||||||
|
|
|
@ -1,39 +1 @@
|
||||||
#@TYPE: Machine
|
MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
|
||||||
#@NAME: common_pc
|
|
||||||
#@DESCRIPTION: Machine configuration for running a common x86
|
|
||||||
|
|
||||||
TARGET_ARCH = "i586"
|
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
|
|
||||||
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
|
|
||||||
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
|
|
||||||
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
|
|
||||||
PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.59+git%')}"
|
|
||||||
|
|
||||||
require conf/machine/include/tune-geode.inc
|
|
||||||
|
|
||||||
MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
|
|
||||||
|
|
||||||
KERNEL_IMAGETYPE = "bzImage"
|
|
||||||
|
|
||||||
IMAGE_FSTYPES ?= "tar.gz ext4"
|
|
||||||
|
|
||||||
SERIAL_CONSOLE = "38400 ttyS0"
|
|
||||||
MACHINE_CONSOLE = "console=ttyS0,38400n8"
|
|
||||||
|
|
||||||
# We bypass swrast but we need it to be present for X to load correctly
|
|
||||||
XSERVER ?= "xserver-xf86-dri-lite \
|
|
||||||
mesa-dri-driver-swrast \
|
|
||||||
xf86-input-vmmouse \
|
|
||||||
xf86-input-keyboard \
|
|
||||||
xf86-input-evdev \
|
|
||||||
xf86-video-vmware"
|
|
||||||
|
|
||||||
GLIBC_ADDONS = "nptl"
|
|
||||||
GLIBC_EXTRA_OECONF = "--with-tls"
|
|
||||||
|
|
||||||
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
|
||||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
|
|
||||||
${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
|
|
||||||
linux-firmware-rtl-nic "
|
|
||||||
|
|
Loading…
Reference in New Issue