From 8c5565bb4d00507fe18d436d9e5d49178cca67bb Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Tue, 15 Nov 2011 17:42:05 +0100
Subject: [PATCH] setup-helper: inject glib and yasm, remove xulrunner

---
 iso/bin/setup-helper | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper
index 497e5c7..1f1be6d 100755
--- a/iso/bin/setup-helper
+++ b/iso/bin/setup-helper
@@ -97,7 +97,7 @@ echo "* CRUX 2.6 -> 2.7 setup-helper"
 
 rename_packages "libattr:attr"
 remove_packages portmap glitz
-inject_packages libmpc attr acl libcap
+inject_packages libmpc attr acl libcap glib
 
 
 if [ `is_installed xorg-xf86-video-intel` ]; then
@@ -112,3 +112,8 @@ if [ `is_installed nfs-utils` ]; then
     inject_packages libtirpc libnfsidmap libevent rpcbind
 fi
 
+if [ `is_installed firefox` ]; then
+    inject_packages yasm
+    remove_packages xulrunner
+fi
+