nwl-test-image: Add missing components
Since we worked mainly on the ramdisk image, the test-image was almost empty and lacking the minimum components. This components are now defined in a packagegroup which is included in all nwl-images. It also include a new MACHINE_FEATURE : nrsw-ready. This feature allows us to not include NRSW modules for devices that are not supported by NRSW: for the moment it is mainly the devices supported by core-os like cn9130-cf-pro. These devices are build against there custom kernel against which the NRSW modules are not buildable. id:458169
This commit is contained in:
parent
49cf460db4
commit
c1165a318f
|
|
@ -0,0 +1 @@
|
||||||
|
MACHINE_FEATURES += "nrsw-ready"
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
require all-netmodule.inc
|
||||||
|
|
||||||
SOC_FAMILY = "armada"
|
SOC_FAMILY = "armada"
|
||||||
require conf/machine/include/soc-family.inc
|
require conf/machine/include/soc-family.inc
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
# xf86-video-modesetting \
|
# xf86-video-modesetting \
|
||||||
# "
|
# "
|
||||||
|
|
||||||
|
require all-netmodule.inc
|
||||||
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
|
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
|
||||||
NM_TARGET = "netbird"
|
NM_TARGET = "netbird"
|
||||||
NM_ARCH = "arm"
|
NM_ARCH = "arm"
|
||||||
|
|
|
||||||
|
|
@ -3,3 +3,7 @@ COREOS_IMAGE_GENERATE_SWU = "0"
|
||||||
COREOS_IMAGE_GENERATE_INSTALLER = "0"
|
COREOS_IMAGE_GENERATE_INSTALLER = "0"
|
||||||
|
|
||||||
inherit coreos-image
|
inherit coreos-image
|
||||||
|
|
||||||
|
IMAGE_INSTALL:append = " \
|
||||||
|
packagegroup-nwl-core \
|
||||||
|
"
|
||||||
|
|
|
||||||
|
|
@ -17,30 +17,11 @@ IMAGE_FSTYPES = "cpio.xz"
|
||||||
# Keep only the minimum packages
|
# Keep only the minimum packages
|
||||||
NO_RECOMMENDATIONS = "1"
|
NO_RECOMMENDATIONS = "1"
|
||||||
|
|
||||||
TI_WIFI_PACKAGES = " \
|
|
||||||
firmware-ti-wl18xx \
|
|
||||||
"
|
|
||||||
|
|
||||||
WIFI_PACKAGES = " \
|
|
||||||
${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI_PACKAGES}", "", d)} \
|
|
||||||
"
|
|
||||||
|
|
||||||
EXTRA_IMAGE_FEATURES = "debug-tweaks ssh-server"
|
EXTRA_IMAGE_FEATURES = "debug-tweaks ssh-server"
|
||||||
|
|
||||||
IMAGE_INSTALL:append = " \
|
IMAGE_INSTALL:append = " \
|
||||||
coreutils \
|
|
||||||
ncurses-terminfo-base \
|
|
||||||
kernel-modules \
|
|
||||||
kernel-module-board-descriptor \
|
|
||||||
kernel-module-system-info \
|
|
||||||
kernel-module-pcie \
|
|
||||||
\
|
|
||||||
networkmanager-nmcli \
|
|
||||||
systemd-conf \
|
|
||||||
nwl-tests \
|
nwl-tests \
|
||||||
\
|
\
|
||||||
${@bb.utils.contains("MACHINE_FEATURES", "wifi", "${WIFI_PACKAGES}", "", d)} \
|
|
||||||
\
|
|
||||||
bmap-tools \
|
bmap-tools \
|
||||||
xz \
|
xz \
|
||||||
"
|
"
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,13 @@ inherit nwl-image
|
||||||
|
|
||||||
# Add features and packages that are used in our tests:
|
# Add features and packages that are used in our tests:
|
||||||
IMAGE_FEATURES += "ssh-server networkmanager swupdate"
|
IMAGE_FEATURES += "ssh-server networkmanager swupdate"
|
||||||
IMAGE_INSTALL:append = " packagegroup-core-full-cmdline swupdate-www"
|
IMAGE_INSTALL:append = " \
|
||||||
|
packagegroup-core-full-cmdline \
|
||||||
|
swupdate-www \
|
||||||
|
nwl-tests \
|
||||||
|
"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
IMAGE_FSTYPES += "wic.xz wic.bmap"
|
IMAGE_FSTYPES += "wic.xz wic.bmap"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
inherit packagegroup
|
||||||
|
|
||||||
|
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||||
|
|
||||||
|
|
||||||
|
NRSW_MODULES = " \
|
||||||
|
kernel-module-board-descriptor \
|
||||||
|
kernel-module-system-info \
|
||||||
|
kernel-module-pcie \
|
||||||
|
"
|
||||||
|
|
||||||
|
TI_WIFI_PACKAGES = " \
|
||||||
|
firmware-ti-wl18xx \
|
||||||
|
"
|
||||||
|
|
||||||
|
WIFI_PACKAGES = " \
|
||||||
|
${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI_PACKAGES}", "", d)} \
|
||||||
|
"
|
||||||
|
|
||||||
|
RDEPENDS:${PN} = " \
|
||||||
|
coreutils \
|
||||||
|
ncurses-terminfo-base \
|
||||||
|
networkmanager-nmcli \
|
||||||
|
systemd-conf \
|
||||||
|
\
|
||||||
|
kernel-modules \
|
||||||
|
${@bb.utils.contains("MACHINE_FEATURES", "nrsw-ready", "${NRSW_MODULES}", "", d)} \
|
||||||
|
\
|
||||||
|
${@bb.utils.contains("MACHINE_FEATURES", "wifi", "${WIFI_PACKAGES}", "", d)} \
|
||||||
|
"
|
||||||
Loading…
Reference in New Issue