Initial set of updates for 3.0.

diff --git a/filesystem/rc b/filesystem/rc
index d03535766f0027dc0ee95113f3f4e8298ad4e6b3..42b03d98bc56c90eaac423b62841a0956fe6e448 100755 (executable)
--- a/filesystem/rc
+++ b/filesystem/rc
@@ -100,7 +100,7 @@ find_and_mount_media() {
 #
 
 echo ""
-echo -e "${BOLD}CRUX-ARM 2.8 - ${BLUE}http://crux-arm.nu/${NORM}"
+echo -e "${BOLD}CRUX-ARM 3.0 - ${BLUE}http://crux-arm.nu/${NORM}"
 echo ""
 
 exec >/dev/console </dev/console 2>&1

diff --git a/filesystem/setup b/filesystem/setup
index bb3b550366f31e42a01316a37d88a96cb54adf4a..717a98bf16ca2d8b8fc4aedfb6d5e66df620081e 100755 (executable)
--- a/filesystem/setup
+++ b/filesystem/setup
@@ -22,7 +22,7 @@
 # USA.
 #
 
-VERSION="2.8"
+VERSION="3.0"
 
 do_dialog() {
     dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"

diff --git a/filesystem/setup-helper b/filesystem/setup-helper
index bce20d20c67198fc3d0435f8b5723bacccfcffcd..a88adc81ca927393e01fb68e6d17a048b8dce236 100755 (executable)
--- a/filesystem/setup-helper
+++ b/filesystem/setup-helper
@@ -102,44 +102,12 @@ for i in /media/crux/*; do.
        fi
 done
 
-##### # 2.7 -> 2.8 #####
-echo "* CRUX 2.7 -> 2.8 setup-helper"
-
-rename_packages "util-linux-ng:util-linux"
-remove_packages module-init-tools eject
-inject_packages kmod tzdata util-linux
+##### # 2.8 -> 3.0 #####
+echo "* CRUX-ARM 2.8 -> 3.0 setup-helper"
 
 if grep -q opt $EXTRA_COLLECTIONS; then
-
-       if [ `is_installed glib` ]; then
-           inject_packages libffi
-       fi
-
-       if [ `is_installed wpa_supplicant` ]; then
-           inject_packages libnl
-       fi
-
-       if [ `is_installed firefox` ]; then
-           inject_packages nspr nss sqlite3
-       fi
-fi
-
-if grep -q xorg $EXTRA_COLLECTIONS; then
-
-       if [ `is_installed xorg-xcb-util` ]; then
-           inject_packages xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm
-       fi
-
-       if [ `is_installed xorg-xf86-input-evdev` ]; then
-           inject_packages mtdev
-       fi
-
-       if [ `is_installed xorg-xf86-input-synaptics` ]; then
-           inject_packages mtdev
-       fi
-
-       if [ `is_installed mesa3d` ]; then
-           inject_packages glu
+       if [ `is_installed pango` ]; then
+               inject_packages harfbuzz
        fi
 fi