diff --git a/makedist.inc.sh b/makedist.inc.sh index d2b67c4..695c066 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -114,6 +114,10 @@ else fi [ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}" +if [ "$VARIANT" ]; then + install_rpms_by_target "Installing ${PLATFORM} platform packages for variant $VARIANT" ${MAKEDIST_TARGET}-${PLATFORM}-${VARIANT} "${RPMEXTRAARGS}" +fi + if [ "$APPLICATION_TARGET" ]; then add_additional_defs_file /usr/share/openmamba/pkggroups.db for t in $APPLICATION_TARGET; do diff --git a/platforms/diskimg/pre.inc.sh b/platforms/diskimg/pre.inc.sh index a31d47b..3e54ae7 100644 --- a/platforms/diskimg/pre.inc.sh +++ b/platforms/diskimg/pre.inc.sh @@ -1,4 +1,5 @@ case $VARIANT in + baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; DEVICEARCH=x86_64; MEDIA_SIZE=5120 ;; bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=2584 ;; raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=2584 ;; cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=2584 ;;