diff options
| -rw-r--r-- | meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend index 7d83958..e71ec4b 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend @@ -3,7 +3,8 @@ WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png" WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png" WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png" WALLPAPER-MACHINE_apalis-tk1 = "Wallpaper_ApalisTK1.png" -WALLPAPER-MACHINE_mx6ull = "Wallpaper_ColibriiMX6ULL.png" +WALLPAPER-MACHINE_colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" +WALLPAPER-MACHINE_colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" FILESEXTRAPATHS_prepend := "${THISDIR}/lxqt-themes:" @@ -15,20 +16,23 @@ SRC_URI += " \ " # for apalis-imx6/colibri-imx6, we decide on the target during postinst -SRC_URI-MX6QDL = " \ +SRC_URI_append_apalis-imx6 += " \ file://Wallpaper_ApalisiMX6D.png \ file://Wallpaper_ApalisiMX6Q.png \ +" +SRC_URI_append_colibri-imx6 += " \ file://Wallpaper_ColibriiMX6DL.png \ file://Wallpaper_ColibriiMX6S.png \ " -SRC_URI_append_mx6q += " ${SRC_URI-MX6QDL}" -SRC_URI_append_mx6dl += " ${SRC_URI-MX6QDL}" # for colibri-imx7 we decide on the target during postinst -SRC_URI_append_mx7 += " \ +SRC_URI_append_colibri-imx7 += " \ file://Wallpaper_ColibriiMX7D.png \ file://Wallpaper_ColibriiMX7S.png \ " +SRC_URI_append_colibri-imx7-emmc += " \ + file://Wallpaper_ColibriiMX7D.png \ +" do_install_append () { install -m 0755 -d ${D}/${datadir}/lxqt/themes/toradex @@ -36,20 +40,27 @@ do_install_append () { ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxqt/themes/toradex/toradex.png } -pkg_postinst_ontarget_${PN}_mx6 () { - SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` +pkg_postinst_ontarget_${PN}_apalis-imx6 () { CORES=`grep -c processor /proc/cpuinfo` case $CORES in 4) ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxqt/themes/toradex/toradex.png ;; 2) - if [ "x$SOC_TYPE" = "xi.MX6DL" ]; then - ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxqt/themes/toradex/toradex.png - else - ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxqt/themes/toradex/toradex.png + ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxqt/themes/toradex/toradex.png fi ;; + *) + ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png + ;; + esac +} +pkg_postinst_ontarget_${PN}_colibri-imx6 () { + CORES=`grep -c processor /proc/cpuinfo` + case $CORES in + 2) + ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxqt/themes/toradex/toradex.png + ;; 1) ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxqt/themes/toradex/toradex.png ;; @@ -59,14 +70,7 @@ pkg_postinst_ontarget_${PN}_mx6 () { esac } -# the ull is in the mx6 soc family, so give a more specific override here -# do nothing, but do not prevent the injected update-alternatives to run on -# the target. -pkg_postinst_ontarget_${PN}_mx6ull () { - : -} - -pkg_postinst_ontarget_${PN}_mx7 () { +pkg_postinst_ontarget_${PN}_colibri-imx7 () { # Currently the soc bus subsystem seems not to work on i.MX 7Solo # SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` # if [ "x$SOC_TYPE" = "xi.MX7D" ]; then |