The usrmerge fixes added to the various rcar3 kernel bbappends turn
out to cause issues when using linux-dummy as the kernel as the
IC EG system containers do, add the required extra checking to avoid
issues.
Bug-AGL: SPEC-4703
Change-Id: I7749c9f921791a7c143a7003827939af64997a5c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28472
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
fi
# Add a rule to ensure the 'display' user has permission to access
fi
# Add a rule to ensure the 'display' user has permission to access
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
do_install:append() {
# Work around upstream not using ${nonarch_base_libdir}/modules
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
+ if [ -d ${D}/lib/modules ]; then
+ install -d ${D}${nonarch_base_libdir}/
+ mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+ rm -rf ${D}/lib
+ fi
fi
# Add a rule to ensure the 'display' user has permission to access
fi
# Add a rule to ensure the 'display' user has permission to access