Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meta-wpe: implement initial dynamic layers support. #202

Merged
merged 1 commit into from
Apr 9, 2018
Merged

meta-wpe: implement initial dynamic layers support. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ LAYERDEPENDS_wpe-layer = "core \
meta-python \
"

BBFILES_DYNAMIC += " \
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bb \
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bbappend \
\
brcm:${LAYERDIR}/dynamic-layers/brcm/recipes-*/*/*.bb \
brcm:${LAYERDIR}/dynamic-layers/brcm/recipes-*/*/*.bbappend \
"

LICENSE_PATH += "${LAYERDIR}/licenses"

# WPE needs mpg123 gstreamer plugin
Expand All @@ -26,8 +34,6 @@ LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-plugins-ugly"
LICENSE_FLAGS_WHITELIST += "commercial_libomxil"
LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-omx"

BB_DANGLINGAPPENDS_WARNONLY ?= "1"

# Enable Turbo mode on Rpi2
ARM_FREQ = "1000"
CORE_FREQ = "500"
Expand Down
0 .../broadcom-refsw/broadcom-refsw_%.bbappend → .../broadcom-refsw/broadcom-refsw_%.bbappend
View file
Open in desktop
File renamed without changes.
0 recipes-bsp/broadcom-refsw/files/egl.pc → ...m/recipes-bsp/broadcom-refsw/files/egl.pc
View file
Open in desktop
File renamed without changes.
0 recipes-bsp/broadcom-refsw/files/glesv2.pc → ...ecipes-bsp/broadcom-refsw/files/glesv2.pc
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...pes-bsp/bootfiles/rpi-config_git.bbappend → ...pes-bsp/bootfiles/rpi-config_git.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ do_deploy_prepend() {
}

do_deploy_append() {
sed -i '/#hdmi_group=/ c\hdmi_group=${HDMI_GROUP}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#hdmi_group=/ c\hdmi_group=${HDMI_GROUP}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#disable_splash=/ c\disable_splash=1' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#gpu_freq=/ c\gpu_freq=500' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
sed -i '/#disable_overscan=/ c\disable_overscan=1' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
Expand Down
3 changes: 1 addition & 2 deletions ...pes-core/base-files/base-files_%.bbappend → ...pes-core/base-files/base-files_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
do_install_append_rpi () {
do_install_append_rpi() {
cat >> ${D}${sysconfdir}/fstab <<EOF

# Mount boot directory
/dev/mmcblk0p1 /boot vfat defaults 0 0
/dev/mmcblk0p2 /home/root ext4 defaults 0 0

EOF
}
0 .../0001-Adding-metrological-boot-logo.patch → .../0001-Adding-metrological-boot-logo.patch
View file
Open in desktop
File renamed without changes.
0 ...linux/files/logo_metrological_clut224.ppm → ...linux/files/logo_metrological_clut224.ppm
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...kernel/linux/linux-raspberrypi_%.bbappend → ...kernel/linux/linux-raspberrypi_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ do_configure_prepend() {
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'wpeframework', d)}" ]; then
kernel_configure_variable LOGO_LINUX_CLUT224 n
kernel_configure_variable LOGO_METROLOGICAL_CLUT224 y

cp ${WORKDIR}/logo_metrological_clut224.ppm ${B}/source/drivers/video/logo/logo_metrological_clut224.ppm

fi
}