From bc1c031c03a8dd4d08522e07220f76803532dd93 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 19 Feb 2015 14:53:09 +0100 Subject: [PATCH] Support for workaround target pre-platform installation, just used temporary --- makedist.inc.sh | 4 ++++ platforms/livecd-light-root/Makefile | 2 ++ platforms/livecd/Makefile | 1 + 3 files changed, 7 insertions(+) diff --git a/makedist.inc.sh b/makedist.inc.sh index 2fce176..940c710 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -85,6 +85,10 @@ fi echo "$TARGET_HOSTNAME.$TARGET_DOMAIN" > $MOUNTDIR/etc/hostname +if [ "$PREPLATFORM_TARGET" ]; then + install_rpms_by_target "Installing ${PLATFORM} pre-platform workaround packages" ${MAKEDIST_TARGET}-${PREPLATFORM_TARGET} "${RPMEXTRAARGS}" +fi + #install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools "" install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}" diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 49b3701..57752a3 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -11,6 +11,8 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress +$(MAKEDIST_TARGET)-workaround: libQt5Core + $(MAKEDIST_TARGET)-livecd-light-root: \ postplug-xorg postplug-sound \ $(MAKEDIST_TARGET)-commontools xorg-server \ diff --git a/platforms/livecd/Makefile b/platforms/livecd/Makefile index 8f8bded..1ca514e 100644 --- a/platforms/livecd/Makefile +++ b/platforms/livecd/Makefile @@ -3,3 +3,4 @@ $(MAKEDIST_TARGET)-livecd: openmamba-release memtest86+ syslinux macbook-tools d $(MAKEDIST_TARGET)-livecd-en: $(MAKEDIST_TARGET)-livecd-it: $(MAKEDIST_TARGET)-livecd-es: +$(MAKEDIST_TARGET)-workaround: