summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Housh <jaeger@morpheus.net>2014-02-16 15:53:00 -0600
committerMatt Housh <jaeger@morpheus.net>2014-02-16 15:53:00 -0600
commit34305391e21c09021e335d3dd517477174a7502c (patch)
treeaa4bdad34934040fa9dec368d184e1bca2c83980
parent504807f712fecfb71a1e5c5076b804e184234f13 (diff)
downloadiso-34305391e21c09021e335d3dd517477174a7502c.tar.gz
iso-34305391e21c09021e335d3dd517477174a7502c.tar.xz
Updated opt and xorg package lists, cleaned up some of my testing leftovers
-rwxr-xr-xiso/bin/setup-helper10
-rw-r--r--packages.opt4
-rw-r--r--packages.xorg2
3 files changed, 7 insertions, 9 deletions
diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper
index 21a80f8..fd93a84 100755
--- a/iso/bin/setup-helper
+++ b/iso/bin/setup-helper
@@ -106,15 +106,9 @@ if [ `is_installed libjpeg` ]; then
inject_packages libjpeg-turbo
fi
-#if [ `is_installed libjpeg-32` ]; then
-# remove_packages libjpeg-32
-# inject_packages libjpeg-turbo-32
-#fi
-
if [ `is_installed mesa3d` ]; then
inject_packages llvm elfutils xorg-presentproto xorg-libxshmfence
fi
-#if [ `is_installed mesa3d-32` ]; then
-# inject_packages llvm-32 elfutils-32 xorg-presentproto-32 xorg-libxshmfence-32
-#fi
+remove_packages net-tools traceroute whois
+inject_packages inetutils
diff --git a/packages.opt b/packages.opt
index 9b194a1..7ed8439 100644
--- a/packages.opt
+++ b/packages.opt
@@ -5,6 +5,7 @@ cdrkit
cmake
dialog
efibootmgr
+elfutils
expat
fakeroot
fetchmail
@@ -25,7 +26,7 @@ keyutils
libevent
libffi
libidl
-libjpeg
+libjpeg-turbo
libnfsidmap
libnl
libpng
@@ -34,6 +35,7 @@ libtirpc
libxml2
libxml2-python
libxslt
+llvm
lvm2
mdadm
mtools
diff --git a/packages.xorg b/packages.xorg
index e82ccbf..ce7452e 100644
--- a/packages.xorg
+++ b/packages.xorg
@@ -49,6 +49,7 @@ xorg-libxrandr
xorg-libxrender
xorg-libxres
xorg-libxscrnsaver
+xorg-libxshmfence
xorg-libxt
xorg-libxtst
xorg-libxv
@@ -59,6 +60,7 @@ xorg-libxxf86vm
xorg-makedepend
xorg-mkfontdir
xorg-mkfontscale
+xorg-presentproto
xorg-randrproto
xorg-recordproto
xorg-rendercheck

Generated by cgit