Updated kernel to 4.4.30, UEFI and 3.2 -> 3.3 text updates, inject xorg-libxfont2

14 files changed, 42 insertions, 47 deletions

diff --git a/Makefile b/Makefile
index 4b4f507..703cbaf 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@
 # Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se>
 #
 
-CRUXVERSION       = 3.2
+CRUXVERSION       = 3.3
 CUSTOMVERSION     =
 COLLECTIONS       = core opt xorg
 KERNEL_MIRROR     = http://www.kernel.org
-KERNEL_VERSION    = 4.4.27
+KERNEL_VERSION    = 4.4.30
 KERNEL_PATCHES    =
 BB_VERSION        = 1.22.1
 MEMTEST_VERSION   = 5.01
diff --git a/doc/handbook/get_wiki_handbook b/doc/handbook/get_wiki_handbook
index ef36e15..6f0a59c 100755
--- a/doc/handbook/get_wiki_handbook
+++ b/doc/handbook/get_wiki_handbook
@@ -4,21 +4,21 @@
 
 INFILE=handbook.in
 OUTFILE=handbook.txt
-CRUX_VERSION=3.2
+CRUX_VERSION=3.3
 TITLE="HANDBOOK FOR CRUX $CRUX_VERSION"
 URL="http://crux.nu/Main/Handbook${CRUX_VERSION/\./-}?action=print"
 
 set -x
 links -no-numbering -no-references -dump $URL > $INFILE
-cat $INFILE|while read n; do 
-	if [ -n "$intext" ]; then 
+cat $INFILE|while read n; do
+	if [ -n "$intext" ]; then
 		cat
-	elif [ "$n" = "1. Preface" ]; then 
+	elif [ "$n" = "1. Preface" ]; then
 		echo "$TITLE"
-		echo ""; 
-		echo "   $n"; 
-		intext="yes"; 
-	fi 
+		echo "";
+		echo "   $n";
+		intext="yes";
+	fi
 done > $OUTFILE
 
 rm $INFILE
diff --git a/doc/handbook/get_wiki_release_notes b/doc/handbook/get_wiki_release_notes
index 9d5d512..e52f74c 100755
--- a/doc/handbook/get_wiki_release_notes
+++ b/doc/handbook/get_wiki_release_notes
@@ -4,17 +4,17 @@
 
 INFILE=releasenotes.in
 OUTFILE=releasenotes.txt
-CRUX_VERSION=3.2
+CRUX_VERSION=3.3
 URL="http://crux.nu/Main/ReleaseNotes${CRUX_VERSION//\./-}?action=print"
 
 set -x
 links -no-numbering -no-references -dump $URL > $INFILE
-cat $INFILE|while read n; do 
-	if [ -n "$intext" ]; then 
+cat $INFILE|while read n; do
+	if [ -n "$intext" ]; then
 		cat
-	elif [ "$n" = "Main: ReleaseNotes${CRUX_VERSION//\./-}" ]; then 
-		intext="yes"; 
-	fi 
+	elif [ "$n" = "Main: ReleaseNotes${CRUX_VERSION//\./-}" ]; then
+		intext="yes";
+	fi
 done > $OUTFILE
 
 rm $INFILE
diff --git a/initramfs/init b/initramfs/init
index 8e181ec..ab0f9e2 100755
--- a/initramfs/init
+++ b/initramfs/init
@@ -131,7 +131,7 @@ find_and_mount_media() {
 
 # main script
 echo ""
-echo -e "${BOLD}CRUX 3.2 - ${BLUE}http://crux.nu/${NORM}"
+echo -e "${BOLD}CRUX 3.3 - ${BLUE}http://crux.nu/${NORM}"
 echo ""
 
 exec >/dev/console </dev/console 2>&1
diff --git a/iso/bin/setup b/iso/bin/setup
index 47ff008..1434c42 100755
--- a/iso/bin/setup
+++ b/iso/bin/setup
@@ -20,7 +20,7 @@
 # USA.
 #
 
-VERSION="3.2"
+VERSION="3.3"
 
 do_dialog() {
     dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"
@@ -304,7 +304,7 @@ main() {
 	if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ]
 	then
 		(/usr/bin/setup-helper $ROOT &> $helperlogfile) | do_dialog \
-			--title " Please wait [3.1 -> 3.2 check]" --gauge "" 8 60 0
+			--title " Please wait [3.2 -> 3.3 check]" --gauge "" 8 60 0
 	fi
 	install_packages
 
diff --git a/iso/bin/setup-chroot b/iso/bin/setup-chroot
index d7768e9..dc69b3c 100755
--- a/iso/bin/setup-chroot
+++ b/iso/bin/setup-chroot
@@ -6,4 +6,8 @@ mount -t proc proc /mnt/proc
 mount -t sysfs none /mnt/sys
 mount -t devpts -o noexec,nosuid,gid=tty,mode=0620 devpts /mnt/dev/pts
 
+if grep -qs /sys/firmware/efi/efivars /proc/mounts; then
+	mount --bind /sys/firmware/efi/efivars /mnt/sys/firmware/efi/efivars
+fi
+
 chroot /mnt /bin/bash
diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper
index 0f71c28..f8c375e 100755
--- a/iso/bin/setup-helper
+++ b/iso/bin/setup-helper
@@ -94,30 +94,15 @@ if [ -z "$1" ]; then
 fi
 
 
-##### # 3.1 -> 3.2 #####
-echo "* CRUX 3.1 -> 3.2 setup-helper"
+##### # 3.2 -> 3.3 #####
+echo "* CRUX 3.2 -> 3.3 setup-helper"
 
-if [ `is_installed xorg-server` ]; then
-	inject_packages libepoxy
-fi
+inject_packages signify
 
 if [ `is_installed firefox` ]; then
-	inject_packages gstreamer gst-plugins-base
-	inject_packages gtk3 at-spi2-core at-spi2-atk dbus
+	inject_packages autoconf-2.13
 fi
 
-if [ `is_installed wpa_supplicant` ]; then
-	inject_packages dbus
-fi
-
-if [ `is_installed xorg-xf86-input-evdev` ]; then
-	inject_packages mtdev
-fi
-
-if [ `is_installed mesa3d` ]; then
-	inject_packages xorg-libxxf86vm
+if [ `is_installed xorg-server` ]; then
+	inject_packages xorg-libxfont2
 fi
-
-remove_packages xorg-glamor-egl
-
-inject_packages dash gperf start-stop-daemon
diff --git a/iso/etc/fstab b/iso/etc/fstab
index b5deef0..1324a5a 100644
--- a/iso/etc/fstab
+++ b/iso/etc/fstab
@@ -1,3 +1,4 @@
 #CRUXMEDIA# /media auto ro 0 0
 devpts /dev/pts devpts noexec,nosuid,gid=tty,mode=0620 0 0
 tmpfs /tmp tmpfs defaults 0 0
+none /sys/firmware/efi/efivars efivarfs defaults,noauto 0 0
diff --git a/iso/etc/motd b/iso/etc/motd
index 26c451e..74888a1 100644
--- a/iso/etc/motd
+++ b/iso/etc/motd
@@ -1,3 +1,3 @@
 
-Welcome to the CRUX 3.2 installation media!
+Welcome to the CRUX 3.3 installation media!
 
diff --git a/iso/etc/rc b/iso/etc/rc
index dadfafa..8de6a3f 100755
--- a/iso/etc/rc
+++ b/iso/etc/rc
@@ -31,4 +31,9 @@ hostname crux
 # Setup network
 /sbin/ifconfig lo 127.0.0.1
 
+# mount efivarfs if possible
+if [ -d /sys/firmware/efi/efivars ]; then
+	/bin/mount /sys/firmware/efi/efivars &> /dev/null
+fi
+
 # End of file
diff --git a/iso/grub.cfg b/iso/grub.cfg
index 11b3310..22e8f2c 100644
--- a/iso/grub.cfg
+++ b/iso/grub.cfg
@@ -8,7 +8,7 @@ set menu_color_highlight=white/cyan
 search --file --no-floppy --set root /crux-media
 set prefix=($root)/boot/grub
 
-menuentry "Install/Upgrade CRUX 3.2 (UEFI mode)" {
+menuentry "Install/Upgrade CRUX 3.3 (UEFI mode)" {
     insmod efi_uga
     insmod efi_gop
     set gfxmode=auto
diff --git a/iso/isolinux/boot.msg b/iso/isolinux/boot.msg
index d599d28..17eb050 100644
--- a/iso/isolinux/boot.msg
+++ b/iso/isolinux/boot.msg
@@ -1,4 +1,4 @@
-Welcome to the CRUX 3.2 installation media!
+Welcome to the CRUX 3.3 installation media!
 
 Press <Enter> to boot using the default 'CRUX' image
 or use one of the others in the following list:
diff --git a/kernel/linux-4.4.27.config b/kernel/linux-4.4.30.config
index f82302e..c73156b 100644
--- a/kernel/linux-4.4.27.config
+++ b/kernel/linux-4.4.30.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.27 Kernel Configuration
+# Linux/x86 4.4.30 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -2670,7 +2670,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
+# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
diff --git a/kernel/linux-4.4.27.defconfig b/kernel/linux-4.4.30.defconfig
index 17f4801..ddf730f 100644
--- a/kernel/linux-4.4.27.defconfig
+++ b/kernel/linux-4.4.30.defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.27 Kernel Configuration
+# Linux/x86 4.4.30 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -2802,7 +2802,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
+# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y